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-trmac.c | |
| parent | 385699d4310480e19aecf08dcff23e792667747a (diff) | |
| download | wireshark-2e7e493198543e3fdb4b404763b02a2ad22d180e.tar.gz | |
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-trmac.c')
| -rw-r--r-- | packet-trmac.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packet-trmac.c b/packet-trmac.c index 075143174d..de810afdbf 100644 --- a/packet-trmac.c +++ b/packet-trmac.c @@ -2,7 +2,7 @@ * Routines for Token-Ring Media Access Control * Gilbert Ramirez <gram@verdict.uthscsa.edu> * - * $Id: packet-trmac.c,v 1.2 1998/09/16 03:22:12 gerald Exp $ + * $Id: packet-trmac.c,v 1.3 1998/09/27 22:12:40 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -42,8 +42,8 @@ # include <netinet/in.h> #endif -#include "packet.h" #include "ethereal.h" +#include "packet.h" #include "etypes.h" struct vec_info { @@ -86,10 +86,10 @@ mv_text(u_char cmd, int offset, frame_data *fd, GtkWidget *tree) { while (mv[i].text != NULL) { if (mv[i].cmd == cmd) { - if (fd->win_info[0]) { + if (fd->win_info[COL_NUM]) { /* I can do this because no higher-level dissect() will strcpy onto me. */ - fd->win_info[4] = mv[i].text; + fd->win_info[COL_INFO] = mv[i].text; } if (tree) { add_item_to_tree(tree, offset, 1, "Major Vector Command: %s", @@ -288,8 +288,8 @@ dissect_trmac(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) { "Configuration Report Server", "Ring Parameter Server", "Ring Error Monitor" }; - if (fd->win_info[0]) { - strcpy(fd->win_info[3], "TR MAC"); + if (fd->win_info[COL_NUM]) { + strcpy(fd->win_info[COL_PROTOCOL], "TR MAC"); } mv_length = ntohs(*((guint16*)&pd[offset])); |