diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-09-04 23:07:41 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-09-04 23:07:41 +0000 |
| commit | 586a825325890f40c81681348a7da75e2d270594 (patch) | |
| tree | 503d3ccf5f69bca010483bc9593e25680cadf9ca /channels/iax2/parser.c | |
| parent | 517389b1e7a57e583ed528ba1b20af7e1c84b50d (diff) | |
chan_iax2: Add missing control frame names to debug frame decode output.
........
Merged revisions 398301 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 398302 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 398303 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@398304 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/iax2/parser.c')
| -rw-r--r-- | channels/iax2/parser.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/channels/iax2/parser.c b/channels/iax2/parser.c index 5d1a8ca61..e77a9b3cf 100644 --- a/channels/iax2/parser.c +++ b/channels/iax2/parser.c @@ -239,11 +239,12 @@ static void dump_prov(char *output, int maxlen, void *value, int len) dump_prov_ies(output, maxlen, value, len); } -static struct iax2_ie { +struct iax2_ie { int ie; char *name; void (*dump)(char *output, int maxlen, void *value, int len); -} infoelts[] = { +}; +static struct iax2_ie infoelts[] = { { IAX_IE_CALLED_NUMBER, "CALLED NUMBER", dump_string }, { IAX_IE_CALLING_NUMBER, "CALLING NUMBER", dump_string }, { IAX_IE_CALLING_ANI, "ANI", dump_string }, @@ -392,6 +393,7 @@ static void dump_ies(unsigned char *iedata, int len) int found; char interp[1024]; char tmp[1024]; + if (len < 2) return; while(len > 2) { @@ -605,7 +607,7 @@ void iax_showframe(struct iax_frame *f, struct ast_iax2_full_hdr *fhi, int rx, s "CNLINE ", "REDIR ", "T38PARM", - "CONTRCC", + "CC ERR!",/* This must never go across an IAX link. */ "SRCCHG ", "READACT", "AOC ", |