diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-03 18:40:12 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-03 18:40:12 +0000 |
| commit | 1ca6b25a00ea19b5553236e544801a85e69b4dbd (patch) | |
| tree | 34ce1ee6c86c2c2c14e81f283b39f6718d3039e5 /channels/iax2-parser.c | |
| parent | 8fc2071f673612ef75a5cecb48e0bade7bd2c765 (diff) | |
Merged revisions 215955 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r215955 | dvossel | 2009-09-03 11:31:54 -0500 (Thu, 03 Sep 2009) | 6 lines
Merge code associated with AST-2009-006
(closes issue #12912)
Reported by: rathaus
Tested by: tilghman, russell, dvossel, dbrooks
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216003 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/iax2-parser.c')
| -rw-r--r-- | channels/iax2-parser.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c index dec3c2d35..eacd65dc7 100644 --- a/channels/iax2-parser.c +++ b/channels/iax2-parser.c @@ -520,6 +520,9 @@ void iax_frame_subclass2str(enum iax_frame_subclass subclass, char *str, size_t case IAX_COMMAND_TXMEDIA: cmd = "TXMEDIA"; break; + case IAX_COMMAND_CALLTOKEN: + cmd = "CTOKEN "; + break; } ast_copy_string(str, cmd, len); } @@ -1026,6 +1029,12 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) errorf(tmp); } break; + case IAX_IE_CALLTOKEN: + if (len) { + ies->calltokendata = (unsigned char *) data + 2; + } + ies->calltoken = 1; + break; default: snprintf(tmp, (int)sizeof(tmp), "Ignoring unknown information element '%s' (%d) of length %d\n", iax_ie2str(ie), ie, len); outputf(tmp); |