checkAPIs.pl: support for new-style dissectors in check_hf_entries

[metze/wireshark/wip.git] / epan / ipproto.h

diff --git a/epan/ipproto.h b/epan/ipproto.h
index 8d32cb3a53f18144223453b57756c472edc064de..bb57b63eb3f2ddd14971617f39abe053597cabf4 100644 (file)
--- a/epan/ipproto.h
+++ b/epan/ipproto.h
@@ -2,34 +2,22 @@
  * Declarations of IP protocol numbers, and of routines for converting
  * IP protocol numbers into strings.
  *
- * $Id$
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __IPPROTO_H__
 #define __IPPROTO_H__
 
+#include "ws_symbol_export.h"
+
 /*
  * IP protocol numbers.
+ * http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml
  */
-#define IP_PROTO_IP             0       /* dummy for IP */
 #define IP_PROTO_HOPOPTS        0       /* IP6 hop-by-hop options - RFC1883 */
 #define IP_PROTO_ICMP           1       /* control message protocol - RFC792 */
 #define IP_PROTO_IGMP           2       /* group mgmt protocol - RFC1112 */
@@ -95,8 +83,6 @@
 #define IP_PROTO_NONE           59      /* IP6 no next header - RFC1883 */
 #define IP_PROTO_DSTOPTS        60      /* IP6 destination options - RFC1883 */
 /* 61 is reserved by IANA for any host internal protocol */
-/* 61 is used by UCL's SHIM6 implementation as Next Header for SHIM6 */
-#define IP_PROTO_SHIM6_OLD      61      /* SHIM6 */
 
 /*
  * The current Protocol Numbers list says that the IP protocol number for
@@ -192,7 +178,22 @@
 #define IP_PROTO_AX4000         173     /* AX/4000 Testblock - non IANA */
 #define IP_PROTO_NCS_HEARTBEAT  224     /* Novell NCS Heartbeat - http://support.novell.com/cgi-bin/search/searchtid.cgi?/10071158.htm */
 
-extern value_string_ext ipproto_val_ext;
-extern const char *ipprotostr(const int proto);
+WS_DLL_PUBLIC value_string_ext ipproto_val_ext;
+WS_DLL_PUBLIC const char *ipprotostr(const int proto);
+
+WS_DLL_PUBLIC const char *ipv6extprotostr(int proto);
 
 #endif /* ipproto.h */
+
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */