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>

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		\

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

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"
 

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"

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"

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*/

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>

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

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>

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"
 

epan/ipv6.h

@@ -1,4 +1,4 @@
-/* ipv6-utils.h
+/* ipv6.h
  * Definitions for IPv6 packet disassembly
  *
  * Wireshark - Network traffic analyzer

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"
 

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"