diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-03 18:32:32 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-03 18:32:32 +0000 |
| commit | 06075d395bfe1e7141986fe6387eefef5a76cb56 (patch) | |
| tree | 7c14f167d74b6a5759b0caf85b652004a7c1363a /channels/iax2-parser.c | |
| parent | 994fc0a8e68e99dbc8a8b0b3d9693b676861443d (diff) | |
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.4@216000 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/iax2-parser.c')
| -rw-r--r-- | channels/iax2-parser.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c index b99a258b6..fad5a496d 100644 --- a/channels/iax2-parser.c +++ b/channels/iax2-parser.c @@ -442,7 +442,9 @@ void iax_frame_subclass2str(int subclass, char *str, size_t len) "PROVISN", "FWDWNLD", "FWDATA ", - "TXMEDIA" + "TXMEDIA", + "RTKEY ", + "CTOKEN ", }; if ((copylen > len) || !subclass || (subclass < 0)) { str[0] = '\0'; @@ -959,6 +961,12 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) ies->rr_ooo = ntohl(get_unaligned_uint32(data + 2)); } 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); |