automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@49944 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/misdn/ie.c b/channels/misdn/ie.c
index a3eb255f86c92dd5998cba9384ad10f94e2fcd89..039d04ad349b475f422cbe0f88c5c8344a828cc9 100644 (file)
--- a/channels/misdn/ie.c
+++ b/channels/misdn/ie.c
@@ -260,7 +260,7 @@ void dec_ie_bearer(unsigned char *p, Q931_info_t *qi, int *coding, int *capabili
 
 
 /* IE_CALL_ID */
-void enc_ie_call_id(unsigned char **ntmode, msg_t *msg, unsigned char *callid, int callid_len, int nt, struct misdn_bchannel *bc)
+void enc_ie_call_id(unsigned char **ntmode, msg_t *msg, char *callid, int callid_len, int nt, struct misdn_bchannel *bc)
 {
        unsigned char *p;
        Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
@@ -299,7 +299,7 @@ void enc_ie_call_id(unsigned char **ntmode, msg_t *msg, unsigned char *callid, i
        memcpy(p+2, callid, callid_len);
 }
 
-void dec_ie_call_id(unsigned char *p, Q931_info_t *qi, unsigned char *callid, int *callid_len, int nt, struct misdn_bchannel *bc)
+void dec_ie_call_id(unsigned char *p, Q931_info_t *qi, char *callid, int *callid_len, int nt, struct misdn_bchannel *bc)
 {
        char debug[25];
        int i;
@@ -335,7 +335,7 @@ void dec_ie_call_id(unsigned char *p, Q931_info_t *qi, unsigned char *callid, in
 
 
 /* IE_CALLED_PN */
-void enc_ie_called_pn(unsigned char **ntmode, msg_t *msg, int type, int plan, unsigned char *number, int nt, struct misdn_bchannel *bc)
+void enc_ie_called_pn(unsigned char **ntmode, msg_t *msg, int type, int plan, char *number, int nt, struct misdn_bchannel *bc)
 {
        unsigned char *p;
        Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
@@ -371,7 +371,7 @@ void enc_ie_called_pn(unsigned char **ntmode, msg_t *msg, int type, int plan, un
        strncpy((char *)p+3, (char *)number, strlen((char *)number));
 }
 
-void dec_ie_called_pn(unsigned char *p, Q931_info_t *qi, int *type, int *plan, unsigned char *number, int number_len, int nt, struct misdn_bchannel *bc)
+void dec_ie_called_pn(unsigned char *p, Q931_info_t *qi, int *type, int *plan, char *number, int number_len, int nt, struct misdn_bchannel *bc)
 {
        *type = -1;
        *plan = -1;
@@ -400,7 +400,7 @@ void dec_ie_called_pn(unsigned char *p, Q931_info_t *qi, int *type, int *plan, u
 
 
 /* IE_CALLING_PN */
-void enc_ie_calling_pn(unsigned char **ntmode, msg_t *msg, int type, int plan, int present, int screen, unsigned char *number, int nt, struct misdn_bchannel *bc)
+void enc_ie_calling_pn(unsigned char **ntmode, msg_t *msg, int type, int plan, int present, int screen, char *number, int nt, struct misdn_bchannel *bc)
 {
        unsigned char *p;
        Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
@@ -455,7 +455,7 @@ void enc_ie_calling_pn(unsigned char **ntmode, msg_t *msg, int type, int plan, i
        }
 }
 
-void dec_ie_calling_pn(unsigned char *p, Q931_info_t *qi, int *type, int *plan, int *present, int *screen, unsigned char *number, int number_len, int nt, struct misdn_bchannel *bc)
+void dec_ie_calling_pn(unsigned char *p, Q931_info_t *qi, int *type, int *plan, int *present, int *screen, char *number, int number_len, int nt, struct misdn_bchannel *bc)
 {
        *type = -1;
        *plan = -1;
@@ -502,7 +502,7 @@ void dec_ie_calling_pn(unsigned char *p, Q931_info_t *qi, int *type, int *plan,
 
 
 /* IE_CONNECTED_PN */
-void enc_ie_connected_pn(unsigned char **ntmode, msg_t *msg, int type, int plan, int present, int screen, unsigned char *number, int nt, struct misdn_bchannel *bc)
+void enc_ie_connected_pn(unsigned char **ntmode, msg_t *msg, int type, int plan, int present, int screen, char *number, int nt, struct misdn_bchannel *bc)
 {
        unsigned char *p;
        Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
@@ -557,7 +557,7 @@ void enc_ie_connected_pn(unsigned char **ntmode, msg_t *msg, int type, int plan,
        }
 }
 
-void dec_ie_connected_pn(unsigned char *p, Q931_info_t *qi, int *type, int *plan, int *present, int *screen, unsigned char *number, int number_len, int nt, struct misdn_bchannel *bc)
+void dec_ie_connected_pn(unsigned char *p, Q931_info_t *qi, int *type, int *plan, int *present, int *screen, char *number, int number_len, int nt, struct misdn_bchannel *bc)
 {
        *type = -1;
        *plan = -1;

diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index 6ad11b70db87a04725cb6439c36cae2074a3bf0d..720d4db7d2263bc5b6bc34f413d6f2022c84b60a 100644 (file)
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -279,7 +279,7 @@ void init_flip_bits(void)
 unsigned char * flip_buf_bits ( unsigned char * buf , int len)
 {
        int i;
-       char * start = buf;
+       unsigned char * start = buf;
        
        for (i = 0 ; i < len; i++) {
                buf[i] = flip_table[buf[i]];
@@ -2197,12 +2197,12 @@ static void misdn_save_data(int id, char *p1, int l1, char *p2, int l2)
 
 void misdn_tx_jitter(struct misdn_bchannel *bc, int len)
 {
-       char buf[4096 + mISDN_HEADER_LEN];
-       char *data=&buf[mISDN_HEADER_LEN];
+       unsigned char buf[4096 + mISDN_HEADER_LEN];
+       unsigned char *data=&buf[mISDN_HEADER_LEN];
        iframe_t *txfrm= (iframe_t*)buf;
        int jlen, r;
        
-       jlen=cb_jb_empty(bc,data,len);
+       jlen=cb_jb_empty(bc,(char*)data,len);
        
        if (jlen) {
 #ifdef MISDN_SAVE_DATA
@@ -3988,7 +3988,7 @@ int misdn_lib_tx2misdn_frm(struct misdn_bchannel *bc, void *data, int len)
                        return -1;
        }
        
-       char buf[4096 + mISDN_HEADER_LEN];
+       unsigned char buf[4096 + mISDN_HEADER_LEN];
        iframe_t *frm= (iframe_t*)buf;
        int  r;
        
@@ -4294,43 +4294,36 @@ void misdn_lib_bridge( struct misdn_bchannel * bc1, struct misdn_bchannel *bc2)
        int conf_id=bc1->pid +1;
 
        cb_log(4, bc1->port, "I Send: BRIDGE from:%d to:%d\n",bc1->port,bc2->port);
-       
-       struct misdn_bchannel *bc_list[]={
-               bc1,bc2,NULL
-       };
-       struct misdn_bchannel **bc;
-               
-       for (bc=bc_list; *bc;  *bc++) { 
-               (*bc)->conf_id=conf_id;
-               cb_log(4, (*bc)->port, " --> bc_addr:%x\n",(*bc)->addr);
-       
-               switch((*bc)->bc_state) {
-                       case BCHAN_ACTIVATED:
-                               misdn_join_conf(*bc,conf_id);
-                               break;
-                       default:
-                               bc_next_state_change(*bc,BCHAN_BRIDGED);
-                               break;
-               }
-       }
+
+       bc1->conf_id=conf_id;
+       cb_log(4, bc1->port, " --> bc_addr:%x\n",bc1->addr);
+       if (bc1->bc_state==BCHAN_ACTIVATED) 
+               misdn_join_conf(bc1,conf_id);
+       else
+               bc_next_state_change(bc1,BCHAN_BRIDGED);
+       /*and again*/
+       bc2->conf_id=conf_id;
+       cb_log(4, bc2->port, " --> bc_addr:%x\n",bc2->addr);
+       if (bc2->bc_state==BCHAN_ACTIVATED) 
+               misdn_join_conf(bc2,conf_id);
+       else
+               bc_next_state_change(bc2,BCHAN_BRIDGED);
+
 }
 
 void misdn_lib_split_bridge( struct misdn_bchannel * bc1, struct misdn_bchannel *bc2)
 {
+       if ( bc1->bc_state == BCHAN_BRIDGED)
+               misdn_split_conf( bc1, bc1->conf_id);
+       else 
+               cb_log( 2, bc1->port, "BC not bridged (state:%s) so not splitting it\n",bc_state2str(bc1->bc_state));
 
-       struct misdn_bchannel *bc_list[]={
-               bc1,bc2,NULL
-       };
-       struct misdn_bchannel **bc;
-               
-       for (bc=bc_list; *bc;  *bc++) { 
-               if ( (*bc)->bc_state == BCHAN_BRIDGED){
-                       misdn_split_conf( *bc, (*bc)->conf_id);
-               } else {
-                       cb_log( 2, (*bc)->port, "BC not bridged (state:%s) so not splitting it\n",bc_state2str((*bc)->bc_state));
-               }
-       }
-       
+       /*again*/
+
+       if ( bc2->bc_state == BCHAN_BRIDGED)
+               misdn_split_conf( bc2, bc2->conf_id);
+       else 
+               cb_log( 2, bc1->port, "BC not bridged (state:%s) so not splitting it\n",bc_state2str(bc2->bc_state));
 }
 
 

diff --git a/channels/misdn/isdn_lib.h b/channels/misdn/isdn_lib.h
index 5634865be761361d255c237c492cccbc40e412ca..fee81adb2f378b79d18017df5a5ccc3b8be3c557 100644 (file)
--- a/channels/misdn/isdn_lib.h
+++ b/channels/misdn/isdn_lib.h
@@ -329,17 +329,17 @@ struct misdn_bchannel {
        int hdlc;
        /* V110 */
   
-       unsigned char display[84];
-       unsigned char msn[32];
-       unsigned char oad[32];
-       unsigned char rad[32];
-       unsigned char dad[32];
-       unsigned char cad[32];
-       unsigned char orig_dad[32];
-       unsigned char keypad[32];
-
-       unsigned char info_dad[64];
-       unsigned char infos_pending[64];
+       char display[84];
+       char msn[32];
+       char oad[32];
+       char rad[32];
+       char dad[32];
+       char cad[32];
+       char orig_dad[32];
+       char keypad[32];
+
+       char info_dad[64];
+       char infos_pending[64];
 
 /*     unsigned char info_keypad[32]; */
 /*     unsigned char clisub[24]; */