When printing messages about dropping IPv6, do not print anything about ihl.

[secnet.git] / ipaddr.h

diff --git a/ipaddr.h b/ipaddr.h
index f481b3e5f55c1f33a65c391d101915db88668aae..dfe62717d7986d599e87af6cdc08729d2882a5cb 100644 (file)
--- a/ipaddr.h
+++ b/ipaddr.h
@@ -1,4 +1,22 @@
 /* Useful functions for dealing with collections of IP addresses */
+/*
+ * This file is part of secnet.
+ * See README for full list of copyright holders.
+ *
+ * secnet 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 d of the License, or
+ * (at your option) any later version.
+ * 
+ * secnet 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
+ * version 3 along with secnet; if not, see
+ * https://www.gnu.org/licenses/gpl.html.
+ */
 
 #ifndef ipaddr_h
 #define ipaddr_h
@@ -6,12 +24,12 @@
 struct subnet {
     uint32_t prefix;
     uint32_t mask;
-    uint32_t len;
+    int len;
 };
 
 struct subnet_list {
-    uint32_t entries;
-    uint32_t alloc;
+    int32_t entries;
+    int32_t alloc;
     struct subnet *list;
 };
 
@@ -20,15 +38,14 @@ struct iprange {
 };
 
 struct ipset {
-    uint32_t l; /* Number of entries in list */
-    uint32_t a; /* Allocated space in list */
+    int32_t l; /* Number of entries in list */
+    int32_t a; /* Allocated space in list */
     struct iprange *d;
 };
 
 extern struct subnet_list *subnet_list_new(void);
 extern void subnet_list_free(struct subnet_list *a);
-extern void subnet_list_append(struct subnet_list *a, uint32_t prefix,
-                              uint32_t len);
+extern void subnet_list_append(struct subnet_list *a, uint32_t prefix, int len);
 
 static inline bool_t subnet_match(struct subnet s, uint32_t address)
 {
@@ -54,6 +71,6 @@ extern string_t subnet_to_string(struct subnet sn);
 extern struct ipset *string_list_to_ipset(list_t *l,struct cloc loc,
                                          cstring_t module, cstring_t param);
                                          
-extern uint32_t string_item_to_ipaddr(item_t *i, cstring_t desc);
+extern uint32_t string_item_to_ipaddr(const item_t *i, cstring_t desc);
 
 #endif /* ipaddr_h */