osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Make the ACTRACE dissector give away the package if it knows its not a ACTRACE. 

svn path=/trunk/; revision=25526
This commit is contained in:
Stig Bjørlykke 2008-06-22 18:42:37 +00:00
parent 03468a7b19
commit 1689ec6a8d
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
epan/dissectors/packet-actrace.c
View File

@ -453,7 +453,7 @@ static void dissect_actrace_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
/************************************************************************
* dissect_actrace - The dissector for the AudioCodes Trace prtocol
************************************************************************/
static void dissect_actrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
static int dissect_actrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree *actrace_tree;
proto_item *ti;
@ -462,15 +462,6 @@ static void dissect_actrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Initialize variables */
actrace_tree = NULL;
/*
* Set the columns now, so that they'll be set correctly if we throw
* an exception. We can set them later as well....
*/
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AC_TRACE");
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
/*
* Check to see whether we're really dealing with AC trace by looking
* for a valid "source" and fixed len for CAS; and the direction for ISDN.
@ -479,6 +470,15 @@ static void dissect_actrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
actrace_protocol = is_actrace(tvb, 0);
if (actrace_protocol != NOT_ACTRACE)
{
/*
* Set the columns now, so that they'll be set correctly if we throw
* an exception. We can set them later as well....
*/
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AC_TRACE");
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
if (tree)
{
/* Create our actrace subtree */
@ -495,10 +495,10 @@ static void dissect_actrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
dissect_actrace_isdn(tvb, pinfo, tree, actrace_tree);
break;
}
} else {
if (check_col(pinfo->cinfo, COL_INFO))
col_set_str(pinfo->cinfo, COL_INFO, "Non CAS or ISDN AudioCodes trace message");
return tvb_length(tvb);
}
return 0;
}
/* Dissect an individual actrace CAS message */
@ -815,7 +815,7 @@ void proto_reg_handoff_actrace(void)
if (!actrace_prefs_initialized)
{
actrace_handle = create_dissector_handle(dissect_actrace, proto_actrace);
actrace_handle = new_create_dissector_handle(dissect_actrace, proto_actrace);
actrace_prefs_initialized = TRUE;
}
else