diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-04-25 20:23:07 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-04-25 20:23:07 +0000 |
| commit | 48a4e4018444c3c8dff559378431005514c34963 (patch) | |
| tree | 8255ab18caa07d8f924fe3194f71f23d9e5dcff4 /packet-gprs-llc.c | |
| parent | 98c4a4cdbf24c961175159af40239f22613f94bd (diff) | |
From Josef Korelus: use "val_to_str()", not "match_strval()", so we
don't crash with incorrect values.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10697 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-gprs-llc.c')
| -rw-r--r-- | packet-gprs-llc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-gprs-llc.c b/packet-gprs-llc.c index 1541b6ebb2..30de319d2a 100644 --- a/packet-gprs-llc.c +++ b/packet-gprs-llc.c @@ -2,7 +2,7 @@ * Routines for Logical Link Control GPRS dissection ETSI 4.64 * Copyright 2000, Josef Korelus <jkor@quick.cz> * - * $Id: packet-gprs-llc.c,v 1.3 2004/04/13 21:32:57 guy Exp $ + * $Id: packet-gprs-llc.c,v 1.4 2004/04/25 20:23:07 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -283,10 +283,10 @@ dissect_llcgprs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tmp = ctrl_fld_fb & 0xf; if (check_col(pinfo->cinfo, COL_INFO)) { col_append_str(pinfo->cinfo, COL_INFO, " U, "); - col_append_str(pinfo->cinfo, COL_INFO, match_strval(tmp, cr_formats_unnumb)); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tmp, cr_formats_unnumb,"Unknown/invalid code:%X")); } if(tree){ - ui_ti = proto_tree_add_text(llcgprs_tree,tvb,offset-1,crc_start-1,"Unnumbered frame: %s", match_strval(tmp,cr_formats_unnumb)); + ui_ti = proto_tree_add_text(llcgprs_tree,tvb,offset-1,crc_start-1,"Unnumbered frame: %s",val_to_str(tmp,cr_formats_unnumb,"Unknown/invalid code:%X")); ui_tree = proto_item_add_subtree( ui_ti, ett_ui); proto_tree_add_uint( ui_tree, hf_llcgprs_Un, tvb, offset-1, 1, ctrl_fld_fb); proto_tree_add_boolean( ui_tree, hf_llcgprs_PF, tvb, offset-1, 1, ctrl_fld_fb); |