Skip to content

F
freeswitch
提交 32e176c5 authored 作者: Anthony Minessale's avatar Anthony Minessale
浏览文件
操作

add pika isdn support 

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@345 a93c3328-9c30-0410-af19-c9cd2b2d52af
上级 d0a3cefa
显示空白字符变更
内嵌 并排
正在显示 包含 468 行增加 和 104 行删除
libs/openzap/src/include/openzap.h
浏览文件 @ 32e176c5
......@@ -81,10 +81,10 @@
#pragma comment(lib, "Winmm")
#endif
#define ZAP_ENUM_NAMES(_NAME, _STRINGS) static char * _NAME [] = { _STRINGS , NULL };
#define ZAP_STR2ENUM_P(_FUNC1, _FUNC2, _TYPE) _TYPE _FUNC1 (char *name); char * _FUNC2 (_TYPE type);
#define ZAP_ENUM_NAMES(_NAME, _STRINGS) static const char * _NAME [] = { _STRINGS , NULL };
#define ZAP_STR2ENUM_P(_FUNC1, _FUNC2, _TYPE) _TYPE _FUNC1 (const char *name); const char * _FUNC2 (_TYPE type);
#define ZAP_STR2ENUM(_FUNC1, _FUNC2, _TYPE, _STRINGS, _MAX) \
_TYPE _FUNC1 (char *name) \
_TYPE _FUNC1 (const char *name) \
{ \
int i; \
_TYPE t = _MAX ; \
......@@ -98,7 +98,7 @@
\
return t; \
} \
char * _FUNC2 (_TYPE type) \
const char * _FUNC2 (_TYPE type) \
{ \
if (type > _MAX) { \
type = _MAX; \
......@@ -319,7 +319,15 @@ struct zap_caller_data {
uint32_t raw_data_len;
};
typedef enum {
ZAP_TYPE_NONE,
ZAP_TYPE_SPAN = 0xFF,
ZAP_TYPE_CHANNEL
} zap_data_type_t;
struct zap_channel {
zap_data_type_t data_type;
uint32_t span_id;
uint32_t chan_id;
uint32_t physical_span_id;
......@@ -399,6 +407,7 @@ struct zap_analog_data {
};
struct zap_span {
zap_data_type_t data_type;
uint32_t span_id;
uint32_t chan_count;
zap_span_flag_t flags;
......
libs/openzap/src/include/zap_pika.h
浏览文件 @ 32e176c5
......@@ -35,6 +35,66 @@
#define ZAP_PIKA_H
#include "openzap.h"
#include "pikahmpapi.h"
typedef enum {
PIKA_SPAN_FRAMING_T1_D4,
PIKA_SPAN_FRAMING_T1_ESF,
PIKA_SPAN_FRAMING_E1_BASIC,
PIKA_SPAN_FRAMING_E1_CRC4,
PIKA_SPAN_INVALID
} PIKA_TSpanFraming;
#define PIKA_SPAN_STRINGS "T1_D4", "T1_ESF", "E1_BASIC", "E1_CRC4"
ZAP_STR2ENUM_P(pika_str2span, pika_span2str, PIKA_TSpanFraming)
typedef enum {
PIKA_SPAN_ENCODING_T1_AMI_ZS_NONE,
PIKA_SPAN_ENCODING_T1_AMI_ZS_GTE,
PIKA_SPAN_ENCODING_T1_AMI_ZS_BELL,
PIKA_SPAN_ENCODING_T1_AMI_ZS_JAM8,
PIKA_SPAN_ENCODING_T1_B8ZS,
PIKA_SPAN_ENCODING_E1_AMI,
PIKA_SPAN_ENCODING_E1_HDB3,
PIKA_SPAN_ENCODING_INVALID
} PIKA_TSpanEncoding;
#define PIKA_SPAN_ENCODING_STRINGS "T1_AMI_ZS_NONE", "T1_AMI_ZS_GTE", "T1_AMI_ZS_BELL", "T1_AMI_ZS_JAM8", "T1_B8ZS", "E1_AMI", "E1_HDB3"
ZAP_STR2ENUM_P(pika_str2span_encoding, pika_span_encoding2str, PIKA_TSpanEncoding)
typedef enum {
PIKA_SPAN_LOOP_LENGTH_SHORT_HAUL,
PIKA_SPAN_LOOP_LENGTH_LONG_HAUL,
PIKA_SPAN_LOOP_INVALID
} PIKA_TSpanLoopLength;
#define PIKA_LL_STRINGS "SHORT_HAUL", "LONG_HAUL"
ZAP_STR2ENUM_P(pika_str2loop_length, pika_loop_length2str, PIKA_TSpanLoopLength)
typedef enum {
PIKA_SPAN_LBO_T1_LONG_0_DB,
PIKA_SPAN_LBO_T1_LONG_7_DB,
PIKA_SPAN_LBO_T1_LONG_15_DB,
PIKA_SPAN_LBO_T1_LONG_22_DB,
PIKA_SPAN_LBO_T1_SHORT_133_FT,
PIKA_SPAN_LBO_T1_SHORT_266_FT,
PIKA_SPAN_LBO_T1_SHORT_399_FT,
PIKA_SPAN_LBO_T1_SHORT_533_FT,
PIKA_SPAN_LBO_T1_SHORT_655_FT,
PIKA_SPAN_LBO_E1_WAVEFORM_120_OHM,
PIKA_SPAN_LBO_INVALID
} PIKA_TSpanBuildOut;
#define PIKA_LBO_STRINGS "T1_LONG_0_DB", "T1_LONG_7_DB", "T1_LONG_15_DB", "T1_LONG_22_DB", "T1_SHORT_133_FT", "T1_SHORT_266_FT", "T1_SHORT_399_FT", "T1_SHORT_533_FT", "T1_SHORT_655_FT", "E1_WAVEFORM_120_OHM"
ZAP_STR2ENUM_P(pika_str2lbo, pika_lbo2str, PIKA_TSpanBuildOut)
typedef enum {
PIKA_SPAN_COMMAND_MODE_MU_LAW = 1,
PIKA_SPAN_COMMAND_MODE_A_LAW,
PIKA_SPAN_COMMAND_MODE_INVALID
} PIKA_TSpanCompandMode;
#define PIKA_SPAN_COMMAND_MODE_STRINGS "MU_LAW", "A_LAW"
ZAP_STR2ENUM_P(pika_str2command_mode, pika_command_mode2str, PIKA_TSpanCompandMode)
/* Openzap PIKA hardware interface functions */
zap_status_t pika_init(zap_io_interface_t **zint);
zap_status_t pika_destroy(void);
......
libs/openzap/src/include/zap_types.h
浏览文件 @ 32e176c5
......@@ -153,7 +153,10 @@ typedef enum {
ZAP_ALARM_YELLOW = (1 << 3),
ZAP_ALARM_RED = (1 << 4),
ZAP_ALARM_BLUE = (1 << 5),
ZAP_ALARM_NOTOPEN = ( 1 << 6)
ZAP_ALARM_NOTOPEN = ( 1 << 6),
ZAP_ALARM_AIS = ( 1 << 7),
ZAP_ALARM_RAI = ( 1 << 8),
ZAP_ALARM_GENERAL = ( 1 << 31)
} zap_alarm_flag_t;
typedef enum {
......
libs/openzap/src/zap_io.c
浏览文件 @ 32e176c5
......@@ -316,6 +316,7 @@ zap_status_t zap_span_create(zap_io_interface_t *zio, zap_span_t **span)
zap_copy_string(new_span->tone_map[ZAP_TONEMAP_BUSY], "%(500,500,480,620)", ZAP_TONEMAP_LEN);
zap_copy_string(new_span->tone_map[ZAP_TONEMAP_ATTN], "%(100,100,1400,2060,2450,2600)", ZAP_TONEMAP_LEN);
new_span->trunk_type = ZAP_TRUNK_NONE;
new_span->data_type = ZAP_TYPE_SPAN;
*span = new_span;
status = ZAP_SUCCESS;
}
......@@ -421,6 +422,7 @@ zap_status_t zap_span_add_channel(zap_span_t *span, zap_socket_t sockfd, zap_cha
new_chan->span = span;
new_chan->fds[0] = -1;
new_chan->fds[1] = -1;
new_chan->data_type = ZAP_TYPE_CHANNEL;
if (!new_chan->dtmf_on) {
new_chan->dtmf_on = ZAP_DEFAULT_DTMF_ON;
}
......@@ -605,6 +607,7 @@ zap_status_t zap_channel_set_state(zap_channel_t *zchan, zap_channel_state_t sta
switch(state) {
case ZAP_CHANNEL_STATE_DOWN:
case ZAP_CHANNEL_STATE_BUSY:
case ZAP_CHANNEL_STATE_RESTART:
ok = 1;
break;
default:
......
libs/openzap/src/zap_isdn.c
浏览文件 @ 32e176c5
......@@ -42,7 +42,7 @@
#endif
#define LINE "--------------------------------------------------------------------------------"
#define IODEBUG
//#define IODEBUG
static L2ULONG zap_time_now()
{
......@@ -141,6 +141,7 @@ static L3INT zap_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
}
}
break;
case Q931mes_RELEASE:
case Q931mes_RELEASE_COMPLETE:
{
zap_set_state_locked(zchan, ZAP_CHANNEL_STATE_DOWN);
......@@ -151,6 +152,7 @@ static L3INT zap_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
Q931ie_Cause *cause = Q931GetIEPtr(gen->Cause, gen->buf);
zchan->caller_data.hangup_cause = cause->Value;
zap_set_state_locked(zchan, ZAP_CHANNEL_STATE_TERMINATING);
}
break;
case Q931mes_ALERTING:
......@@ -196,7 +198,6 @@ static L3INT zap_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
zchan->caller_data.raw_data_len = cplen;
zap_set_state_locked(zchan, ZAP_CHANNEL_STATE_RING);
fail = 0;
zap_log(ZAP_LOG_CRIT, "hi %s\n", zchan->caller_data.cid_num);
}
}
......@@ -235,10 +236,10 @@ static int zap_isdn_921_21(void *pvt, L2UCHAR *msg, L2INT mlen)
zap_isdn_data_t *isdn_data = span->signal_data;
#ifdef IODEBUG
//char bb[4096] = "";
//print_hex_bytes(msg, len, bb, sizeof(bb));
//print_bits(msg, (int)len, bb, sizeof(bb), ZAP_ENDIAN_LITTLE, 0);
//zap_log(ZAP_LOG_DEBUG, "WRITE %d\n%s\n%s\n\n", (int)len, LINE, bb);
char bb[4096] = "";
print_hex_bytes(msg, len, bb, sizeof(bb));
print_bits(msg, (int)len, bb, sizeof(bb), ZAP_ENDIAN_LITTLE, 0);
zap_log(ZAP_LOG_DEBUG, "WRITE %d\n%s\n%s\n\n", (int)len, LINE, bb);
#endif
......@@ -563,11 +564,11 @@ static void *zap_isdn_run(zap_thread_t *me, void *obj)
len = sizeof(buf);
if (zap_channel_read(isdn_data->dchan, buf, &len) == ZAP_SUCCESS) {
#ifdef IODEBUG
//char bb[4096] = "";
//print_hex_bytes(buf, len, bb, sizeof(bb));
char bb[4096] = "";
print_hex_bytes(buf, len, bb, sizeof(bb));
//print_bits(buf, (int)len, bb, sizeof(bb), ZAP_ENDIAN_LITTLE, 0);
//zap_log(ZAP_LOG_DEBUG, "READ %d\n%s\n%s\n\n", (int)len, LINE, bb);
print_bits(buf, (int)len, bb, sizeof(bb), ZAP_ENDIAN_LITTLE, 0);
zap_log(ZAP_LOG_DEBUG, "READ %d\n%s\n%s\n\n", (int)len, LINE, bb);
#endif
Q921QueueHDLCFrame(&isdn_data->q921, buf, (int)len);
......
libs/openzap/src/zap_pika.c
浏览文件 @ 32e176c5
......@@ -42,12 +42,40 @@
#define TRY_OR_DIE(__code, __status, __label) if ((status = __code ) != __status) goto __label
#define pk_atof(__a) (PK_FLOAT) atof(__a)
ZAP_ENUM_NAMES(PIKA_SPAN_NAMES, PIKA_SPAN_STRINGS)
ZAP_STR2ENUM(pika_str2span, pika_span2str, PIKA_TSpanFraming, PIKA_SPAN_NAMES, PIKA_SPAN_INVALID)
ZAP_ENUM_NAMES(PIKA_SPAN_ENCODING_NAMES, PIKA_SPAN_ENCODING_STRINGS)
ZAP_STR2ENUM(pika_str2span_encoding, pika_span_encoding2str, PIKA_TSpanEncoding, PIKA_SPAN_ENCODING_NAMES, PIKA_SPAN_ENCODING_INVALID)
ZAP_ENUM_NAMES(PIKA_LL_NAMES, PIKA_LL_STRINGS)
ZAP_STR2ENUM(pika_str2loop_length, pika_loop_length2str, PIKA_TSpanLoopLength, PIKA_LL_NAMES, PIKA_SPAN_LOOP_INVALID)
ZAP_ENUM_NAMES(PIKA_LBO_NAMES, PIKA_LBO_STRINGS)
ZAP_STR2ENUM(pika_str2lbo, pika_lbo2str, PIKA_TSpanBuildOut, PIKA_LBO_NAMES, PIKA_SPAN_LBO_INVALID)
ZAP_ENUM_NAMES(PIKA_SPAN_COMMAND_MODE_NAMES, PIKA_SPAN_COMMAND_MODE_STRINGS)
ZAP_STR2ENUM(pika_str2command_mode, pika_command_mode2str, PIKA_TSpanCompandMode, PIKA_SPAN_COMMAND_MODE_NAMES, PIKA_SPAN_COMMAND_MODE_INVALID)
typedef enum {
PK_FLAG_READY = (1 << 0),
PK_FLAG_LOCKED = (1 << 1)
} pk_flag_t;
struct general_config {
uint32_t region;
};
typedef struct general_config general_config_t;
struct pika_channel_profile {
char name[80];
PKH_TRecordConfig record_config;
PKH_TPlayConfig play_config;
int ec_enabled;
PKH_TECConfig ec_config;
PKH_TSpanConfig span_config;
general_config_t general_config;
};
typedef struct pika_channel_profile pika_channel_profile_t;
......@@ -59,7 +87,9 @@ static struct {
PKH_TRecordConfig record_config;
PKH_TPlayConfig play_config;
PKH_TECConfig ec_config;
PKH_TSpanConfig span_config;
zap_hash_t *profile_hash;
general_config_t general_config;
} globals;
......@@ -67,6 +97,9 @@ struct pika_span_data {
TPikaHandle event_queue;
PKH_TPikaEvent last_oob_event;
uint32_t boardno;
PKH_TSpanConfig span_config;
TPikaHandle handle;
uint32_t flags;
};
typedef struct pika_span_data pika_span_data_t;
......@@ -82,9 +115,12 @@ struct pika_chan_data {
PKH_TPlayConfig play_config;
int ec_enabled;
PKH_TECConfig ec_config;
PKH_THDLCConfig hdlc_config;
zap_buffer_t *digit_buffer;
zap_mutex_t *digit_mutex;
zap_size_t dtmf_len;
uint32_t flags;
uint32_t hdlc_bytes;
};
typedef struct pika_chan_data pika_chan_data_t;
......@@ -111,6 +147,7 @@ static ZIO_CONFIGURE_FUNCTION(pika_configure)
memset(profile, 0, sizeof(*profile));
zap_set_string(profile->name, category);
profile->ec_config = globals.ec_config;
profile->span_config = globals.span_config;
profile->record_config = globals.record_config;
profile->play_config = globals.play_config;
hashtable_insert(globals.profile_hash, (void *)profile->name, profile);
......@@ -175,6 +212,20 @@ static ZIO_CONFIGURE_FUNCTION(pika_configure)
profile->ec_config.comfortNoiseEnabled = zap_true(val);
} else if (!strcasecmp(var, "ec-adaptationModeEnabled")) {
profile->ec_config.adaptationModeEnabled = zap_true(val);
} else if (!strcasecmp(var, "framing")) {
profile->span_config.framing = pika_str2span(val);
} else if (!strcasecmp(var, "encoding")) {
profile->span_config.encoding = pika_str2span_encoding(val);
} else if (!strcasecmp(var, "loopLength")) {
profile->span_config.loopLength = pika_str2loop_length(val);
} else if (!strcasecmp(var, "buildOut")) {
profile->span_config.buildOut = pika_str2lbo(val);
} else if (!strcasecmp(var, "region")) {
if (!strcasecmp(val, "eu")) {
profile->general_config.region = PKH_TRUNK_EU;
} else {
profile->general_config.region = PKH_TRUNK_NA;
}
} else {
ok = 0;
}
......@@ -194,9 +245,9 @@ PK_VOID PK_CALLBACK media_out_callback(PKH_TPikaEvent *event)
zap_channel_t *zchan = event->userData;
pika_chan_data_t *chan_data = (pika_chan_data_t *) zchan->mod_data;
//PK_CHAR g_EventText[PKH_EVENT_MAX_NAME_LENGTH];
//PKH_EVENT_GetText(event->id, g_EventText, sizeof(g_EventText));
//zap_log(ZAP_LOG_DEBUG, "Event: %s\n", g_EventText);
//PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH];
//PKH_EVENT_GetText(event->id, event_text, sizeof(event_text));
//zap_log(ZAP_LOG_DEBUG, "Event: %s\n", event_text);
switch (event->id) {
case PKH_EVENT_PLAY_IDLE:
......@@ -259,7 +310,9 @@ static unsigned pika_open_range(zap_span_t *span, unsigned boardno, unsigned spa
}
if (!span->mod_data) {
if (span->mod_data) {
span_data = span->mod_data;
} else {
span_data = malloc(sizeof(*span_data));
assert(span_data != NULL);
memset(span_data, 0, sizeof(*span_data));
......@@ -274,12 +327,16 @@ static unsigned pika_open_range(zap_span_t *span, unsigned boardno, unsigned spa
return 0;
}
PKH_QUEUE_Attach(span_data->event_queue, globals.open_boards[boardno], NULL);
//PKH_QUEUE_Attach(span_data->event_queue, globals.open_boards[boardno], NULL);
span->mod_data = span_data;
}
if (type == ZAP_CHAN_TYPE_FXS || type == ZAP_CHAN_TYPE_FXO) {
start--;
end--;
}
for(x = start; x < end; x++) {
zap_channel_t *chan;
pika_chan_data_t *chan_data = NULL;
......@@ -287,72 +344,99 @@ static unsigned pika_open_range(zap_span_t *span, unsigned boardno, unsigned spa
chan_data = malloc(sizeof *chan_data);
assert(chan_data);
memset(chan_data, 0, sizeof(*chan_data));
zap_span_add_channel(span, 0, type, &chan);
chan->mod_data = chan_data;
if ((type == ZAP_CHAN_TYPE_B || type == ZAP_CHAN_TYPE_DQ921) && !span_data->handle) {
PKH_TBoardConfig boardConfig;
if (type == ZAP_CHAN_TYPE_FXO) {
PKH_TTrunkConfig trunkConfig;
TRY_OR_DIE(PKH_TRUNK_Open(globals.open_boards[boardno], x, &chan_data->handle), PK_SUCCESS, fail_fxo);
TRY_OR_DIE(PKH_TRUNK_Seize(chan_data->handle), PK_SUCCESS, fail_fxo);
TRY_OR_DIE(zap_span_add_channel(span, 0, type, &chan), ZAP_SUCCESS, fail_fxo);
TRY_OR_DIE(PKH_TRUNK_GetConfig(chan_data->handle, &trunkConfig), PK_SUCCESS, fail_fxo);
TRY_OR_DIE(PKH_SPAN_Open(globals.open_boards[boardno], spanno, NULL, &span_data->handle), PK_SUCCESS, error);
TRY_OR_DIE(PKH_SPAN_GetConfig(span_data->handle, &span_data->span_config), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Attach(span_data->event_queue, span_data->handle, (PK_VOID*) span), PK_SUCCESS, error);
TRY_OR_DIE(PKH_BOARD_GetConfig(globals.open_boards[boardno], &boardConfig), PK_SUCCESS, error);
trunkConfig.internationalControl = PKH_TRUNK_NA;
trunkConfig.audioFormat = PKH_AUDIO_MULAW;
if (span->trunk_type == ZAP_TRUNK_T1) {
if (zap_test_flag(span_data, PK_FLAG_LOCKED)) {
zap_log(ZAP_LOG_WARNING, "Already locked into E1 mode!\n");
}
} else if (span->trunk_type == ZAP_TRUNK_E1) {
boardConfig.specific.DigitalGateway.interfaceType = PKH_BOARD_INTERFACE_TYPE_E1;
PKH_BOARD_SetConfig(globals.open_boards[boardno], &boardConfig);
zap_set_flag(span_data, PK_FLAG_LOCKED);
}
}
TRY_OR_DIE(PKH_TRUNK_SetConfig(chan_data->handle, &trunkConfig), PK_SUCCESS, fail_fxo);
TRY_OR_DIE(PKH_QUEUE_Attach(span_data->event_queue, chan_data->handle, (PK_VOID*) chan), PK_SUCCESS, fail_fxo);
TRY_OR_DIE(PKH_TRUNK_GetMediaStreams(chan_data->handle, &chan_data->media_in, &chan_data->media_out), PK_SUCCESS, fail_fxo);
TRY_OR_DIE(PKH_QUEUE_Create(PKH_QUEUE_TYPE_NORMAL, &chan_data->media_in_queue), PK_SUCCESS, fail_fxo);
TRY_OR_DIE(PKH_QUEUE_Attach(chan_data->media_in_queue, chan_data->media_in, (PK_VOID*) chan), PK_SUCCESS, fail_fxo);
TRY_OR_DIE(PKH_QUEUE_Create(PKH_QUEUE_TYPE_CALLBACK, &chan_data->media_out_queue), PK_SUCCESS, fail_fxo);
TRY_OR_DIE(PKH_QUEUE_SetEventHandler(chan_data->media_out_queue, media_out_callback), PK_SUCCESS, fail_fxo);
TRY_OR_DIE(PKH_QUEUE_Attach(chan_data->media_out_queue, chan_data->media_out, (PK_VOID*) chan), PK_SUCCESS, fail_fxo);
TRY_OR_DIE(PKH_TRUNK_Start(chan_data->handle), PK_SUCCESS, fail_fxo);
if (type == ZAP_CHAN_TYPE_FXO) {
PKH_TTrunkConfig trunkConfig;
goto ok;
TRY_OR_DIE(PKH_TRUNK_Open(globals.open_boards[boardno], x, &chan_data->handle), PK_SUCCESS, error);
TRY_OR_DIE(PKH_TRUNK_Seize(chan_data->handle), PK_SUCCESS, error);
fail_fxo:
zap_log(ZAP_LOG_ERROR, "failure configuring device s%dc%d\n", spanno, x);
zap_log(ZAP_LOG_ERROR, "Error: PKH_TRUNK_Open %u failed(%s)!\n", x,
PKH_ERROR_GetText(status, error_text, sizeof(error_text)));
if (chan_data->handle) {
PKH_TRUNK_Close(chan_data->handle);
if (profile && profile->general_config.region == PKH_TRUNK_EU) {
TRY_OR_DIE(PKH_TRUNK_GetConfig(chan_data->handle, &trunkConfig), PK_SUCCESS, error);
trunkConfig.internationalControl = PKH_PHONE_INTERNATIONAL_CONTROL_EU;
trunkConfig.audioFormat = PKH_AUDIO_ALAW;
trunkConfig.compandMode = PKH_PHONE_AUDIO_ALAW;
TRY_OR_DIE(PKH_TRUNK_SetConfig(chan_data->handle, &trunkConfig), PK_SUCCESS, error);
}
PKH_QUEUE_Destroy(chan_data->media_in_queue);
free(chan_data);
continue;
TRY_OR_DIE(PKH_QUEUE_Attach(span_data->event_queue, chan_data->handle, (PK_VOID*) chan), PK_SUCCESS, error);
TRY_OR_DIE(PKH_TRUNK_GetMediaStreams(chan_data->handle, &chan_data->media_in, &chan_data->media_out), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Create(PKH_QUEUE_TYPE_NORMAL, &chan_data->media_in_queue), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Attach(chan_data->media_in_queue, chan_data->media_in, (PK_VOID*) chan), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Create(PKH_QUEUE_TYPE_CALLBACK, &chan_data->media_out_queue), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_SetEventHandler(chan_data->media_out_queue, media_out_callback), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Attach(chan_data->media_out_queue, chan_data->media_out, (PK_VOID*) chan), PK_SUCCESS, error);
TRY_OR_DIE(PKH_TRUNK_Start(chan_data->handle), PK_SUCCESS, error);
} else if (type == ZAP_CHAN_TYPE_FXS) {
TRY_OR_DIE(PKH_PHONE_Open(globals.open_boards[boardno], x, &chan_data->handle), PK_SUCCESS, fail_fxs);
TRY_OR_DIE(PKH_PHONE_Seize(chan_data->handle), PK_SUCCESS, fail_fxs);
TRY_OR_DIE(zap_span_add_channel(span, 0, type, &chan), ZAP_SUCCESS, fail_fxs);
TRY_OR_DIE(PKH_PHONE_GetMediaStreams(chan_data->handle, &chan_data->media_in, &chan_data->media_out), PK_SUCCESS, fail_fxs);
TRY_OR_DIE(PKH_QUEUE_Attach(span_data->event_queue, chan_data->handle, (PK_VOID*) chan), PK_SUCCESS, fail_fxs);
TRY_OR_DIE(PKH_QUEUE_Create(PKH_QUEUE_TYPE_NORMAL, &chan_data->media_in_queue), PK_SUCCESS, fail_fxs);
TRY_OR_DIE(PKH_QUEUE_Attach(chan_data->media_in_queue, chan_data->media_in, (PK_VOID*) chan), PK_SUCCESS, fail_fxs);
TRY_OR_DIE(PKH_QUEUE_Create(PKH_QUEUE_TYPE_CALLBACK, &chan_data->media_out_queue), PK_SUCCESS, fail_fxs);
TRY_OR_DIE(PKH_QUEUE_SetEventHandler(chan_data->media_out_queue, media_out_callback), PK_SUCCESS, fail_fxs);
TRY_OR_DIE(PKH_QUEUE_Attach(chan_data->media_out_queue, chan_data->media_out, (PK_VOID*) chan), PK_SUCCESS, fail_fxs);
TRY_OR_DIE(PKH_PHONE_Start(chan_data->handle), PK_SUCCESS, fail_fxs);
PKH_TPhoneConfig phoneConfig;
if (profile && profile->general_config.region == PKH_TRUNK_EU) {
TRY_OR_DIE(PKH_PHONE_GetConfig(chan_data->handle, &phoneConfig), PK_SUCCESS, error);
phoneConfig.internationalControl = PKH_PHONE_INTERNATIONAL_CONTROL_EU;
phoneConfig.compandMode = PKH_PHONE_AUDIO_ALAW;
TRY_OR_DIE(PKH_PHONE_SetConfig(chan_data->handle, &phoneConfig), PK_SUCCESS, error);
}
TRY_OR_DIE(PKH_PHONE_Open(globals.open_boards[boardno], x, &chan_data->handle), PK_SUCCESS, error);
TRY_OR_DIE(PKH_PHONE_Seize(chan_data->handle), PK_SUCCESS, error);
TRY_OR_DIE(PKH_PHONE_GetMediaStreams(chan_data->handle, &chan_data->media_in, &chan_data->media_out), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Attach(span_data->event_queue, chan_data->handle, (PK_VOID*) chan), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Create(PKH_QUEUE_TYPE_NORMAL, &chan_data->media_in_queue), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Attach(chan_data->media_in_queue, chan_data->media_in, (PK_VOID*) chan), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Create(PKH_QUEUE_TYPE_CALLBACK, &chan_data->media_out_queue), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_SetEventHandler(chan_data->media_out_queue, media_out_callback), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Attach(chan_data->media_out_queue, chan_data->media_out, (PK_VOID*) chan), PK_SUCCESS, error);
TRY_OR_DIE(PKH_PHONE_Start(chan_data->handle), PK_SUCCESS, error);
} else if (type == ZAP_CHAN_TYPE_B) {
TRY_OR_DIE(PKH_SPAN_SeizeChannel(span_data->handle, x), PK_SUCCESS, error);
TRY_OR_DIE(PKH_SPAN_GetMediaStreams(span_data->handle, x, &chan_data->media_in, &chan_data->media_out), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Create(PKH_QUEUE_TYPE_NORMAL, &chan_data->media_in_queue), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Attach(chan_data->media_in_queue, chan_data->media_in, (PK_VOID*) chan), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Create(PKH_QUEUE_TYPE_CALLBACK, &chan_data->media_out_queue), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_SetEventHandler(chan_data->media_out_queue, media_out_callback), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Attach(chan_data->media_out_queue, chan_data->media_out, (PK_VOID*) chan), PK_SUCCESS, error);
} else if (type == ZAP_CHAN_TYPE_DQ921) {
TRY_OR_DIE(PKH_SPAN_HDLC_Open(span_data->handle, PKH_SPAN_HDLC_MODE_NORMAL, &chan_data->handle), PK_SUCCESS, error);
TRY_OR_DIE(PKH_SPAN_HDLC_GetConfig(chan_data->handle, &chan_data->hdlc_config), PK_SUCCESS, error);
chan_data->hdlc_config.channelId = x;
TRY_OR_DIE(PKH_SPAN_HDLC_SetConfig(chan_data->handle, &chan_data->hdlc_config), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Create(PKH_QUEUE_TYPE_NORMAL, &chan_data->media_in_queue), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Attach(chan_data->media_in_queue, chan_data->handle, (PK_VOID*) chan), PK_SUCCESS, error);
TRY_OR_DIE(PKH_QUEUE_Attach(span_data->event_queue, chan_data->handle, (PK_VOID*) chan), PK_SUCCESS, error);
PKH_SPAN_SetConfig(span_data->handle, &span_data->span_config);
TRY_OR_DIE(PKH_SPAN_Start(span_data->handle), PK_SUCCESS, error);
}
goto ok;
fail_fxs:
zap_log(ZAP_LOG_ERROR, "failure configuring device s%dc%d\n", spanno, x);
zap_log(ZAP_LOG_ERROR, "Error: PKH_PHONE_Open %u failed(%s)!\n", x,
PKH_ERROR_GetText(status, error_text, sizeof(error_text)));
if (chan_data->handle) {
PKH_PHONE_Close(chan_data->handle);
}
PKH_QUEUE_Destroy(chan_data->media_in_queue);
free(chan_data);
}
error:
PKH_ERROR_GetText(status, error_text, sizeof(error_text));
zap_log(ZAP_LOG_ERROR, "failure configuring device b%ds%dc%d [%s]\n", boardno, spanno, x, error_text);
continue;
ok:
zap_set_flag(chan_data, PK_FLAG_READY);
status = PKH_RECORD_GetConfig(chan_data->media_in, &chan_data->record_config);
chan_data->record_config.encoding = PKH_RECORD_ENCODING_MU_LAW;
chan_data->record_config.samplingRate = PKH_RECORD_SAMPLING_RATE_8KHZ;
......@@ -377,13 +461,16 @@ static unsigned pika_open_range(zap_span_t *span, unsigned boardno, unsigned spa
chan_data->play_config.AGC = profile->play_config.AGC;
chan_data->ec_enabled = profile->ec_enabled;
chan_data->ec_config = profile->ec_config;
span_data->span_config.framing = profile->span_config.framing;
span_data->span_config.encoding = profile->span_config.encoding;
span_data->span_config.loopLength = profile->span_config.loopLength;
span_data->span_config.buildOut = profile->span_config.buildOut;
}
status = PKH_RECORD_SetConfig(chan_data->media_in, &chan_data->record_config);
status = PKH_PLAY_SetConfig(chan_data->media_out, &chan_data->play_config);
chan->mod_data = chan_data;
chan->physical_span_id = spanno;
chan->physical_chan_id = x;
......@@ -448,11 +535,10 @@ static ZIO_CONFIGURE_SPAN_FUNCTION(pika_configure_span)
bd = item_list[i];
if ((sp = strchr(bd, ':'))) {
*sp++ = '\0';
}
if ((ch = strchr(sp, ':'))) {
*ch++ = '\0';
}
}
if (!(bd && sp && ch)) {
zap_log(ZAP_LOG_ERROR, "Invalid input\n");
......@@ -504,8 +590,18 @@ static ZIO_CONFIGURE_SPAN_FUNCTION(pika_configure_span)
static ZIO_OPEN_FUNCTION(pika_open)
{
pika_chan_data_t *chan_data = (pika_chan_data_t *) zchan->mod_data;
if (!chan_data && !zap_test_flag(chan_data, PK_FLAG_READY)) {
return ZAP_FAIL;
}
if (chan_data->media_in_queue) {
PKH_QUEUE_Flush(chan_data->media_in_queue);
}
if (zchan->type == ZAP_CHAN_TYPE_FXS || zchan->type == ZAP_CHAN_TYPE_FXO || zchan->type == ZAP_CHAN_TYPE_B) {
PKH_PLAY_Start(chan_data->media_out);
}
return ZAP_SUCCESS;
}
......@@ -519,11 +615,15 @@ static ZIO_WAIT_FUNCTION(pika_wait)
pika_chan_data_t *chan_data = (pika_chan_data_t *) zchan->mod_data;
PK_STATUS status;
zap_wait_flag_t myflags = *flags;
PK_CHAR g_EventText[PKH_EVENT_MAX_NAME_LENGTH];
PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH];
*flags = ZAP_NO_FLAGS;
if (myflags & ZAP_READ) {
if (chan_data->hdlc_bytes) {
*flags |= ZAP_READ;
return ZAP_SUCCESS;
}
status = PKH_QUEUE_WaitOnEvent(chan_data->media_in_queue, to, &chan_data->last_media_event);
if (status == PK_SUCCESS) {
......@@ -535,8 +635,8 @@ static ZIO_WAIT_FUNCTION(pika_wait)
return ZAP_SUCCESS;
}
PKH_EVENT_GetText(chan_data->last_media_event.id, g_EventText, sizeof(g_EventText));
zap_log(ZAP_LOG_DEBUG, "Event: %s\n", g_EventText);
PKH_EVENT_GetText(chan_data->last_media_event.id, event_text, sizeof(event_text));
zap_log(ZAP_LOG_DEBUG, "Event: %s\n", event_text);
}
return ZAP_SUCCESS;
......@@ -546,7 +646,16 @@ static ZIO_READ_FUNCTION(pika_read)
{
pika_chan_data_t *chan_data = (pika_chan_data_t *) zchan->mod_data;
PK_STATUS status;
PK_CHAR g_EventText[PKH_EVENT_MAX_NAME_LENGTH];
PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH];
if (zchan->type == ZAP_CHAN_TYPE_DQ921) {
if ((status = PKH_SPAN_HDLC_GetMessage(chan_data->handle, data, *datalen)) == PK_SUCCESS) {
*datalen = chan_data->hdlc_bytes;
chan_data->hdlc_bytes = 0;
return ZAP_SUCCESS;
}
return ZAP_FAIL;
}
if (zchan->packet_len < *datalen) {
*datalen = zchan->packet_len;
......@@ -557,14 +666,22 @@ static ZIO_READ_FUNCTION(pika_read)
}
PKH_ERROR_GetText(status, g_EventText, sizeof(g_EventText));
zap_log(ZAP_LOG_DEBUG, "ERR: %s\n", g_EventText);
PKH_ERROR_GetText(status, event_text, sizeof(event_text));
zap_log(ZAP_LOG_DEBUG, "ERR: %s\n", event_text);
return ZAP_FAIL;
}
static ZIO_WRITE_FUNCTION(pika_write)
{
pika_chan_data_t *chan_data = (pika_chan_data_t *) zchan->mod_data;
PK_STATUS status;
if (zchan->type == ZAP_CHAN_TYPE_DQ921) {
if ((status = PKH_SPAN_HDLC_SendMessage(chan_data->handle, data, *datalen)) == PK_SUCCESS) {
return ZAP_SUCCESS;
}
return ZAP_FAIL;
}
if (PKH_PLAY_AddData(chan_data->media_out, 0, data, *datalen) == PK_SUCCESS) {
return ZAP_SUCCESS;
......@@ -706,22 +823,93 @@ static ZIO_SPAN_POLL_EVENT_FUNCTION(pika_poll_event)
{
pika_span_data_t *span_data = (pika_span_data_t *) span->mod_data;
PK_STATUS status;
PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH];
status = PKH_QUEUE_WaitOnEvent(span_data->event_queue, ms, &span_data->last_oob_event);
if (status == PK_SUCCESS) {
zap_channel_t *zchan = span_data->last_oob_event.userData;
//PK_CHAR g_EventText[PKH_EVENT_MAX_NAME_LENGTH];
zap_channel_t *zchan = NULL;
uint32_t *data = (uint32_t *) span_data->last_oob_event.userData;
zap_data_type_t data_type = ZAP_TYPE_NONE;
if (span_data->last_oob_event.id == PKH_EVENT_QUEUE_TIMEOUT) {
return ZAP_TIMEOUT;
}
//PKH_EVENT_GetText(span_data->last_oob_event.id, g_EventText, sizeof(g_EventText));
//zap_log(ZAP_LOG_DEBUG, "Event: %s\n", g_EventText);
if (data) {
data_type = *data;
}
if (data_type == ZAP_TYPE_CHANNEL) {
zchan = span_data->last_oob_event.userData;
} else if (data_type == ZAP_TYPE_SPAN) {
zap_time_t last_event_time = zap_current_time_in_ms();
uint32_t event_id = 0;
switch (span_data->last_oob_event.id) {
case PKH_EVENT_SPAN_ALARM_T1_RED:
case PKH_EVENT_SPAN_ALARM_T1_YELLOW:
case PKH_EVENT_SPAN_ALARM_T1_AIS:
case PKH_EVENT_SPAN_ALARM_E1_RED:
case PKH_EVENT_SPAN_ALARM_E1_RAI:
case PKH_EVENT_SPAN_ALARM_E1_AIS:
case PKH_EVENT_SPAN_ALARM_E1_RMAI:
case PKH_EVENT_SPAN_ALARM_E1_TS16AIS:
case PKH_EVENT_SPAN_ALARM_E1_TS16LOS:
case PKH_EVENT_SPAN_OUT_OF_SYNC:
case PKH_EVENT_SPAN_FRAMING_ERROR:
case PKH_EVENT_SPAN_LOSS_OF_SIGNAL:
case PKH_EVENT_SPAN_OUT_OF_CRC_MF_SYNC:
case PKH_EVENT_SPAN_OUT_OF_CAS_MF_SYNC:
event_id = ZAP_OOB_ALARM_TRAP;
break;
case PKH_EVENT_SPAN_ALARM_T1_RED_CLEAR:
case PKH_EVENT_SPAN_ALARM_T1_YELLOW_CLEAR:
case PKH_EVENT_SPAN_ALARM_T1_AIS_CLEAR:
case PKH_EVENT_SPAN_ALARM_E1_RED_CLEAR:
case PKH_EVENT_SPAN_ALARM_E1_RAI_CLEAR:
case PKH_EVENT_SPAN_ALARM_E1_AIS_CLEAR:
case PKH_EVENT_SPAN_ALARM_E1_RMAI_CLEAR:
case PKH_EVENT_SPAN_ALARM_E1_TS16AIS_CLEAR:
case PKH_EVENT_SPAN_ALARM_E1_TS16LOS_CLEAR:
case PKH_EVENT_SPAN_IN_SYNC:
case PKH_EVENT_SPAN_LOSS_OF_SIGNAL_CLEAR:
case PKH_EVENT_SPAN_IN_CRC_MF_SYNC:
case PKH_EVENT_SPAN_IN_CAS_MF_SYNC:
event_id = ZAP_OOB_ALARM_CLEAR;
break;
case PKH_EVENT_SPAN_MESSAGE:
case PKH_EVENT_SPAN_ABCD_SIGNAL_CHANGE:
break;
}
if (event_id) {
uint32_t x = 0;
zap_channel_t *zchan;
pika_chan_data_t *chan_data;
for(x = 1; x <= span->chan_count; x++) {
zchan = &span->channels[x];
assert(zchan != NULL);
chan_data = (pika_chan_data_t *) zchan->mod_data;
assert(chan_data != NULL);
zap_set_flag(zchan, ZAP_CHANNEL_EVENT);
zchan->last_event_time = last_event_time;
chan_data->last_oob_event = span_data->last_oob_event;
}
}
}
PKH_EVENT_GetText(span_data->last_oob_event.id, event_text, sizeof(event_text));
//zap_log(ZAP_LOG_DEBUG, "Event: %s\n", event_text);
if (zchan) {
pika_chan_data_t *chan_data = (pika_chan_data_t *) zchan->mod_data;
assert(chan_data != NULL);
zap_set_flag(zchan, ZAP_CHANNEL_EVENT);
zchan->last_event_time = zap_current_time_in_ms();
chan_data->last_oob_event = span_data->last_oob_event;
......@@ -740,18 +928,16 @@ static ZIO_SPAN_NEXT_EVENT_FUNCTION(pika_next_event)
for(i = 1; i <= span->chan_count; i++) {
if (zap_test_flag((&span->channels[i]), ZAP_CHANNEL_EVENT)) {
pika_chan_data_t *chan_data = (pika_chan_data_t *) span->channels[i].mod_data;
PK_CHAR g_EventText[PKH_EVENT_MAX_NAME_LENGTH];
PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH];
zap_clear_flag((&span->channels[i]), ZAP_CHANNEL_EVENT);
PKH_EVENT_GetText(chan_data->last_oob_event.id, g_EventText, sizeof(g_EventText));
zap_log(ZAP_LOG_DEBUG, "Event %d on channel %d:%d [%s]\n",
chan_data->last_oob_event.id,
span->channels[i].span_id,
span->channels[i].chan_id,
g_EventText);
PKH_EVENT_GetText(chan_data->last_oob_event.id, event_text, sizeof(event_text));
switch(chan_data->last_oob_event.id) {
case PKH_EVENT_HDLC_MESSAGE:
chan_data->hdlc_bytes = chan_data->last_oob_event.p2;
continue;
case PKH_EVENT_TRUNK_HOOKFLASH:
event_id = ZAP_OOB_FLASH;
break;
......@@ -774,6 +960,79 @@ static ZIO_SPAN_NEXT_EVENT_FUNCTION(pika_next_event)
event_id = ZAP_OOB_ONHOOK;
break;
case PKH_EVENT_SPAN_ALARM_T1_RED:
zap_set_alarm_flag((&span->channels[i]), ZAP_ALARM_RED);
snprintf(span->channels[i].last_error, sizeof(span->channels[i].last_error), "RED ALARM");
event_id = ZAP_OOB_ALARM_TRAP;
break;
case PKH_EVENT_SPAN_ALARM_T1_YELLOW:
zap_set_alarm_flag((&span->channels[i]), ZAP_ALARM_YELLOW);
snprintf(span->channels[i].last_error, sizeof(span->channels[i].last_error), "YELLOW ALARM");
event_id = ZAP_OOB_ALARM_TRAP;
break;
case PKH_EVENT_SPAN_ALARM_T1_AIS:
zap_set_alarm_flag((&span->channels[i]), ZAP_ALARM_AIS);
snprintf(span->channels[i].last_error, sizeof(span->channels[i].last_error), "AIS ALARM");
event_id = ZAP_OOB_ALARM_TRAP;
break;
case PKH_EVENT_SPAN_ALARM_E1_RED:
zap_set_alarm_flag((&span->channels[i]), ZAP_ALARM_RED);
snprintf(span->channels[i].last_error, sizeof(span->channels[i].last_error), "RED ALARM");
event_id = ZAP_OOB_ALARM_TRAP;
break;
case PKH_EVENT_SPAN_ALARM_E1_RAI:
zap_set_alarm_flag((&span->channels[i]), ZAP_ALARM_RAI);
snprintf(span->channels[i].last_error, sizeof(span->channels[i].last_error), "RAI ALARM");
event_id = ZAP_OOB_ALARM_TRAP;
break;
case PKH_EVENT_SPAN_ALARM_E1_AIS:
zap_set_alarm_flag((&span->channels[i]), ZAP_ALARM_AIS);
snprintf(span->channels[i].last_error, sizeof(span->channels[i].last_error), "AIS ALARM");
event_id = ZAP_OOB_ALARM_TRAP;
break;
case PKH_EVENT_SPAN_ALARM_E1_RMAI:
case PKH_EVENT_SPAN_ALARM_E1_TS16AIS:
case PKH_EVENT_SPAN_ALARM_E1_TS16LOS:
case PKH_EVENT_SPAN_OUT_OF_SYNC:
case PKH_EVENT_SPAN_FRAMING_ERROR:
case PKH_EVENT_SPAN_LOSS_OF_SIGNAL:
case PKH_EVENT_SPAN_OUT_OF_CRC_MF_SYNC:
case PKH_EVENT_SPAN_OUT_OF_CAS_MF_SYNC:
zap_set_alarm_flag((&span->channels[i]), ZAP_ALARM_GENERAL);
snprintf(span->channels[i].last_error, sizeof(span->channels[i].last_error), "GENERAL ALARM");
event_id = ZAP_OOB_ALARM_TRAP;
break;
case PKH_EVENT_SPAN_ALARM_T1_RED_CLEAR:
zap_set_alarm_flag((&span->channels[i]), ZAP_ALARM_RED);
case PKH_EVENT_SPAN_ALARM_T1_YELLOW_CLEAR:
zap_set_alarm_flag((&span->channels[i]), ZAP_ALARM_YELLOW);
case PKH_EVENT_SPAN_ALARM_T1_AIS_CLEAR:
zap_set_alarm_flag((&span->channels[i]), ZAP_ALARM_AIS);
case PKH_EVENT_SPAN_ALARM_E1_RED_CLEAR:
zap_set_alarm_flag((&span->channels[i]), ZAP_ALARM_RED);
case PKH_EVENT_SPAN_ALARM_E1_RAI_CLEAR:
zap_set_alarm_flag((&span->channels[i]), ZAP_ALARM_RAI);
case PKH_EVENT_SPAN_ALARM_E1_AIS_CLEAR:
zap_set_alarm_flag((&span->channels[i]), ZAP_ALARM_AIS);
case PKH_EVENT_SPAN_ALARM_E1_RMAI_CLEAR:
case PKH_EVENT_SPAN_ALARM_E1_TS16AIS_CLEAR:
case PKH_EVENT_SPAN_ALARM_E1_TS16LOS_CLEAR:
case PKH_EVENT_SPAN_IN_SYNC:
case PKH_EVENT_SPAN_LOSS_OF_SIGNAL_CLEAR:
case PKH_EVENT_SPAN_IN_CRC_MF_SYNC:
case PKH_EVENT_SPAN_IN_CAS_MF_SYNC:
zap_clear_alarm_flag((&span->channels[i]), ZAP_ALARM_GENERAL);
event_id = ZAP_OOB_ALARM_CLEAR;
break;
case PKH_EVENT_SPAN_MESSAGE:
case PKH_EVENT_SPAN_ABCD_SIGNAL_CHANGE:
break;
case PKH_EVENT_TRUNK_ONHOOK:
case PKH_EVENT_TRUNK_OFFHOOK:
case PKH_EVENT_TRUNK_DIALED :
......@@ -783,7 +1042,7 @@ static ZIO_SPAN_NEXT_EVENT_FUNCTION(pika_next_event)
case PKH_EVENT_TRUNK_LOF:
case PKH_EVENT_TRUNK_RX_OVERLOAD:
default:
zap_log(ZAP_LOG_DEBUG, "Unhandled event %d on channel %d [%s]\n", chan_data->last_oob_event.id, i, g_EventText);
zap_log(ZAP_LOG_DEBUG, "Unhandled event %d on channel %d [%s]\n", chan_data->last_oob_event.id, i, event_text);
event_id = ZAP_OOB_INVALID;
break;
}
......@@ -817,15 +1076,33 @@ static ZIO_CHANNEL_DESTROY_FUNCTION(pika_channel_destroy)
pika_chan_data_t *chan_data = (pika_chan_data_t *) zchan->mod_data;
pika_span_data_t *span_data = (pika_span_data_t *) zchan->span->mod_data;
if (zchan->type == ZAP_CHAN_TYPE_FXS || zchan->type == ZAP_CHAN_TYPE_FXO) {
PKH_QUEUE_Detach(span_data->event_queue, chan_data->handle);
PKH_TRUNK_Close(chan_data->handle);
if (!chan_data) {
return ZAP_FAIL;
}
PKH_RECORD_Stop(chan_data->media_in);
PKH_PLAY_Stop(chan_data->media_out);
PKH_QUEUE_Destroy(chan_data->media_in_queue);
PKH_QUEUE_Destroy(chan_data->media_out_queue);
switch(zchan->type) {
case ZAP_CHAN_TYPE_FXS:
PKH_QUEUE_Detach(span_data->event_queue, chan_data->handle);
PKH_PHONE_Close(chan_data->handle);
break;
case ZAP_CHAN_TYPE_FXO:
PKH_QUEUE_Detach(span_data->event_queue, chan_data->handle);
PKH_TRUNK_Close(chan_data->handle);
break;
case ZAP_CHAN_TYPE_DQ921:
PKH_SPAN_Stop(span_data->handle);
break;
default:
break;
}
zap_mutex_destroy(&chan_data->digit_mutex);
zap_buffer_destroy(&chan_data->digit_buffer);
zap_safe_free(chan_data);
......@@ -853,6 +1130,7 @@ zap_status_t pika_init(zap_io_interface_t **zint)
assert(zint != NULL);
memset(&pika_interface, 0, sizeof(pika_interface));
memset(&globals, 0, sizeof(globals));
globals.general_config.region = PKH_TRUNK_NA;
globals.profile_hash = create_hashtable(16, zap_hash_hashfromstring, zap_hash_equalkeys);
......@@ -884,12 +1162,22 @@ zap_status_t pika_init(zap_io_interface_t **zint)
status = PKH_EC_GetConfig(tmpHandle, &globals.ec_config);
status = PKH_MEDIA_STREAM_Destroy(tmpHandle);
zap_log(ZAP_LOG_DEBUG, "Found %u board%s\n", globals.board_list.numberOfBoards, globals.board_list.numberOfBoards == 1 ? "" : "s");
for(i = 0; i < globals.board_list.numberOfBoards; ++i) {
zap_log(ZAP_LOG_INFO, "Found PIKA board type:[%s] id:[%u] serno:[%u]\n",
pika_board_type_string(globals.board_list.board[i].type), globals.board_list.board[i].id, (uint32_t)
globals.board_list.board[i].serialNumber);
if (globals.board_list.board[i].type == PKH_BOARD_TYPE_DIGITAL_GATEWAY) {
TPikaHandle tmp, tmp2;
PKH_BOARD_Open(globals.board_list.board[i].id, NULL, &tmp);
PKH_SPAN_Open(tmp, 0, NULL, &tmp2);
PKH_SPAN_GetConfig(tmp2, &globals.span_config);
PKH_SPAN_Close(tmp2);
PKH_BOARD_Close(tmp);
}
ok++;
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论