pfsockaddr_union needs to die. This fixes two of the uses of it and the
pf_table code will follow later. For bridge we just move the definition
and in pfsync we can actually use the one from ip_ipsp.h since it is used
for that.
OK?
--
:wq Claudio
Index: net/if_bridge.h
===================================================================
RCS file: /cvs/src/sys/net/if_bridge.h,v
retrieving revision 1.54
diff -u -p -r1.54 if_bridge.h
--- net/if_bridge.h 11 Jan 2017 08:47:48 -0000 1.54
+++ net/if_bridge.h 18 Jan 2017 14:27:30 -0000
@@ -407,11 +407,22 @@ struct bridge_iflist {
((struct bridge_iflist *)_bp2)->bridge_sc)
/*
+ * XXX ip_ipsp.h's sockaddr_union should be converted to sockaddr *
+ * passing with correct sa_len, then a good approach for cleaning this
+ * will become more clear.
+ */
+union brsockaddr_union {
+ struct sockaddr sa;
+ struct sockaddr_in sin;
+ struct sockaddr_in6 sin6;
+};
+
+/*
* Bridge tunnel tagging
*/
struct bridge_tunneltag {
- union pfsockaddr_union brtag_peer;
- union pfsockaddr_union brtag_local;
+ union brsockaddr_union brtag_peer;
+ union brsockaddr_union brtag_local;
u_int32_t brtag_id;
};
Index: net/if_pfsync.h
===================================================================
RCS file: /cvs/src/sys/net/if_pfsync.h,v
retrieving revision 1.48
diff -u -p -r1.48 if_pfsync.h
--- net/if_pfsync.h 24 Jan 2015 00:29:06 -0000 1.48
+++ net/if_pfsync.h 2 Nov 2016 21:02:13 -0000
@@ -210,10 +210,9 @@ struct pfsync_bus {
/*
* TDB
*/
-
struct pfsync_tdb {
u_int32_t spi;
- union pfsockaddr_union dst;
+ union sockaddr_union dst;
u_int64_t rpl;
u_int64_t cur_bytes;
u_int8_t sproto;
