Add ZAP_TON_* (taken from Q931.h, drop Q921.h and Q931.h include from openzap.h and...

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@707 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/openzap/mod_openzap/mod_openzap.c b/libs/openzap/mod_openzap/mod_openzap.c
index faecee0c06317191674e269d6ce8e409d7c85a65..a64cea508a783f11689325caa368a9e7aed785ea 100644 (file)
--- a/libs/openzap/mod_openzap/mod_openzap.c
+++ b/libs/openzap/mod_openzap/mod_openzap.c
@@ -978,13 +978,13 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
        
        if ((var = switch_event_get_header(var_event, "openzap_outbound_ton")) || (var = switch_core_get_variable("openzap_outbound_ton"))) {
                if (!strcasecmp(var, "national")) {
-                       caller_data.ani.type = Q931_TON_NATIONAL;
+                       caller_data.ani.type = ZAP_TON_NATIONAL;
                } else if (!strcasecmp(var, "international")) {
-                       caller_data.ani.type = Q931_TON_INTERNATIONAL;
+                       caller_data.ani.type = ZAP_TON_INTERNATIONAL;
                } else if (!strcasecmp(var, "local")) {
-                       caller_data.ani.type = Q931_TON_SUBSCRIBER_NUMBER;
+                       caller_data.ani.type = ZAP_TON_SUBSCRIBER_NUMBER;
                } else if (!strcasecmp(var, "unknown")) {
-                       caller_data.ani.type = Q931_TON_UNKNOWN;
+                       caller_data.ani.type = ZAP_TON_UNKNOWN;
                }
        } else {
                caller_data.ani.type = outbound_profile->destination_number_ton;

diff --git a/libs/openzap/src/include/openzap.h b/libs/openzap/src/include/openzap.h
index 3bb87a806d53639ab260be3ffbb0ceafc4cf3810..0b6e120d300749a66197c6ccbcf0f1c778ed26fd 100644 (file)
--- a/libs/openzap/src/include/openzap.h
+++ b/libs/openzap/src/include/openzap.h
@@ -167,8 +167,6 @@
 #include "libteletone.h"
 #include "zap_buffer.h"
 #include "zap_threadmutex.h"
-#include "Q921.h"
-#include "Q931.h"
 
 #define XX if (0)
 
@@ -410,6 +408,19 @@ struct zap_fsk_modulator {
        int16_t sample_buffer[64];
 };
 
+/**
+ * Type Of Number (TON)
+ */
+typedef enum {
+       ZAP_TON_UNKNOWN = 0,
+       ZAP_TON_INTERNATIONAL,
+       ZAP_TON_NATIONAL,
+       ZAP_TON_NETWORK_SPECIFIC,
+       ZAP_TON_SUBSCRIBER_NUMBER,
+       ZAP_TON_ABBREVIATED_NUMBER,
+       ZAP_TON_RESERVED
+} zap_ton_t;
+
 typedef struct {
        char digits[25];
        uint8_t type;

diff --git a/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c b/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c
index 1007900e135e367e82b1e9a79a20306debc12ccb..f1b4e93aae9152692b018551e7c056f1bb910c89 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c
+++ b/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c
@@ -32,7 +32,6 @@
  */
 
 #include "openzap.h"
-#include "zap_isdn.h"
 #include "Q931.h"
 #include "Q921.h"
 #ifdef WIN32
@@ -41,6 +40,8 @@
 #include <sys/time.h>
 #endif
 
+#include "zap_isdn.h"
+
 #define LINE "--------------------------------------------------------------------------------"
 //#define IODEBUG
 

diff --git a/libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.c b/libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.c
index 7985d869c6ab39eecc7b04b34583bebf3d366cdd..fff761035a8298d35076508fd69a09b4ac054264 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.c
+++ b/libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.c
@@ -463,13 +463,13 @@ static __inline__ void state_advance(zap_channel_t *zchan)
                        
                        dp = zchan->caller_data.ani.type;
                        switch(dp) {
-                       case Q931_TON_NATIONAL:
+                       case ZAP_TON_NATIONAL:
                                dp = PRI_NATIONAL_ISDN;
                                break;
-                       case Q931_TON_INTERNATIONAL:
+                       case ZAP_TON_INTERNATIONAL:
                                dp = PRI_INTERNATIONAL_ISDN;
                                break;
-                       case Q931_TON_SUBSCRIBER_NUMBER:
+                       case ZAP_TON_SUBSCRIBER_NUMBER:
                                dp = PRI_LOCAL_ISDN;
                                break;
                        default: