[asterisk-commits] rmudgett: trunk r187635 - in /trunk/channels: ./ misdn/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Apr 10 09:54:02 CDT 2009
Author: rmudgett
Date: Fri Apr 10 09:53:59 2009
New Revision: 187635
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=187635
Log:
Miscellaneous minor changes to chan_misdn.
* Miscellaneous spacing and comment changes.
* Minor code rearangements.
* Miscellaneous doxygen comments.
Modified:
trunk/channels/chan_misdn.c
trunk/channels/misdn/isdn_lib.c
trunk/channels/misdn/isdn_lib.h
Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=187635&r1=187634&r2=187635
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Fri Apr 10 09:53:59 2009
@@ -125,7 +125,7 @@
MISDN_ALERTING, /*!< when Alerting */
MISDN_BUSY, /*!< when BUSY */
MISDN_CONNECTED, /*!< when connected */
- MISDN_PRECONNECTED, /*!< when connected */
+ MISDN_PRECONNECTED, /*!< when connected (Noone sets this state) */
MISDN_DISCONNECTED, /*!< when connected */
MISDN_RELEASED, /*!< when connected */
MISDN_BRIDGED, /*!< when bridged */
@@ -303,8 +303,6 @@
*/
struct ast_channel * ast;
- //int dummy; /* Not used */
-
/*!
* \brief Associated B channel structure.
*/
@@ -437,7 +435,7 @@
robin = NULL;
}
-static struct robin_list* get_robin_position(char *group)
+static struct robin_list *get_robin_position(char *group)
{
struct robin_list *new;
struct robin_list *iter = robin;
@@ -468,7 +466,7 @@
__attribute__((format(printf, 3, 4)));
static struct ast_channel *misdn_new(struct chan_list *cl, int state, char *exten, char *callerid, int format, int port, int c);
-static void send_digit_to_chan(struct chan_list *cl, char digit );
+static void send_digit_to_chan(struct chan_list *cl, char digit);
static void hangup_chan(struct chan_list *ch);
static int pbx_start_chan(struct chan_list *ch);
@@ -542,7 +540,7 @@
/*************** Helpers *****************/
-static struct chan_list * get_chan_by_ast(struct ast_channel *ast)
+static struct chan_list *get_chan_by_ast(struct ast_channel *ast)
{
struct chan_list *tmp;
@@ -555,7 +553,7 @@
return NULL;
}
-static struct chan_list * get_chan_by_ast_name(char *name)
+static struct chan_list *get_chan_by_ast_name(char *name)
{
struct chan_list *tmp;
@@ -1395,7 +1393,8 @@
misdn_tasks = sched_context_create();
pthread_create(&misdn_tasks_thread, NULL, misdn_tasks_thread_func, &blocker);
- while (sem_wait(&blocker) && --i);
+ while (sem_wait(&blocker) && --i) {
+ }
sem_destroy(&blocker);
}
@@ -1403,7 +1402,7 @@
{
if (misdn_tasks) {
chan_misdn_log(4, 0, "Killing misdn_tasks thread\n");
- if ( pthread_cancel(misdn_tasks_thread) == 0 ) {
+ if (pthread_cancel(misdn_tasks_thread) == 0) {
cb_log(4, 0, "Joining misdn_tasks thread\n");
pthread_join(misdn_tasks_thread, NULL);
}
@@ -1509,6 +1508,7 @@
static void send_digit_to_chan(struct chan_list *cl, char digit)
{
static const char *dtmf_tones[] = {
+/* *INDENT-OFF* */
"!941+1336/100,!0/100", /* 0 */
"!697+1209/100,!0/100", /* 1 */
"!697+1336/100,!0/100", /* 2 */
@@ -1525,6 +1525,7 @@
"!941+1633/100,!0/100", /* D */
"!941+1209/100,!0/100", /* * */
"!941+1477/100,!0/100", /* # */
+/* *INDENT-ON* */
};
struct ast_channel *chan = cl->ast;
@@ -1872,6 +1873,7 @@
if (onlyport < 0) {
int port = misdn_cfg_get_next_port(0);
+
for (; port > 0; port = misdn_cfg_get_next_port(port)) {
ast_cli(a->fd, "\n[PORT %d]\n", port);
for (elem = MISDN_CFG_FIRST + 1, linebreak = 1; elem < MISDN_CFG_LAST; elem++, linebreak++) {
@@ -1994,7 +1996,7 @@
return CLI_SUCCESS;
}
-static void print_bc_info (int fd, struct chan_list *help, struct misdn_bchannel *bc)
+static void print_bc_info(int fd, struct chan_list *help, struct misdn_bchannel *bc)
{
struct ast_channel *ast = help->ast;
@@ -2197,8 +2199,9 @@
ast_cli(a->fd, "BEGIN STACK_LIST:\n");
for (port = misdn_cfg_get_next_port(0); port > 0;
- port = misdn_cfg_get_next_port(port)) {
+ port = misdn_cfg_get_next_port(port)) {
char buf[128];
+
get_show_stack_details(port, buf);
ast_cli(a->fd, " %s Debug:%d%s\n", buf, misdn_debug[port], misdn_debug_only[port] ? "(only)" : "");
}
@@ -2227,7 +2230,7 @@
ast_cli(a->fd, "Port\tin_calls\tout_calls\n");
for (port = misdn_cfg_get_next_port(0); port > 0;
- port = misdn_cfg_get_next_port(port)) {
+ port = misdn_cfg_get_next_port(port)) {
ast_cli(a->fd, "%d\t%d\t\t%d\n", port, misdn_in_calls[port], misdn_out_calls[port]);
}
ast_cli(a->fd, "\n");
@@ -2329,12 +2332,11 @@
bc->fac_out.Function = Fac_CFActivate;
bc->fac_out.u.CFActivate.BasicService = 0; /* All Services */
bc->fac_out.u.CFActivate.Procedure = 0; /* Unconditional */
- ast_copy_string((char *)bc->fac_out.u.CFActivate.ServedUserNumber, served_nr, sizeof(bc->fac_out.u.CFActivate.ServedUserNumber));
- ast_copy_string((char *)bc->fac_out.u.CFActivate.ForwardedToNumber, nr, sizeof(bc->fac_out.u.CFActivate.ForwardedToNumber));
+ ast_copy_string((char *) bc->fac_out.u.CFActivate.ServedUserNumber, served_nr, sizeof(bc->fac_out.u.CFActivate.ServedUserNumber));
+ ast_copy_string((char *) bc->fac_out.u.CFActivate.ForwardedToNumber, nr, sizeof(bc->fac_out.u.CFActivate.ForwardedToNumber));
misdn_lib_send_event(bc, EVENT_FACILITY);
} else if (strstr(a->argv[3], "CFDeactivate")) {
-
if (a->argc < 6) {
ast_verbose("CFDeactivate requires 1 arg: FromNumber\n\n");
return 0;
@@ -2603,6 +2605,7 @@
}
static struct ast_cli_entry chan_misdn_clis[] = {
+/* *INDENT-OFF* */
AST_CLI_DEFINE(handle_cli_misdn_port_block, "Block the given port"),
AST_CLI_DEFINE(handle_cli_misdn_port_down, "Try to deactivate the L1 on the given port"),
AST_CLI_DEFINE(handle_cli_misdn_port_unblock, "Unblock the given port"),
@@ -2624,6 +2627,7 @@
AST_CLI_DEFINE(handle_cli_misdn_set_debug, "Set Debuglevel of chan_misdn"),
AST_CLI_DEFINE(handle_cli_misdn_set_tics, "???"),
AST_CLI_DEFINE(handle_cli_misdn_toggle_echocancel, "Toggle EchoCancel on mISDN Channel"),
+/* *INDENT-ON* */
};
/*! \brief Updates caller ID information from config */
@@ -2686,13 +2690,14 @@
static void config_jitterbuffer(struct chan_list *ch)
{
struct misdn_bchannel *bc = ch->bc;
- int len = ch->jb_len, threshold = ch->jb_upper_threshold;
+ int len = ch->jb_len;
+ int threshold = ch->jb_upper_threshold;
chan_misdn_log(5, bc->port, "config_jb: Called\n");
- if (! len) {
+ if (!len) {
chan_misdn_log(1, bc->port, "config_jb: Deactivating Jitterbuffer\n");
- bc->nojitter=1;
+ bc->nojitter = 1;
} else {
if (len <= 100 || len > 8000) {
chan_misdn_log(0, bc->port, "config_jb: Jitterbuffer out of Bounds, setting to 1000\n");
@@ -2703,7 +2708,7 @@
chan_misdn_log(0, bc->port, "config_jb: Jitterbuffer Threshold > Jitterbuffer setting to Jitterbuffer -1\n");
}
- if ( ch->jb) {
+ if (ch->jb) {
cb_log(0, bc->port, "config_jb: We've got a Jitterbuffer Already on this port.\n");
misdn_jb_destroy(ch->jb);
ch->jb = NULL;
@@ -3015,7 +3020,7 @@
/*!
* \internal
- * \brief Copy the redirecting info out of the Asterisk channel
+ * \brief Copy the redirecting information out of the Asterisk channel
*
* \param bc Associated B channel
* \param ast Current Asterisk channel
@@ -3102,6 +3107,7 @@
exceed = add_out_calls(port);
if (exceed != 0) {
char tmp[16];
+
snprintf(tmp, sizeof(tmp), "%d", exceed);
pbx_builtin_setvar_helper(ast, "MAX_OVERFLOW", tmp);
ast->hangupcause = AST_CAUSE_NORMAL_TEMPORARY_FAILURE;
@@ -3290,7 +3296,7 @@
return -1;
}
- switch (p->state ) {
+ switch (p->state) {
case MISDN_CALLING:
if (strlen(bc->infos_pending) < sizeof(bc->infos_pending) - 1) {
strncat(bc->infos_pending, buf, sizeof(bc->infos_pending) - strlen(bc->infos_pending) - 1);
@@ -3342,12 +3348,12 @@
{
struct chan_list *p;
- if (!ast || ! (p=MISDN_ASTERISK_TECH_PVT(ast))) {
+ if (!ast || !(p = MISDN_ASTERISK_TECH_PVT(ast))) {
ast_log(LOG_WARNING, "Returned -1 in misdn_indication\n");
return -1;
}
- if (!p->bc ) {
+ if (!p->bc) {
chan_misdn_log(1, 0, "* IND : Indication from %s\n", ast->exten);
ast_log(LOG_WARNING, "Private Pointer but no bc ?\n");
return -1;
@@ -3363,7 +3369,7 @@
p->bc->out_cause = AST_CAUSE_USER_BUSY;
if (p->state != MISDN_CONNECTED) {
start_bc_tones(p);
- misdn_lib_send_event( p->bc, EVENT_DISCONNECT);
+ misdn_lib_send_event(p->bc, EVENT_DISCONNECT);
} else {
chan_misdn_log(-1, p->bc->port, " --> !! Got Busy in Connected State !?! ast:%s\n", ast->name);
}
@@ -3383,7 +3389,7 @@
default:
p->state = MISDN_ALERTING;
chan_misdn_log(2, p->bc->port, " --> * IND :\tringing pid:%d\n", p->bc->pid);
- misdn_lib_send_event( p->bc, EVENT_ALERTING);
+ misdn_lib_send_event(p->bc, EVENT_ALERTING);
if (p->other_ch && p->other_ch->bc) {
if (misdn_inband_avail(p->other_ch->bc)) {
@@ -3422,18 +3428,18 @@
break;
case AST_CONTROL_PROGRESS:
chan_misdn_log(1, p->bc->port, " --> * IND :\tprogress pid:%d\n", p->bc->pid);
- misdn_lib_send_event( p->bc, EVENT_PROGRESS);
+ misdn_lib_send_event(p->bc, EVENT_PROGRESS);
break;
case AST_CONTROL_PROCEEDING:
chan_misdn_log(1, p->bc->port, " --> * IND :\tproceeding pid:%d\n", p->bc->pid);
- misdn_lib_send_event( p->bc, EVENT_PROCEEDING);
+ misdn_lib_send_event(p->bc, EVENT_PROCEEDING);
break;
case AST_CONTROL_CONGESTION:
chan_misdn_log(1, p->bc->port, " --> * IND :\tcongestion pid:%d\n", p->bc->pid);
p->bc->out_cause = AST_CAUSE_SWITCH_CONGESTION;
start_bc_tones(p);
- misdn_lib_send_event( p->bc, EVENT_DISCONNECT);
+ misdn_lib_send_event(p->bc, EVENT_DISCONNECT);
if (p->bc->nt) {
hanguptone_indicate(p);
@@ -3510,7 +3516,7 @@
if (ast->_state == AST_STATE_RESERVED ||
p->state == MISDN_NOTHING ||
p->state == MISDN_HOLDED ||
- p->state == MISDN_HOLD_DISCONNECT ) {
+ p->state == MISDN_HOLD_DISCONNECT) {
CLEAN_CH:
/* between request and call */
@@ -3552,6 +3558,7 @@
if ((varcause = pbx_builtin_getvar_helper(ast, "HANGUPCAUSE")) ||
(varcause = pbx_builtin_getvar_helper(ast, "PRI_CAUSE"))) {
int tmpcause = atoi(varcause);
+
bc->out_cause = tmpcause ? tmpcause : AST_CAUSE_NORMAL_CLEARING;
}
ast_channel_unlock(ast);
@@ -3730,6 +3737,8 @@
case 2:
ast_verb(3, "Not redirecting %s to fax extension, nojump is set.\n", ast->name);
break;
+ default:
+ break;
}
} else {
ast_debug(1, "Fax already handled\n");
@@ -3787,7 +3796,6 @@
chan_misdn_log(2, tmp->bc->port, "misdn_read: Pipe closed, hanging up\n");
return NULL;
}
-
} else {
return NULL;
}
@@ -3848,7 +3856,7 @@
return 0;
}
- if (!ch->bc ) {
+ if (!ch->bc) {
ast_log(LOG_WARNING, "private but no bc\n");
return -1;
}
@@ -3870,7 +3878,7 @@
}
- if (!frame->samples ) {
+ if (!frame->samples) {
chan_misdn_log(4, ch->bc->port, "misdn_write: zero write\n");
if (!strcmp(frame->src,"ast_prod")) {
@@ -3893,7 +3901,8 @@
#ifdef MISDN_DEBUG
{
- int i, max = 5 > frame->samples ? frame->samples : 5;
+ int i;
+ int max = 5 > frame->samples ? frame->samples : 5;
ast_debug(1, "write2mISDN %p %d bytes: ", p, frame->samples);
@@ -3909,7 +3918,9 @@
break;
default:
if (!ch->dropped_frame_cnt) {
- chan_misdn_log(5, ch->bc->port, "BC not active (nor bridged) dropping: %d frames addr:%x exten:%s cid:%s ch->state:%s bc_state:%d l3id:%x\n", frame->samples, ch->bc->addr, ast->exten, ast->cid.cid_num, misdn_get_ch_state( ch), ch->bc->bc_state, ch->bc->l3_id);
+ chan_misdn_log(5, ch->bc->port,
+ "BC not active (nor bridged) dropping: %d frames addr:%x exten:%s cid:%s ch->state:%s bc_state:%d l3id:%x\n",
+ frame->samples, ch->bc->addr, ast->exten, ast->cid.cid_num, misdn_get_ch_state(ch), ch->bc->bc_state, ch->bc->l3_id);
}
if (++ch->dropped_frame_cnt > 100) {
@@ -3930,7 +3941,7 @@
}
} else {
- /*transmit without jitterbuffer*/
+ /* transmit without jitterbuffer */
i = misdn_lib_tx2misdn_frm(ch->bc, frame->data.ptr, frame->samples);
}
@@ -3983,11 +3994,11 @@
ch2->bc->caller.name,
ch2->bc->caller.number);
- if (! (flags & AST_BRIDGE_DTMF_CHANNEL_0) ) {
+ if (!(flags & AST_BRIDGE_DTMF_CHANNEL_0)) {
ch1->ignore_dtmf = 1;
}
- if (! (flags & AST_BRIDGE_DTMF_CHANNEL_1) ) {
+ if (!(flags & AST_BRIDGE_DTMF_CHANNEL_1)) {
ch2->ignore_dtmf = 1;
}
@@ -4004,17 +4015,18 @@
if (!f || f->frametype == AST_FRAME_CONTROL) {
/* got hangup .. */
- if (!f)
+ if (!f) {
chan_misdn_log(4, ch1->bc->port, "Read Null Frame\n");
- else
+ } else {
chan_misdn_log(4, ch1->bc->port, "Read Frame Control class:%d\n", f->subclass);
+ }
*fo = f;
*rc = who;
break;
}
- if ( f->frametype == AST_FRAME_DTMF ) {
+ if (f->frametype == AST_FRAME_DTMF) {
chan_misdn_log(1, 0, "Read DTMF %d from %s\n", f->subclass, who->exten);
*fo = f;
@@ -4176,7 +4188,7 @@
}
if (!ast_strlen_zero(args.intf)) {
- if (args.intf[0] == 'g' && args.intf[1] == ':' ) {
+ if (args.intf[0] == 'g' && args.intf[1] == ':') {
/* We make a group call lets checkout which ports are in my group */
args.intf += 2;
ast_copy_string(group, args.intf, sizeof(group));
@@ -4230,7 +4242,8 @@
}
if (port <= port_start && next_chan) {
- int maxbchans=misdn_lib_get_maxchans(port);
+ int maxbchans = misdn_lib_get_maxchans(port);
+
if (++robin_channel >= maxbchans) {
robin_channel = 1;
}
@@ -4242,6 +4255,7 @@
if (!strcasecmp(cfg_group, group)) {
int port_up;
int check;
+
misdn_cfg_get(port, MISDN_CFG_PMP_L1_CHECK, &check, sizeof(check));
port_up = misdn_lib_port_up(port, check);
@@ -4270,14 +4284,14 @@
} while (!newbc && robin_channel != rr->channel);
} else {
for (port = misdn_cfg_get_next_port(0); port > 0;
- port = misdn_cfg_get_next_port(port)) {
-
+ port = misdn_cfg_get_next_port(port)) {
misdn_cfg_get(port, MISDN_CFG_GROUPNAME, cfg_group, sizeof(cfg_group));
chan_misdn_log(3, port, "Group [%s] Port [%d]\n", group, port);
if (!strcasecmp(cfg_group, group)) {
int port_up;
int check;
+
misdn_cfg_get(port, MISDN_CFG_PMP_L1_CHECK, &check, sizeof(check));
port_up = misdn_lib_port_up(port, check);
@@ -4296,10 +4310,10 @@
/* Group dial failed ?*/
if (!newbc) {
ast_log(LOG_WARNING,
- "Could not Dial out on group '%s'.\n"
- "\tEither the L2 and L1 on all of these ports where DOWN (see 'show application misdn_check_l2l1')\n"
- "\tOr there was no free channel on none of the ports\n\n"
- , group);
+ "Could not Dial out on group '%s'.\n"
+ "\tEither the L2 and L1 on all of these ports where DOWN (see 'show application misdn_check_l2l1')\n"
+ "\tOr there was no free channel on none of the ports\n\n",
+ group);
return NULL;
}
} else {
@@ -4313,7 +4327,6 @@
return NULL;
}
}
-
/* create ast_channel and link all the objects together */
cl = init_chan_list(ORG_AST);
@@ -4404,6 +4417,7 @@
int chan_offset = 0;
int tmp_port = misdn_cfg_get_next_port(0);
char newname[255];
+
for (; tmp_port > 0; tmp_port = misdn_cfg_get_next_port(tmp_port)) {
if (tmp_port == port) {
break;
@@ -4458,7 +4472,6 @@
tmp->tech_pvt = chlist;
misdn_cfg_get(0, MISDN_GEN_BRIDGING, &bridging, sizeof(bridging));
-
tmp->tech = bridging ? &misdn_tech : &misdn_tech_wo_bridge;
tmp->writeformat = format;
@@ -4495,6 +4508,7 @@
static struct chan_list *find_chan_by_bc(struct chan_list *list, struct misdn_bchannel *bc)
{
struct chan_list *help = list;
+
for (; help; help = help->next) {
if (help->bc == bc) {
return help;
@@ -4513,6 +4527,7 @@
static struct chan_list *find_chan_by_pid(struct chan_list *list, int pid)
{
struct chan_list *help = list;
+
for (; help; help = help->next) {
if (help->bc && (help->bc->pid == pid)) {
return help;
@@ -4632,12 +4647,14 @@
static void hangup_chan(struct chan_list *ch)
{
- int port = ch ? (ch->bc ? ch->bc->port : 0) : 0;
+ int port;
+
if (!ch) {
cb_log(1, 0, "Cannot hangup chan, no ch\n");
return;
}
+ port = ch->bc ? ch->bc->port : 0;
cb_log(5, port, "hangup_chan called\n");
if (ch->need_hangup) {
@@ -4770,14 +4787,12 @@
if (!ch->noautorespond_on_setup) {
if (bc->nt) {
- int ret;
- ret = misdn_lib_send_event(bc, EVENT_SETUP_ACKNOWLEDGE );
+ misdn_lib_send_event(bc, EVENT_SETUP_ACKNOWLEDGE);
} else {
- int ret;
- if ( misdn_lib_is_ptp(bc->port)) {
- ret = misdn_lib_send_event(bc, EVENT_SETUP_ACKNOWLEDGE );
+ if (misdn_lib_is_ptp(bc->port)) {
+ misdn_lib_send_event(bc, EVENT_SETUP_ACKNOWLEDGE);
} else {
- ret = misdn_lib_send_event(bc, EVENT_PROCEEDING );
+ misdn_lib_send_event(bc, EVENT_PROCEEDING);
}
}
} else {
@@ -4802,7 +4817,7 @@
}
- while (!ast_strlen_zero(predial) ) {
+ while (!ast_strlen_zero(predial)) {
fr.frametype = AST_FRAME_DTMF;
fr.subclass = *predial;
fr.src = NULL;
@@ -4991,7 +5006,7 @@
static void wait_for_digits(struct chan_list *ch, struct misdn_bchannel *bc, struct ast_channel *chan)
{
ch->state = MISDN_WAITING4DIGS;
- misdn_lib_send_event(bc, EVENT_SETUP_ACKNOWLEDGE );
+ misdn_lib_send_event(bc, EVENT_SETUP_ACKNOWLEDGE);
if (bc->nt && !bc->dialed.number[0]) {
dialtone_indicate(ch);
}
@@ -5006,9 +5021,11 @@
{
struct chan_list *ch = find_chan_by_bc(cl_te, bc);
- if (event != EVENT_BCHAN_DATA && event != EVENT_TONE_GENERATE) { /* Debug Only Non-Bchan */
+ if (event != EVENT_BCHAN_DATA && event != EVENT_TONE_GENERATE) {
int debuglevel = 1;
- if ( event == EVENT_CLEANUP && !user_data) {
+
+ /* Debug Only Non-Bchan */
+ if (event == EVENT_CLEANUP && !user_data) {
debuglevel = 5;
}
@@ -5068,6 +5085,7 @@
}
return -1;
}
+ break;
}
}
@@ -5106,7 +5124,7 @@
}
if (bc) {
- ch->bc = (struct misdn_bchannel *)user_data;
+ ch->bc = (struct misdn_bchannel *) user_data;
}
break;
@@ -5132,8 +5150,8 @@
} else {
chan_misdn_log(2, bc->port, " --> Ignoring DTMF:%c due to bridge flags\n", bc->dtmf);
}
- }
- break;
+ break;
+ }
case EVENT_STATUS:
break;
@@ -5146,7 +5164,7 @@
break;
}
- if (ch->state == MISDN_WAITING4DIGS ) {
+ if (ch->state == MISDN_WAITING4DIGS) {
/* Ok, incomplete Setup, waiting till extension exists */
if (ast_strlen_zero(bc->info_dad) && ! ast_strlen_zero(bc->keypad)) {
chan_misdn_log(1, bc->port, " --> using keypad as info\n");
@@ -5224,7 +5242,7 @@
fr.delivery = ast_tv(0,0);
misdn_cfg_get(0, MISDN_GEN_APPEND_DIGITS2EXTEN, &digits, sizeof(digits));
- if (ch->state != MISDN_CONNECTED ) {
+ if (ch->state != MISDN_CONNECTED) {
if (digits) {
strncat(bc->dialed.number, bc->info_dad, sizeof(bc->dialed.number) - strlen(bc->dialed.number) - 1);
ast_copy_string(ch->ast->exten, bc->dialed.number, sizeof(ch->ast->exten));
@@ -5271,7 +5289,6 @@
print_bearer(bc);
ch = init_chan_list(ORG_MISDN);
-
if (!ch) {
chan_misdn_log(-1, bc->port, "cb_events: malloc for chan_list failed!\n");
return 0;
@@ -5344,6 +5361,7 @@
break;
default:
pbx_builtin_setvar_helper(chan, "CALLTYPE", "SPEECH");
+ break;
}
/** queue new chan **/
@@ -5379,8 +5397,8 @@
/* Check for Pickup Request first */
if (!strcmp(chan->exten, ast_pickup_ext())) {
if (!ch->noautorespond_on_setup) {
- int ret;/** Sending SETUP_ACK**/
- ret = misdn_lib_send_event(bc, EVENT_SETUP_ACKNOWLEDGE );
+ /* Sending SETUP_ACK */
+ misdn_lib_send_event(bc, EVENT_SETUP_ACKNOWLEDGE);
} else {
ch->state = MISDN_INCOMING_SETUP;
}
@@ -5433,7 +5451,6 @@
bc->out_cause = AST_CAUSE_UNALLOCATED;
misdn_lib_send_event(bc, bc->nt ? EVENT_RELEASE_COMPLETE : EVENT_RELEASE);
-
break;
}
@@ -5443,7 +5460,7 @@
if (bc->sending_complete || (!bc->nt && !misdn_lib_is_ptp(bc->port))) {
if (!ch->noautorespond_on_setup) {
ch->state=MISDN_DIALING;
- misdn_lib_send_event(bc, EVENT_PROCEEDING );
+ misdn_lib_send_event(bc, EVENT_PROCEEDING);
} else {
ch->state = MISDN_INCOMING_SETUP;
}
@@ -5457,7 +5474,7 @@
* the number is empty, we wait for the ISDN timeout
* instead of our own timer.
*/
- if (ch->overlap_dial && bc->nt && !bc->dialed.number[0] ) {
+ if (ch->overlap_dial && bc->nt && !bc->dialed.number[0]) {
wait_for_digits(ch, bc, chan);
break;
}
@@ -5522,7 +5539,7 @@
break;
case EVENT_PROCEEDING:
if (misdn_cap_is_speech(bc->capability) &&
- misdn_inband_avail(bc) ) {
+ misdn_inband_avail(bc)) {
start_bc_tones(ch);
}
@@ -5539,7 +5556,7 @@
update_name(ch->ast, bc->port, bc->channel);
}
- if (!bc->nt ) {
+ if (!bc->nt) {
if (misdn_cap_is_speech(bc->capability) &&
misdn_inband_avail(bc)) {
start_bc_tones(ch);
@@ -5729,7 +5746,7 @@
ast->generatordata = NULL;
generate = ast->generator->generate;
- if (tone_len < 0 || tone_len > 512 ) {
+ if (tone_len < 0 || tone_len > 512) {
ast_log(LOG_NOTICE, "TONE_GEN: len was %d, set to 128\n", tone_len);
tone_len = 128;
}
@@ -5775,7 +5792,6 @@
FD_SET(ch->pipe[1], &wrfs);
t = select(FD_SETSIZE, NULL, &wrfs, NULL, &tv);
-
if (!t) {
chan_misdn_log(9, bc->port, "Select Timed out\n");
break;
@@ -6100,7 +6116,7 @@
misdn_cfg_get(0, MISDN_GEN_NTDEBUGFLAGS, &ntflags, sizeof(ntflags));
misdn_cfg_get(0, MISDN_GEN_NTDEBUGFILE, &ntfile, sizeof(ntfile));
- misdn_cfg_get( 0, MISDN_GEN_NTKEEPCALLS, &ntkc, sizeof(ntkc));
+ misdn_cfg_get(0, MISDN_GEN_NTKEEPCALLS, &ntkc, sizeof(ntkc));
misdn_lib_nt_keepcalls(ntkc);
misdn_lib_nt_debug_init(ntflags, ntfile);
@@ -6143,30 +6159,29 @@
ast_register_application("misdn_facility", misdn_facility_exec, "misdn_facility",
- "misdn_facility(<FACILITY_TYPE>|<ARG1>|..)\n"
- "Sends the Facility Message FACILITY_TYPE with \n"
- "the given Arguments to the current ISDN Channel\n"
- "Supported Facilities are:\n"
- "\n"
- "type=calldeflect args=Nr where to deflect\n"
+ "misdn_facility(<FACILITY_TYPE>|<ARG1>|..)\n"
+ "Sends the Facility Message FACILITY_TYPE with \n"
+ "the given Arguments to the current ISDN Channel\n"
+ "Supported Facilities are:\n"
+ "\n"
+ "type=calldeflect args=Nr where to deflect\n"
);
ast_register_application("misdn_check_l2l1", misdn_check_l2l1, "misdn_check_l2l1",
- "misdn_check_l2l1(<port>||g:<groupname>,timeout)"
- "Checks if the L2 and L1 are up on either the given <port> or\n"
- "on the ports in the group with <groupname>\n"
- "If the L1/L2 are down, check_l2l1 gets up the L1/L2 and waits\n"
- "for <timeout> seconds that this happens. Otherwise, nothing happens\n"
- "\n"
- "This application, ensures the L1/L2 state of the Ports in a group\n"
- "it is intended to make the pmp_l1_check option redundant and to\n"
- "fix a buggy switch config from your provider\n"
- "\n"
- "a sample dialplan would look like:\n\n"
- "exten => _X.,1,misdn_check_l2l1(g:out|2)\n"
- "exten => _X.,n,dial(mISDN/g:out/${EXTEN})\n"
- "\n"
+ "misdn_check_l2l1(<port>||g:<groupname>,timeout)\n"
+ "Checks if the L2 and L1 are up on either the given <port> or\n"
+ "on the ports in the group with <groupname>\n"
+ "If the L1/L2 are down, check_l2l1 gets up the L1/L2 and waits\n"
+ "for <timeout> seconds that this happens. Otherwise, nothing happens\n"
+ "\n"
+ "This application, ensures the L1/L2 state of the Ports in a group\n"
+ "it is intended to make the pmp_l1_check option redundant and to\n"
+ "fix a buggy switch config from your provider\n"
+ "\n"
+ "a sample dialplan would look like:\n\n"
+ "exten => _X.,1,misdn_check_l2l1(g:out|2)\n"
+ "exten => _X.,n,dial(mISDN/g:out/${EXTEN})\n"
);
@@ -6282,7 +6297,7 @@
timeout = atoi(args.timeout);
port_str = args.grouppar;
- if (port_str[0] == 'g' && port_str[1] == ':' ) {
+ if (port_str[0] == 'g' && port_str[1] == ':') {
/* We make a group call lets checkout which ports are in my group */
port_str += 2;
ast_copy_string(group, port_str, sizeof(group));
@@ -6306,10 +6321,9 @@
}
}
}
-
} else {
port = atoi(port_str);
- chan_misdn_log(2, 0, "Checking Port: %d\n",port);
+ chan_misdn_log(2, 0, "Checking Port: %d\n", port);
port_up = misdn_lib_port_up(port, 1);
if (!port_up) {
misdn_lib_get_port_up(port);
@@ -6328,8 +6342,10 @@
static int misdn_set_opt_exec(struct ast_channel *chan, void *data)
{
struct chan_list *ch = MISDN_ASTERISK_TECH_PVT(chan);
- char *tok, *tokb, *parse;
- int keyidx = 0;
+ char *tok;
+ char *tokb;
+ char *parse;
+ int keyidx = 0;
int rxgain = 0;
int txgain = 0;
int change_jitter = 0;
@@ -6339,40 +6355,37 @@
return -1;
}
- if (ast_strlen_zero((char *)data)) {
+ if (ast_strlen_zero((char *) data)) {
ast_log(LOG_WARNING, "misdn_set_opt Requires arguments\n");
return -1;
}
parse = ast_strdupa(data);
for (tok = strtok_r(parse, ":", &tokb);
- tok;
- tok = strtok_r(NULL, ":", &tokb) ) {
+ tok;
+ tok = strtok_r(NULL, ":", &tokb)) {
int neglect = 0;
- if (tok[0] == '!' ) {
+ if (tok[0] == '!') {
neglect = 1;
tok++;
}
switch(tok[0]) {
-
case 'd' :
ast_copy_string(ch->bc->display, ++tok, sizeof(ch->bc->display));
chan_misdn_log(1, ch->bc->port, "SETOPT: Display:%s\n", ch->bc->display);
break;
-
case 'n':
chan_misdn_log(1, ch->bc->port, "SETOPT: No DSP\n");
ch->bc->nodsp = 1;
break;
-
case 'j':
chan_misdn_log(1, ch->bc->port, "SETOPT: jitter\n");
tok++;
change_jitter = 1;
- switch ( tok[0] ) {
+ switch (tok[0]) {
case 'b':
ch->jb_len = atoi(++tok);
chan_misdn_log(1, ch->bc->port, " --> buffer_len:%d\n", ch->jb_len);
@@ -6390,6 +6403,7 @@
ch->jb_upper_threshold = 0;
chan_misdn_log(1, ch->bc->port, " --> buffer_len:%d (default)\n", ch->jb_len);
chan_misdn_log(1, ch->bc->port, " --> upper_threshold:%d (default)\n", ch->jb_upper_threshold);
+ break;
}
break;
case 'v':
@@ -6420,13 +6434,14 @@
break;
}
break;
-
case 'c':
keyidx = atoi(++tok);
{
char keys[4096];
- char *key = NULL, *tmp = keys;
+ char *key = NULL;
+ char *tmp = keys;
int i;
+
misdn_cfg_get(0, MISDN_GEN_CRYPT_KEYS, keys, sizeof(keys));
for (i = 0; i < keyidx; i++) {
@@ -6462,7 +6477,6 @@
}
#endif
}
-
break;
case 'h':
chan_misdn_log(1, ch->bc->port, "SETOPT: Digital\n");
@@ -6475,23 +6489,19 @@
}
ch->bc->capability = INFO_CAPABILITY_DIGITAL_UNRESTRICTED;
break;
-
case 's':
chan_misdn_log(1, ch->bc->port, "SETOPT: Send DTMF\n");
ch->bc->send_dtmf = 1;
break;
-
case 'f':
chan_misdn_log(1, ch->bc->port, "SETOPT: Faxdetect\n");
ch->faxdetect = 1;
misdn_cfg_get(ch->bc->port, MISDN_CFG_FAXDETECT_TIMEOUT, &ch->faxdetect_timeout, sizeof(ch->faxdetect_timeout));
break;
-
case 'a':
chan_misdn_log(1, ch->bc->port, "SETOPT: AST_DSP (for DTMF)\n");
ch->ast_dsp = 1;
break;
-
case 'p':
chan_misdn_log(1, ch->bc->port, "SETOPT: callerpres: %s\n", &tok[1]);
/* CRICH: callingpres!!! */
@@ -6509,7 +6519,7 @@
break;
case 'i' :
chan_misdn_log(1, ch->bc->port, "Ignoring dtmf tones, just use them inband\n");
- ch->ignore_dtmf=1;
+ ch->ignore_dtmf = 1;
break;
default:
break;
@@ -6542,7 +6552,7 @@
}
-int chan_misdn_jb_empty ( struct misdn_bchannel *bc, char *buf, int len)
+int chan_misdn_jb_empty(struct misdn_bchannel *bc, char *buf, int len)
{
struct chan_list *ch = find_chan_by_bc(cl_te, bc);
@@ -6616,7 +6626,10 @@
error (buffer overflow). */
int misdn_jb_fill(struct misdn_jb *jb, const char *data, int len)
{
- int i, j, rp, wp;
+ int i;
+ int j;
+ int rp;
+ int wp;
if (!jb || ! data) {
return 0;
@@ -6679,7 +6692,10 @@
of data. */
int misdn_jb_empty(struct misdn_jb *jb, char *data, int len)
{
- int i, wp, rp, read = 0;
+ int i;
+ int wp;
+ int rp;
+ int read = 0;
ast_mutex_lock(&jb->mutexjb);
Modified: trunk/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/channels/misdn/isdn_lib.c?view=diff&rev=187635&r1=187634&r2=187635
==============================================================================
--- trunk/channels/misdn/isdn_lib.c (original)
+++ trunk/channels/misdn/isdn_lib.c Fri Apr 10 09:53:59 2009
@@ -25,9 +25,9 @@
#include "isdn_lib_intern.h"
#include "isdn_lib.h"
-enum event_response_e (*cb_event) (enum event_e event, struct misdn_bchannel *bc, void *user_data);
-
-void (*cb_log) (int level, int port, char *tmpl, ...)
+enum event_response_e (*cb_event)(enum event_e event, struct misdn_bchannel *bc, void *user_data);
+
+void (*cb_log)(int level, int port, char *tmpl, ...)
__attribute__ ((format (printf, 3, 4)));
int (*cb_jb_empty)(struct misdn_bchannel *bc, char *buffer, int len);
@@ -48,7 +48,7 @@
int misdn_lib_get_l2_up(struct misdn_stack *stack);
-struct misdn_stack* get_misdn_stack( void );
+struct misdn_stack *get_misdn_stack(void);
static int set_chan_in_stack(struct misdn_stack *stack, int channel);
@@ -268,7 +268,7 @@
#define TONE_BUSY_CNT 20 /* ? */
#define TONE_BUSY_SILENCE_CNT 48 /* ? */
-static int entity;
+static int entity;
static struct misdn_lib *glob_mgr;
@@ -479,8 +479,9 @@
{
int i;
- for (i=0; i <= stack->b_num; i++) {
- cb_log(6, stack->port, "Idx:%d stack->cchan:%d in_use:%d Chan:%d\n",i,stack->channels[i], stack->bc[i].in_use, i+1);
+ for (i = 0; i <= stack->b_num; ++i) {
+ cb_log(6, stack->port, "Idx:%d stack->cchan:%d in_use:%d Chan:%d\n",
+ i, stack->channels[i], stack->bc[i].in_use, i + 1);
}
}
@@ -496,7 +497,6 @@
static int set_chan_in_stack(struct misdn_stack *stack, int channel)
{
-
cb_log(4,stack->port,"set_chan_in_stack: %d\n",channel);
dump_chan_list(stack);
if (channel >=1 && channel <= MAX_BCHANS) {
@@ -519,13 +519,14 @@
static int find_free_chan_in_stack(struct misdn_stack *stack, struct misdn_bchannel *bc, int channel, int dec)
{
int i;
- int chan=0;
+ int chan = 0;
int bnums = stack->pri ? stack->b_num : stack->b_num - 1;
- if (bc->channel_found)
+ if (bc->channel_found) {
return 0;
-
- bc->channel_found=1;
+ }
+
+ bc->channel_found = 1;
cb_log(5,stack->port,"find_free_chan: req_chan:%d\n",channel);
@@ -559,19 +560,19 @@
}
if (!chan) {
- cb_log (1, stack->port, " !! NO FREE CHAN IN STACK\n");
+ cb_log(1, stack->port, " !! NO FREE CHAN IN STACK\n");
dump_chan_list(stack);
bc->out_cause = AST_CAUSE_NORMAL_CIRCUIT_CONGESTION;
return -1;
}
- if (set_chan_in_stack(stack, chan)<0) {
- cb_log (0, stack->port, "Channel Already in use:%d\n", chan);
+ if (set_chan_in_stack(stack, chan) < 0) {
+ cb_log(0, stack->port, "Channel Already in use:%d\n", chan);
bc->out_cause = AST_CAUSE_REQUESTED_CHAN_UNAVAIL;
return -1;
}
- bc->channel=chan;
+ bc->channel = chan;
return 0;
}
@@ -583,7 +584,7 @@
}
cb_log (4, stack?stack->port:0, "empty_chan_in_stack: %d\n",channel);
- stack->channels[channel-1] = 0;
+ stack->channels[channel - 1] = 0;
dump_chan_list(stack);
return 0;
}
@@ -812,7 +813,7 @@
for (i=0; i<=stack->b_num; i++) {
if (global_state == MISDN_INITIALIZED) {
cb_event(EVENT_CLEANUP, &stack->bc[i], NULL);
- empty_chan_in_stack(stack,i+1);
+ empty_chan_in_stack(stack, i + 1);
empty_bc(&stack->bc[i]);
clean_up_bc(&stack->bc[i]);
stack->bc[i].in_use = 0;
@@ -1184,7 +1185,9 @@
iframe_t *frm = (iframe_t *)buff;
int ret;
- if (!bc) return -1;
+ if (!bc) {
+ return -1;
+ }
cb_log(8, port, "Init.BC %d.\n",bidx);
@@ -1454,58 +1457,68 @@
{
struct misdn_stack *stack;
- for (stack=glob_mgr->stack_list;
- stack;
- stack=stack->next) {
- if ( (stack->upper_id&STACK_ID_MASK) == (addr&STACK_ID_MASK)) return stack;
-
- }
-
- return NULL;
-}
-
-
-static struct misdn_stack * find_stack_by_port(int port)
+ for (stack = glob_mgr->stack_list; stack; stack = stack->next) {
+ if ((stack->upper_id & STACK_ID_MASK) == (addr & STACK_ID_MASK)) {
+ /* Found the stack */
+ break;
+ }
+ }
+
+ return stack;
+}
+
+
+static struct misdn_stack *find_stack_by_port(int port)
{
struct misdn_stack *stack;
- for (stack=glob_mgr->stack_list;
- stack;
- stack=stack->next)
- if (stack->port == port) return stack;
-
- return NULL;
-}
-
-static struct misdn_stack * find_stack_by_mgr(manager_t* mgr_nt)
+ for (stack = glob_mgr->stack_list; stack; stack = stack->next) {
+ if (stack->port == port) {
+ /* Found the stack */
+ break;
+ }
+ }
+
+ return stack;
+}
+
+static struct misdn_stack *find_stack_by_mgr(manager_t *mgr_nt)
{
struct misdn_stack *stack;
- for (stack=glob_mgr->stack_list;
- stack;
- stack=stack->next)
- if ( &stack->mgr == mgr_nt) return stack;
-
- return NULL;
+ for (stack = glob_mgr->stack_list; stack; stack = stack->next) {
+ if (&stack->mgr == mgr_nt) {
+ /* Found the stack */
+ break;
+ }
+ }
+
+ return stack;
}
static struct misdn_bchannel *find_bc_by_masked_l3id(struct misdn_stack *stack, unsigned long l3id, unsigned long mask)
{
int i;
- for (i=0; i<=stack->b_num; i++) {
- if ( (stack->bc[i].l3_id & mask) == (l3id & mask)) return &stack->bc[i] ;
- }
- return stack_holder_find(stack,l3id);
+
+ for (i = 0; i <= stack->b_num; ++i) {
+ if ((stack->bc[i].l3_id & mask) == (l3id & mask)) {
+ return &stack->bc[i];
+ }
+ }
+ return stack_holder_find(stack, l3id);
}
struct misdn_bchannel *find_bc_by_l3id(struct misdn_stack *stack, unsigned long l3id)
{
int i;
- for (i=0; i<=stack->b_num; i++) {
- if (stack->bc[i].l3_id == l3id) return &stack->bc[i] ;
- }
- return stack_holder_find(stack,l3id);
+
+ for (i = 0; i <= stack->b_num; ++i) {
+ if (stack->bc[i].l3_id == l3id) {
+ return &stack->bc[i];
+ }
+ }
+ return stack_holder_find(stack, l3id);
}
static struct misdn_bchannel *find_bc_holded(struct misdn_stack *stack)
@@ -1640,10 +1653,11 @@
break;
}
- if (!bc->channel)
+ if (!bc->channel) {
cb_log(0, stack->port, "Any Channel Requested, but we have no more!!\n");
- else
+ } else {
cb_log(0, stack->port, "Requested Channel Already in Use releasing this call with cause 34!!!!\n");
+ }
/* when the channel is already in use, we can't
* simply clear it, we need to make sure that
@@ -1654,10 +1668,10 @@
misdn_lib_send_event(bc,EVENT_RELEASE_COMPLETE);
return -1;
}
- }
-
- setup_bc(bc);
- break;
+
+ setup_bc(bc);
+ break;
+ }
case EVENT_RELEASE_COMPLETE:
case EVENT_RELEASE:
@@ -1699,7 +1713,7 @@
case CC_RELEASE_CR|CONFIRM:
break;
case CC_RELEASE_CR|INDICATION:
- cb_log(4, stack->port, " --> lib: RELEASE_CR Ind with l3id:%x\n",frm->dinfo);
+ cb_log(4, stack->port, " --> lib: RELEASE_CR Ind with l3id:%x\n", frm->dinfo);
{
struct misdn_bchannel *bc=find_bc_by_l3id(stack, frm->dinfo);
struct misdn_bchannel dummybc;
@@ -1855,12 +1869,12 @@
struct misdn_bchannel *bc=find_bc_by_l3id(stack, hh->dinfo);
struct misdn_bchannel dummybc;
iframe_t frm; /* fake te frm to remove callref from global callreflist */
+
frm.dinfo = hh->dinfo;
-
frm.addr=stack->upper_id | FLG_MSG_DOWN;
-
frm.prim = CC_RELEASE_CR|INDICATION;
cb_log(4, stack->port, " --> CC_RELEASE_CR: Faking Release_cr for %x l3id:%x\n",frm.addr, frm.dinfo);
+
/** removing procid **/
if (!bc) {
cb_log(4, stack->port, " --> Didn't find BC so temporarily creating dummy BC (l3id:%x) on this port.\n", hh->dinfo);
@@ -1882,8 +1896,7 @@
return 0 ;
}
-static int
-handle_event_nt(void *dat, void *arg)
+static int handle_event_nt(void *dat, void *arg)
{
manager_t *mgr = (manager_t *)dat;
msg_t *msg = (msg_t *)arg;
@@ -2680,7 +2693,7 @@
return 0;
}
- cb_log(4,stack?stack->port:0,"handle_frm: frm->addr:%x frm->prim:%x\n",frm->addr,frm->prim);
+ cb_log(4, stack ? stack->port : 0, "handle_frm: frm->addr:%x frm->prim:%x\n", frm->addr, frm->prim);
{
struct misdn_bchannel dummybc;
@@ -3132,19 +3145,23 @@
int te_lib_init(void) {
char buff[1025] = "";
- iframe_t *frm=(iframe_t*)buff;
- int midev=mISDN_open();
+ iframe_t *frm = (iframe_t *) buff;
+ int midev;
int ret;
- if (midev<=0) return midev;
-
-/* create entity for layer 3 TE-mode */
+ midev = mISDN_open();
+ if (midev <= 0) {
+ return midev;
+ }
+
+ /* create entity for layer 3 TE-mode */
mISDN_write_frame(midev, buff, 0, MGR_NEWENTITY | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
+
ret = mISDN_read_frame(midev, frm, sizeof(iframe_t), 0, MGR_NEWENTITY | CONFIRM, TIMEOUT_1SEC);
if (ret < mISDN_HEADER_LEN) {
noentity:
- fprintf(stderr, "cannot request MGR_NEWENTITY from mISDN: %s\n",strerror(errno));
+ fprintf(stderr, "cannot request MGR_NEWENTITY from mISDN: %s\n", strerror(errno));
exit(-1);
}
@@ -3154,7 +3171,6 @@
goto noentity;
return midev;
-
}
void te_lib_destroy(int midev)
@@ -3203,10 +3219,10 @@
gettimeofday(&now, NULL);
if (!bc->in_use) {
if (misdn_lib_port_is_pri(bc->port) && bc->last_used.tv_sec == now.tv_sec ) {
- cb_log(2,bc->port, "channel with stid:%x for one second still in use! (n:%d lu:%d)\n", bc->b_stid, (int) now.tv_sec, (int) bc->last_used.tv_sec);
+ cb_log(2, bc->port, "channel with stid:%x for one second still in use! (n:%d lu:%d)\n",
+ bc->b_stid, (int) now.tv_sec, (int) bc->last_used.tv_sec);
return 1;
}
-
cb_log(3,bc->port, "channel with stid:%x not in use!\n", bc->b_stid);
return 0;
@@ -3237,13 +3253,13 @@
#endif
}
-struct misdn_bchannel* misdn_lib_get_free_bc(int port, int channel, int inout, int dec)
+struct misdn_bchannel *misdn_lib_get_free_bc(int port, int channel, int inout, int dec)
{
struct misdn_stack *stack;
int i;
if (channel < 0 || channel > MAX_BCHANS) {
- cb_log(0,port,"Requested channel out of bounds (%d)\n",channel);
+ cb_log(0, port, "Requested channel out of bounds (%d)\n", channel);
return NULL;
}
@@ -3332,6 +3348,7 @@
{ Fac_CFActivate, "Fac_CFActivate" },
{ Fac_CFDeactivate, "Fac_CFDeactivate" },
{ Fac_CD, "Fac_CD" },
+
{ Fac_AOCDCurrency, "Fac_AOCDCurrency" },
{ Fac_AOCDChargingUnit, "Fac_AOCDChargingUnit" },
/* *INDENT-ON* */
@@ -3435,10 +3452,10 @@
int retval=0;
struct misdn_stack *stack;
- if (!bc) RETURN(-1,OUT_POST_UNLOCK);
+ if (!bc)
+ RETURN(-1,OUT_POST_UNLOCK);
stack = get_stack_by_bc(bc);
-
if (!stack) {
cb_log(0,bc->port,
"SENDEVENT: no Stack for event:%s caller:\"%s\" <%s> dialed:%s \n",
@@ -3474,8 +3491,8 @@
switch (event) {
case EVENT_SETUP:
- if (create_process(glob_mgr->midev, bc)<0) {
- cb_log(0, stack->port, " No free channel at the moment @ send_event\n");
+ if (create_process(glob_mgr->midev, bc) < 0) {
+ cb_log(0, stack->port, " No free channel at the moment @ send_event\n");
RETURN(-ENOCHAN,OUT);
}
@@ -3486,10 +3503,10 @@
case EVENT_PROCEEDING:
case EVENT_SETUP_ACKNOWLEDGE:
case EVENT_CONNECT:
- if (!stack->nt) break;
+ if (!stack->nt)
+ break;
case EVENT_RETRIEVE_ACKNOWLEDGE:
-
if (stack->nt) {
if (bc->channel <=0 ) { /* else we have the channel already */
if (find_free_chan_in_stack(stack, bc, 0, 0)<0) {
@@ -3608,7 +3625,7 @@
bc->need_release_complete=0;
if (!stack->nt) {
- /*create cleanup in TE*/
+ /* create cleanup in TE */
int channel=bc->channel;
int tmpcause=bc->cause;
@@ -3626,7 +3643,6 @@
break;
case EVENT_CONNECT_ACKNOWLEDGE:
-
if ( bc->nt || misdn_cap_is_speech(bc->capability)) {
int retval=setup_bc(bc);
if (retval == -EINVAL){
@@ -4195,8 +4211,8 @@
cb_log(0, port, "Couldn't Initialize this port since we have only %d ports\n", port_count);
exit(1);
}
[... 104 lines stripped ...]
More information about the asterisk-commits
mailing list