Backport patches to 0.4

gen/modules/net.h

@@ -143,3 +143,43 @@ struct mmsghdr {
     struct msghdr msg_hdr;
     unsigned int  msg_len;
 };
+
+#define SOL_IP		0
+#define SOL_TCP		6
+#define SOL_UDP		17
+#define SOL_IPV6	41
+#define SOL_ICMPV6	58
+#define SOL_SCTP	132
+#define SOL_UDPLITE	136
+#define SOL_RAW		255
+#define SOL_IPX		256
+#define SOL_AX25	257
+#define SOL_ATALK	258
+#define SOL_NETROM	259
+#define SOL_ROSE	260
+#define SOL_DECNET	261
+#define	SOL_X25		262
+#define SOL_PACKET	263
+#define SOL_ATM		264
+#define SOL_AAL		265
+#define SOL_IRDA    266
+#define SOL_NETBEUI	267
+#define SOL_LLC		268
+#define SOL_DCCP	269
+#define SOL_NETLINK	270
+#define SOL_TIPC	271
+#define SOL_RXRPC	272
+#define SOL_PPPOL2TP	273
+#define SOL_BLUETOOTH	274
+#define SOL_PNPIPE	275
+#define SOL_RDS		276
+#define SOL_IUCV	277
+#define SOL_CAIF	278
+#define SOL_ALG		279
+#define SOL_NFC		280
+#define SOL_KCM		281
+#define SOL_TLS		282
+#define SOL_XDP		283
+#define SOL_MPTCP	284
+#define SOL_MCTP	285
+#define SOL_SMC		286

src/aarch64/net.rs

@@ -1387,6 +1387,45 @@ pub const MSG_CMSG_CLOEXEC: u32 = 1073741824;
 pub const SCM_RIGHTS: u32 = 1;
 pub const SCM_CREDENTIALS: u32 = 2;
 pub const SCM_SECURITY: u32 = 3;
+pub const SOL_IP: u32 = 0;
+pub const SOL_TCP: u32 = 6;
+pub const SOL_UDP: u32 = 17;
+pub const SOL_IPV6: u32 = 41;
+pub const SOL_ICMPV6: u32 = 58;
+pub const SOL_SCTP: u32 = 132;
+pub const SOL_UDPLITE: u32 = 136;
+pub const SOL_RAW: u32 = 255;
+pub const SOL_IPX: u32 = 256;
+pub const SOL_AX25: u32 = 257;
+pub const SOL_ATALK: u32 = 258;
+pub const SOL_NETROM: u32 = 259;
+pub const SOL_ROSE: u32 = 260;
+pub const SOL_DECNET: u32 = 261;
+pub const SOL_X25: u32 = 262;
+pub const SOL_PACKET: u32 = 263;
+pub const SOL_ATM: u32 = 264;
+pub const SOL_AAL: u32 = 265;
+pub const SOL_IRDA: u32 = 266;
+pub const SOL_NETBEUI: u32 = 267;
+pub const SOL_LLC: u32 = 268;
+pub const SOL_DCCP: u32 = 269;
+pub const SOL_NETLINK: u32 = 270;
+pub const SOL_TIPC: u32 = 271;
+pub const SOL_RXRPC: u32 = 272;
+pub const SOL_PPPOL2TP: u32 = 273;
+pub const SOL_BLUETOOTH: u32 = 274;
+pub const SOL_PNPIPE: u32 = 275;
+pub const SOL_RDS: u32 = 276;
+pub const SOL_IUCV: u32 = 277;
+pub const SOL_CAIF: u32 = 278;
+pub const SOL_ALG: u32 = 279;
+pub const SOL_NFC: u32 = 280;
+pub const SOL_KCM: u32 = 281;
+pub const SOL_TLS: u32 = 282;
+pub const SOL_XDP: u32 = 283;
+pub const SOL_MPTCP: u32 = 284;
+pub const SOL_MCTP: u32 = 285;
+pub const SOL_SMC: u32 = 286;
 pub const IPPROTO_IP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_IP;
 pub const IPPROTO_ICMP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_ICMP;
 pub const IPPROTO_IGMP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_IGMP;

src/arm/net.rs

@@ -1379,6 +1379,45 @@ pub const MSG_CMSG_CLOEXEC: u32 = 1073741824;
 pub const SCM_RIGHTS: u32 = 1;
 pub const SCM_CREDENTIALS: u32 = 2;
 pub const SCM_SECURITY: u32 = 3;
+pub const SOL_IP: u32 = 0;
+pub const SOL_TCP: u32 = 6;
+pub const SOL_UDP: u32 = 17;
+pub const SOL_IPV6: u32 = 41;
+pub const SOL_ICMPV6: u32 = 58;
+pub const SOL_SCTP: u32 = 132;
+pub const SOL_UDPLITE: u32 = 136;
+pub const SOL_RAW: u32 = 255;
+pub const SOL_IPX: u32 = 256;
+pub const SOL_AX25: u32 = 257;
+pub const SOL_ATALK: u32 = 258;
+pub const SOL_NETROM: u32 = 259;
+pub const SOL_ROSE: u32 = 260;
+pub const SOL_DECNET: u32 = 261;
+pub const SOL_X25: u32 = 262;
+pub const SOL_PACKET: u32 = 263;
+pub const SOL_ATM: u32 = 264;
+pub const SOL_AAL: u32 = 265;
+pub const SOL_IRDA: u32 = 266;
+pub const SOL_NETBEUI: u32 = 267;
+pub const SOL_LLC: u32 = 268;
+pub const SOL_DCCP: u32 = 269;
+pub const SOL_NETLINK: u32 = 270;
+pub const SOL_TIPC: u32 = 271;
+pub const SOL_RXRPC: u32 = 272;
+pub const SOL_PPPOL2TP: u32 = 273;
+pub const SOL_BLUETOOTH: u32 = 274;
+pub const SOL_PNPIPE: u32 = 275;
+pub const SOL_RDS: u32 = 276;
+pub const SOL_IUCV: u32 = 277;
+pub const SOL_CAIF: u32 = 278;
+pub const SOL_ALG: u32 = 279;
+pub const SOL_NFC: u32 = 280;
+pub const SOL_KCM: u32 = 281;
+pub const SOL_TLS: u32 = 282;
+pub const SOL_XDP: u32 = 283;
+pub const SOL_MPTCP: u32 = 284;
+pub const SOL_MCTP: u32 = 285;
+pub const SOL_SMC: u32 = 286;
 pub const IPPROTO_IP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_IP;
 pub const IPPROTO_ICMP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_ICMP;
 pub const IPPROTO_IGMP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_IGMP;

src/csky/net.rs

@@ -1379,6 +1379,45 @@ pub const MSG_CMSG_CLOEXEC: u32 = 1073741824;
 pub const SCM_RIGHTS: u32 = 1;
 pub const SCM_CREDENTIALS: u32 = 2;
 pub const SCM_SECURITY: u32 = 3;
+pub const SOL_IP: u32 = 0;
+pub const SOL_TCP: u32 = 6;
+pub const SOL_UDP: u32 = 17;
+pub const SOL_IPV6: u32 = 41;
+pub const SOL_ICMPV6: u32 = 58;
+pub const SOL_SCTP: u32 = 132;
+pub const SOL_UDPLITE: u32 = 136;
+pub const SOL_RAW: u32 = 255;
+pub const SOL_IPX: u32 = 256;
+pub const SOL_AX25: u32 = 257;
+pub const SOL_ATALK: u32 = 258;
+pub const SOL_NETROM: u32 = 259;
+pub const SOL_ROSE: u32 = 260;
+pub const SOL_DECNET: u32 = 261;
+pub const SOL_X25: u32 = 262;
+pub const SOL_PACKET: u32 = 263;
+pub const SOL_ATM: u32 = 264;
+pub const SOL_AAL: u32 = 265;
+pub const SOL_IRDA: u32 = 266;
+pub const SOL_NETBEUI: u32 = 267;
+pub const SOL_LLC: u32 = 268;
+pub const SOL_DCCP: u32 = 269;
+pub const SOL_NETLINK: u32 = 270;
+pub const SOL_TIPC: u32 = 271;
+pub const SOL_RXRPC: u32 = 272;
+pub const SOL_PPPOL2TP: u32 = 273;
+pub const SOL_BLUETOOTH: u32 = 274;
+pub const SOL_PNPIPE: u32 = 275;
+pub const SOL_RDS: u32 = 276;
+pub const SOL_IUCV: u32 = 277;
+pub const SOL_CAIF: u32 = 278;
+pub const SOL_ALG: u32 = 279;
+pub const SOL_NFC: u32 = 280;
+pub const SOL_KCM: u32 = 281;
+pub const SOL_TLS: u32 = 282;
+pub const SOL_XDP: u32 = 283;
+pub const SOL_MPTCP: u32 = 284;
+pub const SOL_MCTP: u32 = 285;
+pub const SOL_SMC: u32 = 286;
 pub const IPPROTO_IP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_IP;
 pub const IPPROTO_ICMP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_ICMP;
 pub const IPPROTO_IGMP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_IGMP;

src/lib.rs

@@ -124,7 +124,7 @@ pub mod cmsg_macros {
         }
 
         if next_cmsg.add(1) as usize > max
-            || next_cmsg as usize + CMSG_ALIGN(cmsg_len as _) as usize > max
+            || next_cmsg as usize + CMSG_ALIGN((*next_cmsg).cmsg_len as _) as usize > max
         {
             return ptr::null_mut();
         }

src/loongarch64/net.rs

@@ -1387,6 +1387,45 @@ pub const MSG_CMSG_CLOEXEC: u32 = 1073741824;
 pub const SCM_RIGHTS: u32 = 1;
 pub const SCM_CREDENTIALS: u32 = 2;
 pub const SCM_SECURITY: u32 = 3;
+pub const SOL_IP: u32 = 0;
+pub const SOL_TCP: u32 = 6;
+pub const SOL_UDP: u32 = 17;
+pub const SOL_IPV6: u32 = 41;
+pub const SOL_ICMPV6: u32 = 58;
+pub const SOL_SCTP: u32 = 132;
+pub const SOL_UDPLITE: u32 = 136;
+pub const SOL_RAW: u32 = 255;
+pub const SOL_IPX: u32 = 256;
+pub const SOL_AX25: u32 = 257;
+pub const SOL_ATALK: u32 = 258;
+pub const SOL_NETROM: u32 = 259;
+pub const SOL_ROSE: u32 = 260;
+pub const SOL_DECNET: u32 = 261;
+pub const SOL_X25: u32 = 262;
+pub const SOL_PACKET: u32 = 263;
+pub const SOL_ATM: u32 = 264;
+pub const SOL_AAL: u32 = 265;
+pub const SOL_IRDA: u32 = 266;
+pub const SOL_NETBEUI: u32 = 267;
+pub const SOL_LLC: u32 = 268;
+pub const SOL_DCCP: u32 = 269;
+pub const SOL_NETLINK: u32 = 270;
+pub const SOL_TIPC: u32 = 271;
+pub const SOL_RXRPC: u32 = 272;
+pub const SOL_PPPOL2TP: u32 = 273;
+pub const SOL_BLUETOOTH: u32 = 274;
+pub const SOL_PNPIPE: u32 = 275;
+pub const SOL_RDS: u32 = 276;
+pub const SOL_IUCV: u32 = 277;
+pub const SOL_CAIF: u32 = 278;
+pub const SOL_ALG: u32 = 279;
+pub const SOL_NFC: u32 = 280;
+pub const SOL_KCM: u32 = 281;
+pub const SOL_TLS: u32 = 282;
+pub const SOL_XDP: u32 = 283;
+pub const SOL_MPTCP: u32 = 284;
+pub const SOL_MCTP: u32 = 285;
+pub const SOL_SMC: u32 = 286;
 pub const IPPROTO_IP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_IP;
 pub const IPPROTO_ICMP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_ICMP;
 pub const IPPROTO_IGMP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_IGMP;

src/mips/net.rs

@@ -1410,6 +1410,45 @@ pub const MSG_CMSG_CLOEXEC: u32 = 1073741824;
 pub const SCM_RIGHTS: u32 = 1;
 pub const SCM_CREDENTIALS: u32 = 2;
 pub const SCM_SECURITY: u32 = 3;
+pub const SOL_IP: u32 = 0;
+pub const SOL_TCP: u32 = 6;
+pub const SOL_UDP: u32 = 17;
+pub const SOL_IPV6: u32 = 41;
+pub const SOL_ICMPV6: u32 = 58;
+pub const SOL_SCTP: u32 = 132;
+pub const SOL_UDPLITE: u32 = 136;
+pub const SOL_RAW: u32 = 255;
+pub const SOL_IPX: u32 = 256;
+pub const SOL_AX25: u32 = 257;
+pub const SOL_ATALK: u32 = 258;
+pub const SOL_NETROM: u32 = 259;
+pub const SOL_ROSE: u32 = 260;
+pub const SOL_DECNET: u32 = 261;
+pub const SOL_X25: u32 = 262;
+pub const SOL_PACKET: u32 = 263;
+pub const SOL_ATM: u32 = 264;
+pub const SOL_AAL: u32 = 265;
+pub const SOL_IRDA: u32 = 266;
+pub const SOL_NETBEUI: u32 = 267;
+pub const SOL_LLC: u32 = 268;
+pub const SOL_DCCP: u32 = 269;
+pub const SOL_NETLINK: u32 = 270;
+pub const SOL_TIPC: u32 = 271;
+pub const SOL_RXRPC: u32 = 272;
+pub const SOL_PPPOL2TP: u32 = 273;
+pub const SOL_BLUETOOTH: u32 = 274;
+pub const SOL_PNPIPE: u32 = 275;
+pub const SOL_RDS: u32 = 276;
+pub const SOL_IUCV: u32 = 277;
+pub const SOL_CAIF: u32 = 278;
+pub const SOL_ALG: u32 = 279;
+pub const SOL_NFC: u32 = 280;
+pub const SOL_KCM: u32 = 281;
+pub const SOL_TLS: u32 = 282;
+pub const SOL_XDP: u32 = 283;
+pub const SOL_MPTCP: u32 = 284;
+pub const SOL_MCTP: u32 = 285;
+pub const SOL_SMC: u32 = 286;
 pub const IPPROTO_IP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_IP;
 pub const IPPROTO_ICMP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_ICMP;
 pub const IPPROTO_IGMP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_IGMP;

src/mips32r6/net.rs

@@ -1410,6 +1410,45 @@ pub const MSG_CMSG_CLOEXEC: u32 = 1073741824;
 pub const SCM_RIGHTS: u32 = 1;
 pub const SCM_CREDENTIALS: u32 = 2;
 pub const SCM_SECURITY: u32 = 3;
+pub const SOL_IP: u32 = 0;
+pub const SOL_TCP: u32 = 6;
+pub const SOL_UDP: u32 = 17;
+pub const SOL_IPV6: u32 = 41;
+pub const SOL_ICMPV6: u32 = 58;
+pub const SOL_SCTP: u32 = 132;
+pub const SOL_UDPLITE: u32 = 136;
+pub const SOL_RAW: u32 = 255;
+pub const SOL_IPX: u32 = 256;
+pub const SOL_AX25: u32 = 257;
+pub const SOL_ATALK: u32 = 258;
+pub const SOL_NETROM: u32 = 259;
+pub const SOL_ROSE: u32 = 260;
+pub const SOL_DECNET: u32 = 261;
+pub const SOL_X25: u32 = 262;
+pub const SOL_PACKET: u32 = 263;
+pub const SOL_ATM: u32 = 264;
+pub const SOL_AAL: u32 = 265;
+pub const SOL_IRDA: u32 = 266;
+pub const SOL_NETBEUI: u32 = 267;
+pub const SOL_LLC: u32 = 268;
+pub const SOL_DCCP: u32 = 269;
+pub const SOL_NETLINK: u32 = 270;
+pub const SOL_TIPC: u32 = 271;
+pub const SOL_RXRPC: u32 = 272;
+pub const SOL_PPPOL2TP: u32 = 273;
+pub const SOL_BLUETOOTH: u32 = 274;
+pub const SOL_PNPIPE: u32 = 275;
+pub const SOL_RDS: u32 = 276;
+pub const SOL_IUCV: u32 = 277;
+pub const SOL_CAIF: u32 = 278;
+pub const SOL_ALG: u32 = 279;
+pub const SOL_NFC: u32 = 280;
+pub const SOL_KCM: u32 = 281;
+pub const SOL_TLS: u32 = 282;
+pub const SOL_XDP: u32 = 283;
+pub const SOL_MPTCP: u32 = 284;
+pub const SOL_MCTP: u32 = 285;
+pub const SOL_SMC: u32 = 286;
 pub const IPPROTO_IP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_IP;
 pub const IPPROTO_ICMP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_ICMP;
 pub const IPPROTO_IGMP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_IGMP;

src/mips64/net.rs

@@ -1418,6 +1418,45 @@ pub const MSG_CMSG_CLOEXEC: u32 = 1073741824;
 pub const SCM_RIGHTS: u32 = 1;
 pub const SCM_CREDENTIALS: u32 = 2;
 pub const SCM_SECURITY: u32 = 3;
+pub const SOL_IP: u32 = 0;
+pub const SOL_TCP: u32 = 6;
+pub const SOL_UDP: u32 = 17;
+pub const SOL_IPV6: u32 = 41;
+pub const SOL_ICMPV6: u32 = 58;
+pub const SOL_SCTP: u32 = 132;
+pub const SOL_UDPLITE: u32 = 136;
+pub const SOL_RAW: u32 = 255;
+pub const SOL_IPX: u32 = 256;
+pub const SOL_AX25: u32 = 257;
+pub const SOL_ATALK: u32 = 258;
+pub const SOL_NETROM: u32 = 259;
+pub const SOL_ROSE: u32 = 260;
+pub const SOL_DECNET: u32 = 261;
+pub const SOL_X25: u32 = 262;
+pub const SOL_PACKET: u32 = 263;
+pub const SOL_ATM: u32 = 264;
+pub const SOL_AAL: u32 = 265;
+pub const SOL_IRDA: u32 = 266;
+pub const SOL_NETBEUI: u32 = 267;
+pub const SOL_LLC: u32 = 268;
+pub const SOL_DCCP: u32 = 269;
+pub const SOL_NETLINK: u32 = 270;
+pub const SOL_TIPC: u32 = 271;
+pub const SOL_RXRPC: u32 = 272;
+pub const SOL_PPPOL2TP: u32 = 273;
+pub const SOL_BLUETOOTH: u32 = 274;
+pub const SOL_PNPIPE: u32 = 275;
+pub const SOL_RDS: u32 = 276;
+pub const SOL_IUCV: u32 = 277;
+pub const SOL_CAIF: u32 = 278;
+pub const SOL_ALG: u32 = 279;
+pub const SOL_NFC: u32 = 280;
+pub const SOL_KCM: u32 = 281;
+pub const SOL_TLS: u32 = 282;
+pub const SOL_XDP: u32 = 283;
+pub const SOL_MPTCP: u32 = 284;
+pub const SOL_MCTP: u32 = 285;
+pub const SOL_SMC: u32 = 286;
 pub const IPPROTO_IP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_IP;
 pub const IPPROTO_ICMP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_ICMP;
 pub const IPPROTO_IGMP: _bindgen_ty_1 = _bindgen_ty_1::IPPROTO_IGMP;