Skip to content

Commit 8b5330f

Browse files
tgross35tgross35
authored
Merge pull request #3871 from tgross35/backport-garlic
[0.2] Backport four pull requests
2 parents f9aa12d + f90afef commit 8b5330f

File tree

10 files changed

+65
-0
lines changed

10 files changed

+65
-0
lines changed

‎libc-test/semver/android.txt

+8
Original file line numberDiff line numberDiff line change
@@ -1503,11 +1503,16 @@ NFT_CMP_LT
15031503
NFT_CMP_LTE
15041504
NFT_CMP_NEQ
15051505
NFT_CONTINUE
1506+
NFT_CT_AVGPKT
15061507
NFT_CT_BYTES
15071508
NFT_CT_DIRECTION
15081509
NFT_CT_DST
1510+
NFT_CT_DST_IP
1511+
NFT_CT_DST_IP6
1512+
NFT_CT_EVENTMASK
15091513
NFT_CT_EXPIRATION
15101514
NFT_CT_HELPER
1515+
NFT_CT_ID
15111516
NFT_CT_L3PROTOCOL
15121517
NFT_CT_LABELS
15131518
NFT_CT_MARK
@@ -1517,8 +1522,11 @@ NFT_CT_PROTO_DST
15171522
NFT_CT_PROTO_SRC
15181523
NFT_CT_SECMARK
15191524
NFT_CT_SRC
1525+
NFT_CT_SRC_IP
1526+
NFT_CT_SRC_IP6
15201527
NFT_CT_STATE
15211528
NFT_CT_STATUS
1529+
NFT_CT_ZONE
15221530
NFT_DATA_RESERVED_MASK
15231531
NFT_DATA_VALUE
15241532
NFT_DATA_VALUE_MAXLEN

‎libc-test/semver/linux-gnu.txt

+8
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,13 @@ NFT_CMP_LT
191191
NFT_CMP_LTE
192192
NFT_CMP_NEQ
193193
NFT_CONTINUE
194+
NFT_CT_AVGPKT
194195
NFT_CT_BYTES
195196
NFT_CT_DIRECTION
196197
NFT_CT_DST
198+
NFT_CT_DST_IP
199+
NFT_CT_DST_IP6
200+
NFT_CT_EVENTMASK
197201
NFT_CT_EXPIRATION
198202
NFT_CT_HELPER
199203
NFT_CT_L3PROTOCOL
@@ -205,8 +209,11 @@ NFT_CT_PROTO_DST
205209
NFT_CT_PROTO_SRC
206210
NFT_CT_SECMARK
207211
NFT_CT_SRC
212+
NFT_CT_SRC_IP
213+
NFT_CT_SRC_IP6
208214
NFT_CT_STATE
209215
NFT_CT_STATUS
216+
NFT_CT_ZONE
210217
NFT_DATA_RESERVED_MASK
211218
NFT_DATA_VALUE
212219
NFT_DATA_VALUE_MAXLEN
@@ -650,6 +657,7 @@ malloc_info
650657
malloc_trim
651658
malloc_usable_size
652659
mallopt
660+
mq_notify
653661
nl_mmap_hdr
654662
nl_mmap_req
655663
nl_pktinfo

‎libc-test/semver/unix.txt

+4
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ IF_NAMESIZE
152152
IGNBRK
153153
IGNCR
154154
IGNPAR
155+
IN6ADDR_ANY_INIT
156+
IN6ADDR_LOOPBACK_INIT
155157
INADDR_ANY
156158
INADDR_BROADCAST
157159
INADDR_LOOPBACK
@@ -586,6 +588,8 @@ hstrerror
586588
if_indextoname
587589
if_nametoindex
588590
in6_addr
591+
in6addr_any
592+
in6addr_loopback
589593
in_addr
590594
in_addr_t
591595
in_port_t

‎src/unix/align.rs

+8
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,11 @@ s! {
44
pub s6_addr: [u8; 16],
55
}
66
}
7+
8+
pub const IN6ADDR_LOOPBACK_INIT: in6_addr = in6_addr {
9+
s6_addr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1],
10+
};
11+
12+
pub const IN6ADDR_ANY_INIT: in6_addr = in6_addr {
13+
s6_addr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
14+
};

‎src/unix/hurd/mod.rs

+5
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,11 @@ s! {
450450
pub tv_nsec: __syscall_slong_t,
451451
}
452452

453+
pub struct __timeval {
454+
pub tv_sec: i32,
455+
pub tv_usec: i32,
456+
}
457+
453458
pub struct __locale_data {
454459
pub _address: u8,
455460
}

‎src/unix/linux_like/android/mod.rs

+8
Original file line numberDiff line numberDiff line change
@@ -2572,6 +2572,14 @@ pub const NFT_CT_PROTO_DST: ::c_int = 12;
25722572
pub const NFT_CT_LABELS: ::c_int = 13;
25732573
pub const NFT_CT_PKTS: ::c_int = 14;
25742574
pub const NFT_CT_BYTES: ::c_int = 15;
2575+
pub const NFT_CT_AVGPKT: ::c_int = 16;
2576+
pub const NFT_CT_ZONE: ::c_int = 17;
2577+
pub const NFT_CT_EVENTMASK: ::c_int = 18;
2578+
pub const NFT_CT_SRC_IP: ::c_int = 19;
2579+
pub const NFT_CT_DST_IP: ::c_int = 20;
2580+
pub const NFT_CT_SRC_IP6: ::c_int = 21;
2581+
pub const NFT_CT_DST_IP6: ::c_int = 22;
2582+
pub const NFT_CT_ID: ::c_int = 23;
25752583

25762584
pub const NFT_LIMIT_PKTS: ::c_int = 0;
25772585
pub const NFT_LIMIT_PKT_BYTES: ::c_int = 1;

‎src/unix/linux_like/linux/gnu/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1541,6 +1541,8 @@ extern "C" {
15411541

15421542
// Added in `glibc` 2.34
15431543
pub fn close_range(first: ::c_uint, last: ::c_uint, flags: ::c_int) -> ::c_int;
1544+
1545+
pub fn mq_notify(mqdes: ::mqd_t, sevp: *const ::sigevent) -> ::c_int;
15441546
}
15451547

15461548
cfg_if! {

‎src/unix/linux_like/linux/mod.rs

+7
Original file line numberDiff line numberDiff line change
@@ -3980,6 +3980,13 @@ pub const NFT_CT_PROTO_DST: ::c_int = 12;
39803980
pub const NFT_CT_LABELS: ::c_int = 13;
39813981
pub const NFT_CT_PKTS: ::c_int = 14;
39823982
pub const NFT_CT_BYTES: ::c_int = 15;
3983+
pub const NFT_CT_AVGPKT: ::c_int = 16;
3984+
pub const NFT_CT_ZONE: ::c_int = 17;
3985+
pub const NFT_CT_EVENTMASK: ::c_int = 18;
3986+
pub const NFT_CT_SRC_IP: ::c_int = 19;
3987+
pub const NFT_CT_DST_IP: ::c_int = 20;
3988+
pub const NFT_CT_SRC_IP6: ::c_int = 21;
3989+
pub const NFT_CT_DST_IP6: ::c_int = 22;
39833990

39843991
pub const NFT_LIMIT_PKTS: ::c_int = 0;
39853992
pub const NFT_LIMIT_PKT_BYTES: ::c_int = 1;

‎src/unix/mod.rs

+5
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,11 @@ pub const ATF_PERM: ::c_int = 0x04;
313313
pub const ATF_PUBL: ::c_int = 0x08;
314314
pub const ATF_USETRAILERS: ::c_int = 0x10;
315315

316+
extern "C" {
317+
pub static in6addr_loopback: in6_addr;
318+
pub static in6addr_any: in6_addr;
319+
}
320+
316321
cfg_if! {
317322
if #[cfg(any(target_os = "l4re", target_os = "espidf"))] {
318323
// required libraries for L4Re and the ESP-IDF framework are linked externally, ATM

‎src/unix/no_align.rs

+10
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,13 @@ s! {
44
__align: [u32; 0],
55
}
66
}
7+
8+
pub const IN6ADDR_LOOPBACK_INIT: in6_addr = in6_addr {
9+
s6_addr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1],
10+
__align: [0u32; 0],
11+
};
12+
13+
pub const IN6ADDR_ANY_INIT: in6_addr = in6_addr {
14+
s6_addr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
15+
__align: [0u32; 0],
16+
};

0 commit comments

Comments
 (0)