aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/addr_resolv.c2
-rw-r--r--epan/addr_resolv.h2
-rw-r--r--epan/address.h2
-rw-r--r--epan/column-utils.c2
-rw-r--r--epan/dissectors/packet-tls-utils.c2
-rw-r--r--epan/follow.h2
-rw-r--r--epan/ftypes/ftype-ipv4.c2
-rw-r--r--epan/ftypes/ftype-ipv6.c2
-rw-r--r--epan/ftypes/ftypes.h2
-rw-r--r--epan/iana-ip.h2
-rw-r--r--epan/proto.h2
-rw-r--r--epan/to_str.h2
-rw-r--r--epan/tvbuff.h2
-rw-r--r--wsutil/CMakeLists.txt4
-rw-r--r--wsutil/inet_cidr.c (renamed from wsutil/inet_netw.c)6
-rw-r--r--wsutil/inet_cidr.h (renamed from wsutil/inet_netw.h)4
16 files changed, 20 insertions, 20 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 0d9fe9984d..b3b5425a79 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -88,7 +88,7 @@
#include <wsutil/report_message.h>
#include <wsutil/file_util.h>
#include <wsutil/pint.h>
-#include <wsutil/inet_netw.h>
+#include <wsutil/inet_cidr.h>
#include <epan/strutil.h>
#include <epan/to_str.h>
diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h
index c000abb334..e9734c1cef 100644
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -22,7 +22,7 @@
#include <epan/address.h>
#include <epan/tvbuff.h>
-#include <wsutil/inet_netw.h>
+#include <wsutil/inet_cidr.h>
#include <epan/to_str.h>
#include <wiretap/wtap.h>
#include "ws_symbol_export.h"
diff --git a/epan/address.h b/epan/address.h
index 688d6cd72d..a5227c7ecd 100644
--- a/epan/address.h
+++ b/epan/address.h
@@ -17,7 +17,7 @@
#include "tvbuff.h"
#include <epan/wmem_scopes.h>
#include <wsutil/ws_assert.h>
-#include <wsutil/inet_netw.h>
+#include <wsutil/inet_cidr.h>
#ifdef __cplusplus
extern "C" {
diff --git a/epan/column-utils.c b/epan/column-utils.c
index 8d07e82016..c66421fd82 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -33,7 +33,7 @@
#include <epan/epan.h>
#include <epan/dfilter/dfilter.h>
-#include <wsutil/inet_netw.h>
+#include <wsutil/inet_cidr.h>
#include <wsutil/utf8_entities.h>
#include <wsutil/ws_assert.h>
#include <wsutil/unicode-utils.h>
diff --git a/epan/dissectors/packet-tls-utils.c b/epan/dissectors/packet-tls-utils.c
index 40d6875945..a48ee35bd0 100644
--- a/epan/dissectors/packet-tls-utils.c
+++ b/epan/dissectors/packet-tls-utils.c
@@ -31,7 +31,7 @@
#include <epan/oids.h>
#include <epan/secrets.h>
-#include <wsutil/inet_netw.h>
+#include <wsutil/inet_cidr.h>
#include <wsutil/filesystem.h>
#include <wsutil/file_util.h>
#include <wsutil/str_util.h>
diff --git a/epan/follow.h b/epan/follow.h
index 40126e17af..636b4e1766 100644
--- a/epan/follow.h
+++ b/epan/follow.h
@@ -15,7 +15,7 @@
#include <epan/epan.h>
#include <epan/packet.h>
-#include <wsutil/inet_netw.h>
+#include <wsutil/inet_cidr.h>
#include <epan/tap.h>
#include <epan/wmem_scopes.h>
#include "ws_symbol_export.h"
diff --git a/epan/ftypes/ftype-ipv4.c b/epan/ftypes/ftype-ipv4.c
index 955a0725c1..424cc0015e 100644
--- a/epan/ftypes/ftype-ipv4.c
+++ b/epan/ftypes/ftype-ipv4.c
@@ -14,7 +14,7 @@
#include <epan/addr_resolv.h>
#include <wsutil/bits_count_ones.h>
#include <wsutil/strtoi.h>
-#include <wsutil/inet_netw.h>
+#include <wsutil/inet_cidr.h>
static void
value_set_ipv4(fvalue_t *fv, const ipv4_addr_and_mask *ipv4)
diff --git a/epan/ftypes/ftype-ipv6.c b/epan/ftypes/ftype-ipv6.c
index 15e0425b4c..89754d3dfe 100644
--- a/epan/ftypes/ftype-ipv6.c
+++ b/epan/ftypes/ftype-ipv6.c
@@ -13,7 +13,7 @@
#include <ftypes-int.h>
#include <epan/addr_resolv.h>
#include <epan/to_str.h>
-#include <wsutil/inet_netw.h>
+#include <wsutil/inet_cidr.h>
#include <wsutil/strtoi.h>
static bool
diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h
index 18e88ff196..3c227ee9a7 100644
--- a/epan/ftypes/ftypes.h
+++ b/epan/ftypes/ftypes.h
@@ -286,7 +286,7 @@ ftype_can_val_to_uinteger64(enum ftenum ftype);
/* ---------------- FVALUE ----------------- */
-#include <wsutil/inet_netw.h>
+#include <wsutil/inet_cidr.h>
#include <epan/guid-utils.h>
#include <epan/tvbuff.h>
diff --git a/epan/iana-ip.h b/epan/iana-ip.h
index a57ab22f00..3f3efb9265 100644
--- a/epan/iana-ip.h
+++ b/epan/iana-ip.h
@@ -10,7 +10,7 @@
#define __IANA_IP_H__
#include <wireshark.h>
-#include <wsutil/inet_netw.h>
+#include <wsutil/inet_cidr.h>
#ifdef __cplusplus
extern "C" {
diff --git a/epan/proto.h b/epan/proto.h
index b4c9ab6838..60caa2436d 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -29,7 +29,7 @@
#include <epan/wmem_scopes.h>
-#include "wsutil/inet_netw.h"
+#include "wsutil/inet_cidr.h"
#include "wsutil/nstime.h"
#include "tvbuff.h"
#include "value_string.h"
diff --git a/epan/to_str.h b/epan/to_str.h
index c99cb2b528..8d595a6e69 100644
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -14,7 +14,7 @@
#include <glib.h>
#include "wsutil/nstime.h"
-#include <wsutil/inet_netw.h>
+#include <wsutil/inet_cidr.h>
#include <epan/proto.h>
#include <epan/packet_info.h>
#include "ws_symbol_export.h"
diff --git a/epan/tvbuff.h b/epan/tvbuff.h
index ea8283423b..9b17409bcd 100644
--- a/epan/tvbuff.h
+++ b/epan/tvbuff.h
@@ -25,7 +25,7 @@
#include <epan/guid-utils.h>
#include <epan/wmem_scopes.h>
-#include <wsutil/inet_netw.h>
+#include <wsutil/inet_cidr.h>
#include <wsutil/nstime.h>
#include "wsutil/ws_mempbrk.h"
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index ff1d1333d4..9cf7f11fa7 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -102,7 +102,7 @@ set(WSUTIL_PUBLIC_HEADERS
filesystem.h
g711.h
inet_addr.h
- inet_netw.h
+ inet_cidr.h
interface.h
introspection.h
jsmn.h
@@ -173,7 +173,7 @@ set(WSUTIL_COMMON_FILES
filter_files.c
g711.c
inet_addr.c
- inet_netw.c
+ inet_cidr.c
interface.c
introspection.c
jsmn.c
diff --git a/wsutil/inet_netw.c b/wsutil/inet_cidr.c
index 0d44e0c639..e8bf3117a0 100644
--- a/wsutil/inet_netw.c
+++ b/wsutil/inet_cidr.c
@@ -7,11 +7,11 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#include "inet_netw.h"
+#include "inet_cidr.h"
-guint32
-ws_ipv4_get_subnet_mask(const guint32 mask_length)
+uint32_t
+ws_ipv4_get_subnet_mask(const uint32_t mask_length)
{
static const guint32 masks[33] = {
0x00000000,
diff --git a/wsutil/inet_netw.h b/wsutil/inet_cidr.h
index fd74954666..bc017135ad 100644
--- a/wsutil/inet_netw.h
+++ b/wsutil/inet_cidr.h
@@ -40,8 +40,8 @@ typedef struct {
* @return the subnet mask of the specified length
*/
WS_DLL_PUBLIC
-guint32
-ws_ipv4_get_subnet_mask(const guint32 mask_length);
+uint32_t
+ws_ipv4_get_subnet_mask(const uint32_t mask_length);
WS_DLL_PUBLIC
void
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 13:57:13 +0000