diff options
| author | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-18 12:43:59 +0000 |
|---|---|---|
| committer | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-18 12:43:59 +0000 |
| commit | 9c9dec06de586166b1b89bedd5a1ced2e6774af6 (patch) | |
| tree | 265c7a5fc401d82eea03707fef4d6b087e316b38 /channels/misdn | |
| parent | 2fe31cb03ed1d34e5dabb3595b2f22c34a432dd6 (diff) | |
Merged revisions 65039 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r65039 | crichter | 2007-05-18 14:40:46 +0200 (Fr, 18 Mai 2007) | 9 lines
Merged revisions 65007 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r65007 | crichter | 2007-05-18 13:23:11 +0200 (Fr, 18 Mai 2007) | 1 line
fixed a warning regarding Keypad encoding. encode the IE sending_complete at the right position.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@65040 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/misdn')
| -rw-r--r-- | channels/misdn/ie.c | 4 | ||||
| -rw-r--r-- | channels/misdn/isdn_msg_parser.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/channels/misdn/ie.c b/channels/misdn/ie.c index 9b86fe4ef..32f0b76c2 100644 --- a/channels/misdn/ie.c +++ b/channels/misdn/ie.c @@ -953,7 +953,7 @@ static void enc_ie_keypad(unsigned char **ntmode, msg_t *msg, char *keypad, int 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; @@ -961,7 +961,7 @@ static void enc_ie_keypad(unsigned char **ntmode, msg_t *msg, char *keypad, int 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)); } #endif diff --git a/channels/misdn/isdn_msg_parser.c b/channels/misdn/isdn_msg_parser.c index fa29c2f55..862a650dd 100644 --- a/channels/misdn/isdn_msg_parser.c +++ b/channels/misdn/isdn_msg_parser.c @@ -340,15 +340,13 @@ static msg_t *build_setup (struct isdn_msg msgs[], struct misdn_bchannel *bc, in } 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 (bc->uulen) { int protocol=4; enc_ie_useruser(&setup->USER_USER, msg, protocol, bc->uu, bc->uulen, nt,bc); - if (bc->uulen) cb_log(1,bc->port,"ENCODING USERUESRINFO:%s\n",bc->uu); - else - cb_log(1,bc->port,"NO USERUESRINFO ENCODED\n"); + cb_log(1,bc->port,"ENCODING USERUESRINFO:%s\n",bc->uu); } #if DEBUG |