Skip to content

Commit 95b2286

Browse files
committed
Upgrade version to 0.17.3
1 parent 9c7e942 commit 95b2286

File tree

6 files changed

+42
-29
lines changed

6 files changed

+42
-29
lines changed

Cargo.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[workspace.package]
2-
version = "0.17.2"
2+
version = "0.17.3"
33
edition = "2021"
44

55

landscape-ebpf/src/tests/nat/v4/dynamic_nat_v3.rs

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,13 @@ fn build_ipv4_tcp_syn(src: Ipv4Addr, dst: Ipv4Addr, src_port: u16, dst_port: u16
6363
buf
6464
}
6565

66-
fn put_v3_state<T: MapCore>(map: &T, l4proto: u8, nat_addr: Ipv4Addr, nat_port: u16, state_ref: u64) {
66+
fn put_v3_state<T: MapCore>(
67+
map: &T,
68+
l4proto: u8,
69+
nat_addr: Ipv4Addr,
70+
nat_port: u16,
71+
state_ref: u64,
72+
) {
6773
let ingress_key = NatMappingKeyV4 {
6874
gress: NAT_MAPPING_INGRESS,
6975
l4proto,
@@ -74,8 +80,9 @@ fn put_v3_state<T: MapCore>(map: &T, l4proto: u8, nat_addr: Ipv4Addr, nat_port:
7480
.lookup(unsafe { plain::as_bytes(&ingress_key) }, MapFlags::ANY)
7581
.expect("lookup v3 ingress entry")
7682
.expect("missing v3 ingress entry");
77-
let mut value =
78-
unsafe { std::ptr::read_unaligned(bytes.as_ptr().cast::<types::nat_mapping_value_v4_v3>()) };
83+
let mut value = unsafe {
84+
std::ptr::read_unaligned(bytes.as_ptr().cast::<types::nat_mapping_value_v4_v3>())
85+
};
7986
value.generation = GENERATION;
8087
value.state_ref = state_ref;
8188

@@ -519,7 +526,10 @@ mod tests {
519526

520527
let result = landscape_skel.progs.nat_v4_egress.test_run(input).expect("test_run failed");
521528

522-
assert_eq!(result.return_value as i32, 2, "stale dynamic pair should drop non-initiating packet");
529+
assert_eq!(
530+
result.return_value as i32, 2,
531+
"stale dynamic pair should drop non-initiating packet"
532+
);
523533

524534
let egress_key = NatMappingKeyV4 {
525535
gress: NAT_MAPPING_EGRESS,
@@ -593,7 +603,8 @@ mod tests {
593603
panic!("expected TCP transport header in output");
594604
}
595605

596-
let ingress = read_v3_ingress_mapping(&landscape_skel.maps.nat4_dyn_map, 6, WAN_IP, NAT_PORT);
606+
let ingress =
607+
read_v3_ingress_mapping(&landscape_skel.maps.nat4_dyn_map, 6, WAN_IP, NAT_PORT);
597608
assert_eq!(ingress.generation, 1);
598609
assert_eq!(ingress.state_ref, ((1u64) << 56) | 1);
599610
}
@@ -701,7 +712,8 @@ mod tests {
701712
.expect("lookup second egress mapping");
702713
assert!(second_mapping.is_some(), "unrelated egress mapping should be preserved");
703714

704-
let ingress = read_v3_ingress_mapping(&landscape_skel.maps.nat4_dyn_map, 6, WAN_IP, NAT_PORT);
715+
let ingress =
716+
read_v3_ingress_mapping(&landscape_skel.maps.nat4_dyn_map, 6, WAN_IP, NAT_PORT);
705717
assert_eq!(Ipv4Addr::from(u32::from_be(ingress.addr)), SECOND_LAN_HOST);
706718
assert_eq!(u16::from_be(ingress.port), SECOND_LAN_PORT);
707719
}
@@ -775,13 +787,10 @@ mod tests {
775787
panic!("expected TCP transport header in output");
776788
}
777789

778-
let ingress = read_v3_ingress_mapping(&landscape_skel.maps.nat4_dyn_map, 6, WAN_IP, NAT_PORT);
790+
let ingress =
791+
read_v3_ingress_mapping(&landscape_skel.maps.nat4_dyn_map, 6, WAN_IP, NAT_PORT);
779792
assert_eq!(ingress.generation, GENERATION);
780-
assert_eq!(
781-
ingress.state_ref,
782-
((1u64) << 56) | 2,
783-
"reuse ingress should incref state_ref"
784-
);
793+
assert_eq!(ingress.state_ref, ((1u64) << 56) | 2, "reuse ingress should incref state_ref");
785794

786795
let timer_key = types::nat_timer_key_v4 {
787796
l4proto: 6,
@@ -861,7 +870,8 @@ mod tests {
861870

862871
assert_eq!(result.return_value as i32, 2, "closed mapping should reject new ingress CT");
863872

864-
let ingress = read_v3_ingress_mapping(&landscape_skel.maps.nat4_dyn_map, 6, WAN_IP, NAT_PORT);
873+
let ingress =
874+
read_v3_ingress_mapping(&landscape_skel.maps.nat4_dyn_map, 6, WAN_IP, NAT_PORT);
865875
assert_eq!(ingress.state_ref, ((2u64) << 56) | 1);
866876
}
867877

@@ -920,7 +930,8 @@ mod tests {
920930

921931
assert_eq!(result.return_value as i32, 2, "active|0 mapping should reject new ingress CT");
922932

923-
let ingress = read_v3_ingress_mapping(&landscape_skel.maps.nat4_dyn_map, 6, WAN_IP, NAT_PORT);
933+
let ingress =
934+
read_v3_ingress_mapping(&landscape_skel.maps.nat4_dyn_map, 6, WAN_IP, NAT_PORT);
924935
assert_eq!(ingress.state_ref, ((1u64) << 56) | 0);
925936

926937
let timer_key = types::nat_timer_key_v4 {
@@ -1008,7 +1019,8 @@ mod tests {
10081019
panic!("expected IPv4 header in output");
10091020
}
10101021

1011-
let ingress = read_v3_ingress_mapping(&landscape_skel.maps.nat4_dyn_map, 6, WAN_IP, NAT_PORT);
1022+
let ingress =
1023+
read_v3_ingress_mapping(&landscape_skel.maps.nat4_dyn_map, 6, WAN_IP, NAT_PORT);
10121024
assert_eq!(
10131025
ingress.state_ref,
10141026
((2u64) << 56) | 1,

landscape-ebpf/src/tests/nat/v4/dynamic_nat_v3_timer.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ fn put_mapping_pair<T: MapCore>(map: &T) {
109109

110110
fn put_state<T: MapCore>(map: &T, generation: u16, state_ref_: u64) {
111111
let key = ingress_key();
112-
let bytes = map.lookup(as_bytes(&key), MapFlags::ANY).unwrap().expect("missing ingress mapping");
112+
let bytes =
113+
map.lookup(as_bytes(&key), MapFlags::ANY).unwrap().expect("missing ingress mapping");
113114
let mut value = read_unaligned::<types::nat_mapping_value_v4_v3>(&bytes);
114115
value.generation = generation;
115116
value.state_ref = state_ref_;

landscape-types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@landscape-router/types",
3-
"version": "0.17.2",
3+
"version": "0.17.3",
44
"description": "TypeScript API client and type definitions for Landscape Router, auto-generated from OpenAPI spec.",
55
"type": "module",
66
"license": "MIT",

landscape-webui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "landscape-webui",
33
"private": true,
4-
"version": "0.17.2",
4+
"version": "0.17.3",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",

0 commit comments

Comments
 (0)