aboutsummaryrefslogtreecommitdiffstats
path: root/packet-fddi.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>1998-11-17 04:29:13 +0000
committerGerald Combs <gerald@wireshark.org>1998-11-17 04:29:13 +0000
commit6ca358948b8c5aa99a4e0db8595f601ab834e76e (patch)
tree750ab11a6661c391b126d4ce990b7fc01cb98d46 /packet-fddi.c
parent8d616b03429fe2185782f5153d7b187a44698b5d (diff)
* Added column formatting functionality.
* Added check_col(), add_col_str() and add_col_fmt() to replace references to ft->win_info. * Added column prefs handling code. svn path=/trunk/; revision=97
Diffstat (limited to 'packet-fddi.c')
-rw-r--r--packet-fddi.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/packet-fddi.c b/packet-fddi.c
index 2bcdffe749..b131839a0f 100644
--- a/packet-fddi.c
+++ b/packet-fddi.c
@@ -3,7 +3,7 @@
*
* Laurent Deniel <deniel@worldnet.fr>
*
- * $Id: packet-fddi.c,v 1.7 1998/11/12 21:22:47 guy Exp $
+ * $Id: packet-fddi.c,v 1.8 1998/11/17 04:28:53 gerald Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -151,11 +151,18 @@ void dissect_fddi(const u_char *pd, frame_data *fd, GtkTree *tree)
fc = (int) pd[FDDI_P_FC];
- if (fd->win_info[COL_NUM]) {
- strcpy(fd->win_info[COL_DESTINATION], get_ether_name(dst));
- strcpy(fd->win_info[COL_SOURCE], get_ether_name(src));
- strcpy(fd->win_info[COL_INFO], "FDDI");
- }
+ if (check_col(fd, COL_RES_DL_SRC))
+ col_add_str(fd, COL_RES_DL_SRC, get_ether_name(src));
+ if (check_col(fd, COL_RES_DL_DST))
+ col_add_str(fd, COL_RES_DL_DST, get_ether_name(dst));
+ if (check_col(fd, COL_UNRES_DL_SRC))
+ col_add_str(fd, COL_UNRES_DL_SRC, ether_to_str(src));
+ if (check_col(fd, COL_UNRES_DL_DST))
+ col_add_str(fd, COL_UNRES_DL_DST, ether_to_str(dst));
+ if (check_col(fd, COL_PROTOCOL))
+ col_add_str(fd, COL_PROTOCOL, "N/A");
+ if (check_col(fd, COL_INFO))
+ col_add_str(fd, COL_INFO, "FDDI");
if (tree) {
ti = add_item_to_tree(GTK_WIDGET(tree), 0, offset,