diff options
| author | Gerald Combs <gerald@wireshark.org> | 1998-09-27 22:12:47 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 1998-09-27 22:12:47 +0000 |
| commit | 2e7e493198543e3fdb4b404763b02a2ad22d180e (patch) | |
| tree | 01aa8a843d84f24a66f7bd9af00e105efe1ffcdc /packet-llc.c | |
| parent | 385699d4310480e19aecf08dcff23e792667747a (diff) | |
Merged in a _huge_ patch from Guy Harris. It adds a time stap column,
generalizes the column printing code, adds a "frame" tree item to
the tree view, and fixes a bunch of miscellaneous coding bugs.
svn path=/trunk/; revision=31
Diffstat (limited to 'packet-llc.c')
| -rw-r--r-- | packet-llc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/packet-llc.c b/packet-llc.c index a02f8e4872..462637b801 100644 --- a/packet-llc.c +++ b/packet-llc.c @@ -2,7 +2,7 @@ * Routines for IEEE 802.2 LLC layer * Gilbert Ramirez <gram@verdict.uthscsa.edu> * - * $Id: packet-llc.c,v 1.6 1998/09/23 05:25:10 gram Exp $ + * $Id: packet-llc.c,v 1.7 1998/09/27 22:12:32 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -34,8 +34,8 @@ #include <stdio.h> -#include "packet.h" #include "ethereal.h" +#include "packet.h" #include "etypes.h" struct sap_info { @@ -117,7 +117,7 @@ llc_org(const u_char *ptr) { void dissect_llc(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) { - GtkWidget *llc_tree, *ti; + GtkWidget *llc_tree = NULL, *ti; guint16 etype; int is_snap; void (*dissect) (const u_char *, int, frame_data *, GtkTree *); @@ -129,8 +129,8 @@ dissect_llc(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) { is_snap = (pd[offset] == 0xAA) && (pd[offset+1] == 0xAA); - if (fd->win_info[0]) { - strcpy(fd->win_info[3], "LLC"); + if (fd->win_info[COL_NUM]) { + strcpy(fd->win_info[COL_PROTOCOL], "LLC"); } if (tree) { @@ -147,8 +147,8 @@ dissect_llc(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) { } if (is_snap) { - if (fd->win_info[0]) { - strcpy(fd->win_info[4], "802.2 LLC (SNAP)"); + if (fd->win_info[COL_NUM]) { + strcpy(fd->win_info[COL_INFO], "802.2 LLC (SNAP)"); } if (tree) { add_item_to_tree(llc_tree, offset+3, 3, @@ -161,8 +161,8 @@ dissect_llc(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) { ethertype(etype, offset, pd, fd, tree, llc_tree); } else { - if (fd->win_info[0]) { - sprintf(fd->win_info[4], "802.2 LLC (%s)", sap_text(pd[offset])); + if (fd->win_info[COL_NUM]) { + sprintf(fd->win_info[COL_INFO], "802.2 LLC (%s)", sap_text(pd[offset])); } dissect = sap_func(pd[offset]); |