On Fri, Aug 18, 2000 at 11:36:39AM -0700, Guy Harris wrote:
> The protocol column lists the packet as an LLC packet and the info column
> shows whether it is a command or a response, but it doesn't show the type of
> command or response like this:
>
> LLC DSAP SNA Path Control Individual, SSAP SNA Path Control Command RR
> or
> LLC DSAP SNA Path Control Individual, SSAP SNA Path Control Command XID
The following patch puts the control-field information first, followed
by the DSAP and SSAP information; does that provide you with what you
need?
Index: packet-llc.c
===================================================================
RCS file: /usr/local/cvsroot/ethereal/packet-llc.c,v
retrieving revision 1.68
diff -c -r1.68 packet-llc.c
*** packet-llc.c 2000/08/13 14:08:26 1.68
--- packet-llc.c 2000/08/19 09:04:14
***************
*** 325,341 ****
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",
oui, val_to_str(oui, oui_vals, "Unknown"),
etype);
}
--- 325,336 ----
if (tree)
proto_item_set_len(ti, llc_header_len);
if (is_snap) {
oui = tvb_get_ntoh24(tvb, 3);
etype = tvb_get_ntohs(tvb, 6);
if (check_col(pinfo->fd, COL_INFO)) {
! 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,430 ****
}
else {
if (check_col(pinfo->fd, COL_INFO)) {
! col_add_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",
--- 418,425 ----
}
else {
if (check_col(pinfo->fd, COL_INFO)) {
! 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",
