freetdm: Add ftdm_channel_get_state(), ftdm_channel_get_last_state() and ftdm_span_ge...

Remove custom versions from ftmod_isdn and ftmod_libpri.

Signed-off-by: Stefan Knoblich <s.knoblich@axsentis.de>

diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index f02c9c48db5765972c6dca3b45924348a3ccd877..1dada451be5708504a3f2107807e023e55c28c09 100644 (file)
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -1915,6 +1915,11 @@ FT_DECLARE(ftdm_trunk_type_t) ftdm_span_get_trunk_type(const ftdm_span_t *span)
        return span->trunk_type;
 }
 
+FT_DECLARE(const char *) ftdm_span_get_trunk_type_str(const ftdm_span_t *span)
+{
+       return ftdm_trunk_type2str(span->trunk_type);
+}
+
 FT_DECLARE(uint32_t) ftdm_span_get_id(const ftdm_span_t *span)
 {
        return span->span_id;
@@ -2114,6 +2119,15 @@ FT_DECLARE(ftdm_caller_data_t *) ftdm_channel_get_caller_data(ftdm_channel_t *ft
        return &ftdmchan->caller_data;
 }
 
+FT_DECLARE(int) ftdm_channel_get_state(const ftdm_channel_t *ftdmchan)
+{
+       int state;
+       ftdm_channel_lock(ftdmchan);
+       state = ftdmchan->state;
+       ftdm_channel_unlock(ftdmchan);
+       return state;
+}
+
 FT_DECLARE(const char *) ftdm_channel_get_state_str(const ftdm_channel_t *ftdmchan)
 {
        const char *state;
@@ -2123,6 +2137,15 @@ FT_DECLARE(const char *) ftdm_channel_get_state_str(const ftdm_channel_t *ftdmch
        return state;
 }
 
+FT_DECLARE(int) ftdm_channel_get_last_state(const ftdm_channel_t *ftdmchan)
+{
+       int last_state;
+       ftdm_channel_lock(ftdmchan);
+       last_state = ftdmchan->last_state;
+       ftdm_channel_unlock(ftdmchan);
+       return last_state;
+}
+
 FT_DECLARE(const char *) ftdm_channel_get_last_state_str(const ftdm_channel_t *ftdmchan)
 {
        const char *state;

diff --git a/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c
index 03c027e664a1f7fd2856bb00f38e7648add84474..1f90d486f37029582a38a859ed854d77c15fe8e1 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c
+++ b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c
@@ -54,24 +54,6 @@
 #define DEFAULT_NATIONAL_PREFIX        "0"
 #define DEFAULT_INTERNATIONAL_PREFIX   "00"
 
-static const char *ftdm_span_get_trunk_type_str(const ftdm_span_t *span)
-{
-       assert(span);
-       return ftdm_trunk_type2str(span->trunk_type);
-}
-
-static int ftdm_channel_get_state(const ftdm_channel_t *chan)
-{
-       assert(chan);
-       return chan->state;
-}
-
-static int ftdm_channel_get_last_state(const ftdm_channel_t *chan)
-{
-       assert(chan);
-       return chan->last_state;
-}
-
 /*****************************************************************************************
  * PCAP
  *          Based on Helmut Kuper's (<helmut.kuper@ewetel.de>) implementation,

diff --git a/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c b/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
index 1d1685f8406b5e05a97a1d132437e56824af0880..fdfdf79a93ea0a14d5b5555226a9e709d387aebb 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
+++ b/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
@@ -34,30 +34,16 @@
 #include "private/ftdm_core.h"
 #include "ftmod_libpri.h"
 
-/***
- * Move to core
- ***/
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x)  (sizeof((x)) / sizeof((x)[0]))
 #endif
 
-static ftdm_channel_state_t ftdm_channel_get_state(const ftdm_channel_t *chan)
-{
-       assert(chan);
-       return chan->state;
-}
-
 static void _ftdm_channel_set_state_force(ftdm_channel_t *chan, const ftdm_channel_state_t state)
 {
        assert(chan);
        chan->state = state;
 }
 
-static const char *ftdm_span_get_trunk_type_str(const ftdm_span_t *span)
-{
-       return ftdm_trunk_type2str(span->trunk_type);
-}
-
 /**
  * \brief Unloads libpri IO module
  * \return Success

diff --git a/libs/freetdm/src/include/freetdm.h b/libs/freetdm/src/include/freetdm.h
index 64ecc2e35763111e83d0561b1609e3c280aa581a..31bc88b9ca6f5de18c3cdf8adb5290a1b52e5617 100644 (file)
--- a/libs/freetdm/src/include/freetdm.h
+++ b/libs/freetdm/src/include/freetdm.h
@@ -1240,6 +1240,9 @@ FT_DECLARE(void) ftdm_span_set_trunk_type(ftdm_span_t *span, ftdm_trunk_type_t t
  */
 FT_DECLARE(ftdm_trunk_type_t) ftdm_span_get_trunk_type(const ftdm_span_t *span);
 
+/*! \brief For display debugging purposes you can display this string which describes the trunk type of a span */
+FT_DECLARE(const char *) ftdm_span_get_trunk_type_str(const ftdm_span_t *span);
+
 /*! 
  * \brief Return the channel identified by the provided id
  *
@@ -1259,6 +1262,12 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_set_caller_data(ftdm_channel_t *ftdmchan,
 /*! \brief Get the caller data for a channel, typically you need this when receiving FTDM_SIGEVENT_START */
 FT_DECLARE(ftdm_caller_data_t *) ftdm_channel_get_caller_data(ftdm_channel_t *channel);
 
+/*! \brief Get current state of a channel */
+FT_DECLARE(int) ftdm_channel_get_state(const ftdm_channel_t *ftdmchan);
+
+/*! \brief Get last state of a channel */
+FT_DECLARE(int) ftdm_channel_get_last_state(const ftdm_channel_t *ftdmchan);
+
 /*! \brief For display debugging purposes you can display this string which describes the current channel internal state */
 FT_DECLARE(const char *) ftdm_channel_get_state_str(const ftdm_channel_t *channel);