automerge commit

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

diff --git a/channels/misdn/ie.c b/channels/misdn/ie.c
index a62e71072098c48687fd59365374f3b1aa478008..bf3214297b5e6508110cee80318942d95337b5cc 100644 (file)
--- a/channels/misdn/ie.c
+++ b/channels/misdn/ie.c
@@ -932,7 +932,7 @@ void dec_ie_display(unsigned char *p, Q931_info_t *qi, char *display, int displa
 
 
 /* IE_KEYPAD */
-void enc_ie_keypad(unsigned char **ntmode, msg_t *msg, unsigned char *keypad, int nt, struct misdn_bchannel *bc)
+void enc_ie_keypad(unsigned char **ntmode, msg_t *msg, char *keypad, int nt, struct misdn_bchannel *bc)
 {
        unsigned char *p;
        Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
@@ -946,7 +946,7 @@ void enc_ie_keypad(unsigned char **ntmode, msg_t *msg, unsigned char *keypad, in
 
        if (MISDN_IE_DEBG) printf("    keypad='%s'\n", keypad);
 
-       l = strlen((char *)keypad);
+       l = strlen(keypad);
        p = msg_put(msg, l+2);
        if (nt)
                *ntmode = p+1;
@@ -954,7 +954,7 @@ void enc_ie_keypad(unsigned char **ntmode, msg_t *msg, unsigned char *keypad, in
                qi->QI_ELEMENT(keypad) = p - (unsigned char *)qi - sizeof(Q931_info_t);
        p[0] = IE_KEYPAD;
        p[1] = l;
-       strncpy((char *)p+2, (char *)keypad, strlen((char *)keypad));
+       strncpy((char *)p+2, keypad, strlen(keypad));
 }
 
 void dec_ie_keypad(unsigned char *p, Q931_info_t *qi, char *keypad, int keypad_len, int nt, struct misdn_bchannel *bc)

diff --git a/channels/misdn/isdn_msg_parser.c b/channels/misdn/isdn_msg_parser.c
index 0c49acddd71e857a0ea514c7704aff0511ee8681..57a13cec0a78334d7c756260ef40197eeb33c672 100644 (file)
--- a/channels/misdn/isdn_msg_parser.c
+++ b/channels/misdn/isdn_msg_parser.c
@@ -329,7 +329,7 @@ msg_t *build_setup (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
        }
 
        if (bc->sending_complete) {
-               enc_ie_complete(&setup->BEARER,msg, bc->sending_complete, nt, bc);
+               enc_ie_complete(&setup->COMPLETE,msg, bc->sending_complete, nt, bc);
        }
   
 #if DEBUG