diff options
| author | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-18 12:19:14 +0000 |
|---|---|---|
| committer | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-18 12:19:14 +0000 |
| commit | eb145314dd46edf8d0e5eb3a336f0982dd148f3d (patch) | |
| tree | 5bea0210f076a35cec869de369264fbe1a03f5e9 /channels | |
| parent | ff785f7c71615b1431608c782f87e86057852a86 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@65038 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/misdn/ie.c | 6 | ||||
| -rw-r--r-- | channels/misdn/isdn_msg_parser.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/channels/misdn/ie.c b/channels/misdn/ie.c index a62e71072..bf3214297 100644 --- 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 0c49acddd..57a13cec0 100644 --- 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 |