Rename ipv6-utils.h to ipv6.h.

By analogy to ipv4.h.

Change-Id: I147565b332024b1bb88e9cd15889255773d04524
Reviewed-on: https://code.wireshark.org/review/13034
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/epan/Makefile.common b/epan/Makefile.common
index d11786e99341ebede08479728903f825b3e526ea..f05552dca41e55d912eda45d045b548df176391e 100644 (file)
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -211,7 +211,7 @@ LIBWIRESHARK_INCLUDES =             \
        ip_opts.h               \
        ipproto.h               \
        ipv4.h                  \
-       ipv6-utils.h            \
+       ipv6.h                  \
        lapd_sapi.h             \
        llcsaps.h               \
        next_tvb.h              \

diff --git a/epan/addr_and_mask.c b/epan/addr_and_mask.c
index 080e216cdc3d05a180fb10ac4ca3dcf96ed6baa4..fed0637e4959143ebd9fc51106b2b26fdb122ace 100644 (file)
--- a/epan/addr_and_mask.c
+++ b/epan/addr_and_mask.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "tvbuff.h"
-#include "ipv6-utils.h"
+#include "ipv6.h"
 #include "addr_and_mask.h"
 
 guint32

diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 9a4a2752483193980e99879c4c1fd434ab3052a3..63615d1a4bf3ce1e2fd90c42e06277af1e6f8310 100644 (file)
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -118,7 +118,7 @@
 
 #include "packet.h"
 #include "addr_and_mask.h"
-#include "ipv6-utils.h"
+#include "ipv6.h"
 #include "addr_resolv.h"
 #include "wsutil/filesystem.h"
 

diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h
index 69ecbb879606e959749f1293d46039bdefd799e4..45cd190972df53d7ba11352863bb5532dfe51a92 100644 (file)
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -34,7 +34,7 @@
 
 #include <epan/address.h>
 #include <epan/tvbuff.h>
-#include <epan/ipv6-utils.h>
+#include <epan/ipv6.h>
 #include <epan/to_str.h>
 #include <wiretap/wtap.h>
 #include "ws_symbol_export.h"

diff --git a/epan/column-utils.c b/epan/column-utils.c
index d754084f25fc24f4cccb579ff052f6b3f189bad1..f7bb4ea36c1bbe51dd3c6bfe350cabc69c67e8fe 100644 (file)
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -32,7 +32,7 @@
 #include "wsutil/pint.h"
 #include "addr_resolv.h"
 #include "address_types.h"
-#include "ipv6-utils.h"
+#include "ipv6.h"
 #include "osi-utils.h"
 #include "value_string.h"
 #include "column-info.h"

diff --git a/epan/dissectors/packet-ipv6.h b/epan/dissectors/packet-ipv6.h
index dea9606fb002c7ff3f976fa93ec3a0bfcb91c040..b63518a0fbb48f3457471442ff25a75d08acee09 100644 (file)
--- a/epan/dissectors/packet-ipv6.h
+++ b/epan/dissectors/packet-ipv6.h
@@ -24,7 +24,7 @@
 #ifndef __PACKET_IPV6_H_DEFINED__
 #define __PACKET_IPV6_H_DEFINED__
 
-#include <epan/ipv6-utils.h>
+#include <epan/ipv6.h>
 
 /* this definition makes trouble with Microsoft Platform SDK: ws2tcpip.h and is used nowhere */
 /*#define INET6_ADDRSTRLEN    46*/

diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index f510a5cdc4c55aa68da2544142b7645239b5e1e1..89bfd2821325583b1b26d1b60c4a32b226f30877 100644 (file)
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -36,7 +36,7 @@
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/addr_resolv.h>
-#include <epan/ipv6-utils.h>
+#include <epan/ipv6.h>
 #include <epan/expert.h>
 #include <epan/asn1.h>
 #include <wsutil/filesystem.h>

diff --git a/epan/ftypes/ftype-ipv6.c b/epan/ftypes/ftype-ipv6.c
index e1093c6b67d5ce4396a5dea037886c5e0bd8848c..1e6c5b0baa36e8083337e8cbe40c1a0506a8e6c3 100644 (file)
--- a/epan/ftypes/ftype-ipv6.c
+++ b/epan/ftypes/ftype-ipv6.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include <ftypes-int.h>
-#include <epan/ipv6-utils.h>
+#include <epan/ipv6.h>
 #include <epan/addr_resolv.h>
 
 static void

diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h
index 74dc8e6d2c861315c34a4d26628e1949a401f782..60ee74048dc260e023d49e0030d42f9b78379910 100644 (file)
--- a/epan/ftypes/ftypes.h
+++ b/epan/ftypes/ftypes.h
@@ -190,7 +190,7 @@ ftype_can_matches(enum ftenum ftype);
 /* ---------------- FVALUE ----------------- */
 
 #include <epan/ipv4.h>
-#include <epan/ipv6-utils.h>
+#include <epan/ipv6.h>
 #include <epan/guid-utils.h>
 
 #include <epan/tvbuff.h>

diff --git a/epan/geoip_db.h b/epan/geoip_db.h
index 568a1243aa138a4f9f371fc72d06079bdd0306f7..5cb1be6e489eedc43e164c1100de9dddb6973efa 100644 (file)
--- a/epan/geoip_db.h
+++ b/epan/geoip_db.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include <epan/ipv6-utils.h>
+#include <epan/ipv6.h>
 #include <epan/prefs.h>
 #include "ws_symbol_export.h"
 

diff --git a/epan/ipv6-utils.h b/epan/ipv6.h
similarity index 98%
rename from epan/ipv6-utils.h
rename to epan/ipv6.h
index 80ab5e3f75347e750bb2411327645542154de213..7bf081375e250a7dbb2f2d0de81c98376589eb2c 100644 (file)
--- a/epan/ipv6-utils.h
+++ b/epan/ipv6.h
@@ -1,4 +1,4 @@
-/* ipv6-utils.h
+/* ipv6.h
  * Definitions for IPv6 packet disassembly
  *
  * Wireshark - Network traffic analyzer

diff --git a/epan/to_str.h b/epan/to_str.h
index 801bc9f11c2f6d76d070516d8d240b6efb040055..12e08e963bb38e9bfb810c553627fbe0a8437cb8 100644 (file)
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -28,7 +28,7 @@
 #include "wsutil/nstime.h"
 #include "time_fmt.h"
 #include <epan/packet_info.h>
-#include <epan/ipv6-utils.h>
+#include <epan/ipv6.h>
 #include "ws_symbol_export.h"
 #include "wmem/wmem.h"
 

diff --git a/epan/tvbuff.h b/epan/tvbuff.h
index c9623897302d086e429601f6704efc9ac8e0675f..c52e3b03f1afc6c323545034bd6b7b1c9d98bf91 100644 (file)
--- a/epan/tvbuff.h
+++ b/epan/tvbuff.h
@@ -36,7 +36,7 @@
 #include <glib.h>
 #include <epan/guid-utils.h>
 #include <epan/wmem/wmem.h>
-#include <epan/ipv6-utils.h>
+#include <epan/ipv6.h>
 
 #include <wsutil/nstime.h>
 #include "wsutil/ws_mempbrk.h"