Move the declaration of "ipprotostr()" out of "epan/packet.h" into a new

"ipproto.h" header file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3313 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.am b/Makefile.am
index 9439b002ba58b0cfaca2be72f4631c3008408824..e72b31183fd84f2b74964c5e1801b1147cf0bf51 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.305 2001/04/11 21:34:25 gram Exp $
+# $Id: Makefile.am,v 1.306 2001/04/17 06:29:12 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -347,6 +347,7 @@ ETHEREAL_COMMON_SOURCES = \
        in_cksum.c     \
        in_cksum.h     \
        ipproto.c      \
+       ipproto.h      \
        llcsaps.h      \
        nlpid.h        \
        oui.h          \

diff --git a/epan/packet.h b/epan/packet.h
index c69c2e0e3d39d597d1a5fcea99c162efc1329bf9..d19fafca2394fb55d8008bad4832717a102c11d5 100644 (file)
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -1,7 +1,7 @@
 /* packet.h
  * Definitions for packet disassembly structures and routines
  *
- * $Id: packet.h,v 1.30 2001/04/01 07:32:35 hagbard Exp $
+ * $Id: packet.h,v 1.31 2001/04/17 06:29:14 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -243,7 +243,4 @@ void ethertype(guint16 etype, tvbuff_t *tvb, int offset_after_ethertype,
                int etype_id, int trailer_id);
 extern const value_string etype_vals[];
 
-/* ipproto.c */
-extern const char *ipprotostr(int proto);
-
 #endif /* packet.h */

diff --git a/ipproto.c b/ipproto.c
index 862fc6ea49d9c0260c1f1ab0b74f148d58a9996e..33566d6e34db99329e6d968846d3017d32fdf792 100644 (file)
--- a/ipproto.c
+++ b/ipproto.c
@@ -1,7 +1,7 @@
 /* ipproto.c
  * Routines for converting IPv4 protocol/v6 nxthdr field into string
  *
- * $Id: ipproto.c,v 1.12 2001/04/15 03:37:13 guy Exp $
+ * $Id: ipproto.c,v 1.13 2001/04/17 06:29:12 guy Exp $
  *
  * Gilbert Ramirez <gram@xiexie.org>
  *
@@ -43,12 +43,10 @@
 # include "snprintf.h"
 #endif
 
-#include "globals.h"
+#include "ipproto.h"
 #include "packet.h"
 #include "prefs.h"
-#include "resolv.h"
 #include "packet-ip.h"
-#include "packet-ipv6.h"
 
 static const value_string ipproto_val[] = {
     { IP_PROTO_ICMP,   "ICMP" },

diff --git a/ipproto.h b/ipproto.h
new file mode 100644 (file)
index 0000000..aaa7ac6
--- /dev/null
+++ b/ipproto.h
@@ -0,0 +1,33 @@
+/* ipproto.h
+ * Declarations of outines for converting IPv4 protocol/v6 nxthdr field into string
+ *
+ * $Id: ipproto.h,v 1.1 2001/04/17 06:29:12 guy Exp $
+ *
+ * Gilbert Ramirez <gram@xiexie.org>
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef __IPPROTO_H__
+#define __IPPROTO_H__
+
+extern const char *ipprotostr(int proto);
+
+#endif /* ipproto.h */

diff --git a/packet-dns.c b/packet-dns.c
index f66d0c787c8aa0ba39153b8d4e2b54b2fe5c965b..915abe02bf105e20d43a4cce81d81296f4f89873 100644 (file)
--- a/packet-dns.c
+++ b/packet-dns.c
@@ -1,7 +1,7 @@
 /* packet-dns.c
  * Routines for DNS packet disassembly
  *
- * $Id: packet-dns.c,v 1.64 2001/02/20 16:25:52 nneul Exp $
+ * $Id: packet-dns.c,v 1.65 2001/04/17 06:29:12 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -37,6 +37,7 @@
 
 #include <glib.h>
 #include "packet.h"
+#include "ipproto.h"
 #include "resolv.h"
 #include "packet-dns.h"
 #include "packet-ip.h"

diff --git a/packet-ip.c b/packet-ip.c
index dfe656ca0bf3663a0cf2f430adaa9e9f01bc6d01..99d8b8d5f4af6fc383427c00e2022d949364f059 100644 (file)
--- a/packet-ip.c
+++ b/packet-ip.c
@@ -1,7 +1,7 @@
 /* packet-ip.c
  * Routines for IP and miscellaneous IP protocol packet disassembly
  *
- * $Id: packet-ip.c,v 1.129 2001/03/28 21:33:31 guy Exp $
+ * $Id: packet-ip.c,v 1.130 2001/04/17 06:29:12 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -45,6 +45,7 @@
 
 #include "packet.h"
 #include "resolv.h"
+#include "ipproto.h"
 #include "prefs.h"
 #include "etypes.h"
 #include "greproto.h"

diff --git a/packet-ipsec.c b/packet-ipsec.c
index 7a06a6d63db4c0427a609356f3e2e239c213c707..4906e511e8e6ff1262ac67f17f0b31ec3ac40597 100644 (file)
--- a/packet-ipsec.c
+++ b/packet-ipsec.c
@@ -1,7 +1,7 @@
 /* packet-ipsec.c
  * Routines for IPsec/IPComp packet disassembly 
  *
- * $Id: packet-ipsec.c,v 1.27 2001/02/28 06:37:29 guy Exp $
+ * $Id: packet-ipsec.c,v 1.28 2001/04/17 06:29:12 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -43,6 +43,7 @@
 #include "packet-ipsec.h"
 #include "packet-ip.h"
 #include "resolv.h"
+#include "ipproto.h"
 #include "prefs.h"
 
 /* Place AH payload in sub tree */

diff --git a/packet-ipv6.c b/packet-ipv6.c
index fa164f32340aa60d728def13f341a6a86308a4c3..14a6f6b499eed4afb1058ce1eafa8a8c1ce0383e 100644 (file)
--- a/packet-ipv6.c
+++ b/packet-ipv6.c
@@ -1,7 +1,7 @@
 /* packet-ipv6.c
  * Routines for IPv6 packet disassembly 
  *
- * $Id: packet-ipv6.c,v 1.51 2001/01/23 02:49:55 gerald Exp $
+ * $Id: packet-ipv6.c,v 1.52 2001/04/17 06:29:12 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -54,6 +54,7 @@
 #include "packet-tcp.h"
 #include "packet-udp.h"
 #include "resolv.h"
+#include "ipproto.h"
 
 /*
  * NOTE: ipv6.nxt is not very useful as we will have chained header.

diff --git a/packet-isakmp.c b/packet-isakmp.c
index 54a30a9ecb35966c62884b544516ac8cee75e316..3d728c777b56bc669170d741059b0c8e609c44f9 100644 (file)
--- a/packet-isakmp.c
+++ b/packet-isakmp.c
@@ -3,7 +3,7 @@
  * (ISAKMP) (RFC 2408)
  * Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
  *
- * $Id: packet-isakmp.c,v 1.37 2001/04/04 02:52:04 guy Exp $
+ * $Id: packet-isakmp.c,v 1.38 2001/04/17 06:29:12 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -46,6 +46,7 @@
 #endif
 
 #include "packet.h"
+#include "ipproto.h"
 
 static int proto_isakmp = -1;
 

diff --git a/packet-portmap.c b/packet-portmap.c
index 7dc5013f950424819b170f2c11a49ccde4249173..2aa5f45fb395d3f2ccd73a6e317304ee2a688965 100644 (file)
--- a/packet-portmap.c
+++ b/packet-portmap.c
@@ -1,7 +1,7 @@
 /* packet-portmap.c
  * Routines for portmap dissection
  *
- * $Id: packet-portmap.c,v 1.28 2001/02/09 07:59:00 guy Exp $
+ * $Id: packet-portmap.c,v 1.29 2001/04/17 06:29:12 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -36,6 +36,7 @@
 
 #include "packet-rpc.h"
 #include "packet-portmap.h"
+#include "ipproto.h"
 
 /*
  * See: