kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add ZAP_TON_* (taken from Q931.h, drop Q921.h and Q931.h include from openzap.h and fixup all users of the old Q931_TON_ enum values) 

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@707 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Stefan Knoblich 2009-04-08 21:58:51 +00:00
parent 060872082b
commit 59fa196533
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/freetdm/mod_openzap/mod_openzap.c
View File

@ -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;

15
libs/freetdm/src/include/openzap.h
View File

@ -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;

3
libs/freetdm/src/ozmod/ozmod_isdn/ozmod_isdn.c
View File

@ -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

6
libs/freetdm/src/ozmod/ozmod_libpri/ozmod_libpri.c
View File

@ -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: