diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-08-25 06:31:25 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-08-25 06:31:25 +0000 |
| commit | 9cc45a4a10fe6317b5e2a679239313e032e5aca1 (patch) | |
| tree | dedf831e05c9f1a32cc3126e0a4b016a865f300d /packet-llc.c | |
| parent | 5e52e989268cd4062d80d85721387875c0106632 (diff) | |
Include the control-field information in the Info column for LLC frames.
svn path=/trunk/; revision=2370
Diffstat (limited to 'packet-llc.c')
| -rw-r--r-- | packet-llc.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/packet-llc.c b/packet-llc.c index 167028fed0..5135ec64f5 100644 --- a/packet-llc.c +++ b/packet-llc.c @@ -2,7 +2,7 @@ * Routines for IEEE 802.2 LLC layer * Gilbert Ramirez <gram@xiexie.org> * - * $Id: packet-llc.c,v 1.68 2000/08/13 14:08:26 deniel Exp $ + * $Id: packet-llc.c,v 1.69 2000/08/25 06:31:25 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -325,17 +325,12 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) proto_item_set_len(ti, llc_header_len); - /* - * XXX - do we want to append the SAP information to the stuff - * "dissect_xdlc_control()" put in the COL_INFO column, rather - * than overwriting it? - */ if (is_snap) { oui = tvb_get_ntoh24(tvb, 3); etype = tvb_get_ntohs(tvb, 6); if (check_col(pinfo->fd, COL_INFO)) { - col_add_fstr(pinfo->fd, COL_INFO, "SNAP, OUI 0x%06X (%s), PID 0x%04X", + col_append_fstr(pinfo->fd, COL_INFO, "; SNAP, OUI 0x%06X (%s), PID 0x%04X", oui, val_to_str(oui, oui_vals, "Unknown"), etype); } @@ -423,8 +418,8 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { if (check_col(pinfo->fd, COL_INFO)) { - col_add_fstr(pinfo->fd, COL_INFO, - "DSAP %s %s, SSAP %s %s", + col_append_fstr(pinfo->fd, COL_INFO, + "; DSAP %s %s, SSAP %s %s", val_to_str(dsap & SAP_MASK, sap_vals, "%02x"), dsap & DSAP_GI_BIT ? "Group" : "Individual", |