aboutsummaryrefslogtreecommitdiffstats
path: root/packet.h
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>1999-01-28 21:29:36 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>1999-01-28 21:29:36 +0000
commit69458d2e922042d2a08934af21d7e45dbb6eec14 (patch)
tree6949f9a4ccd753b032b12cb6d8f6b1ab60eb1f1f /packet.h
parent4e1c7318cb46657e9dc0aba44174299d6e7c5c58 (diff)
downloadwireshark-69458d2e922042d2a08934af21d7e45dbb6eec14.tar.gz
wireshark-69458d2e922042d2a08934af21d7e45dbb6eec14.tar.bz2
wireshark-69458d2e922042d2a08934af21d7e45dbb6eec14.zip
Added guy's time and DHCP patch.
svn path=/trunk/; revision=177
Diffstat (limited to 'packet.h')
-rw-r--r--packet.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/packet.h b/packet.h
index ed67f6b4b4..226d0878b7 100644
--- a/packet.h
+++ b/packet.h
@@ -1,7 +1,7 @@
/* packet.h
* Definitions for packet disassembly structures and routines
*
- * $Id: packet.h,v 1.33 1999/01/05 08:48:40 guy Exp $
+ * $Id: packet.h,v 1.34 1999/01/28 21:29:36 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -498,6 +498,7 @@ void dissect_ip_tcp_options(GtkWidget *, const u_char *, int, guint,
/* Utility routines used by packet*.c */
gchar* ether_to_str(const guint8 *);
gchar* ip_to_str(const guint8 *);
+gchar* time_secs_to_str(guint32);
void packet_hex_print(GtkText *, guint8 *, gint, gint, gint);
#define E_TREEINFO_START_KEY "tree_info_start"
#define E_TREEINFO_LEN_KEY "tree_info_len"
@@ -585,4 +586,8 @@ void ethertype(guint16 etype, int offset,
const u_char *pd, frame_data *fd, GtkTree *tree,
GtkWidget *fh_tree);
+/* These functions are in packet-arp.c */
+gchar *arphrdaddr_to_str(guint8 *ad, int ad_len, guint16 type);
+gchar *arphrdtype_to_str(guint16 hwtype, const char *fmt);
+
#endif /* packet.h */