diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-03-28 08:06:07 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-03-28 08:06:07 +0000 |
| commit | e8775b6c3401b322899ea39cc7fb7fecf8fdf834 (patch) | |
| tree | bbc34a1e3cafcdb9488b3a84be29130661f9997b /packet-q931.c | |
| parent | c00e9c43dc7cc3bcd2e5dc83390909f81a572551 (diff) | |
Handle, in the Q.931 heuristic dissector, the case where TPKT isn't
enabled.
Fix comments to explain that a return of -1 from "dissect_tpkt_header()"
means "TPKT wasn't enabled".
svn path=/trunk/; revision=3200
Diffstat (limited to 'packet-q931.c')
| -rw-r--r-- | packet-q931.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/packet-q931.c b/packet-q931.c index c063648586..fba12ffde3 100644 --- a/packet-q931.c +++ b/packet-q931.c @@ -2,7 +2,7 @@ * Routines for Q.931 frame disassembly * Guy Harris <guy@alum.mit.edu> * - * $Id: packet-q931.c,v 1.26 2001/03/28 07:49:39 guy Exp $ + * $Id: packet-q931.c,v 1.27 2001/03/28 08:06:06 guy Exp $ * * Modified by Andreas Sikkema for possible use with H.323 * @@ -2197,6 +2197,12 @@ q931_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return FALSE; lv_tpkt_len = dissect_tpkt_header( tvb, &offset, pinfo, tree ); + if (lv_tpkt_len == -1) { + /* + * TPKT isn't enabled. + */ + return FALSE; + } /* * Check if it's an empty TPKT message (the next one might be a |