Skip to content

Commit 9c68ec2

Browse files
rcgoodfellowrcgoodfellow
committed
r#gen -> generate/generation
1 parent ccfa818 commit 9c68ec2

File tree

15 files changed

+55
-49
lines changed

15 files changed

+55
-49
lines changed

‎dpd-client/tests/integration_tests/common.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ pub fn gen_tcp_packet_loaded(
840840
IpAddr::V6(_) => vec![ipv6::IPPROTO_TCP.into(), eth::ETHER_IPV6],
841841
};
842842

843-
Packet::r#gen(src, dst, tcp_stack, Some(body)).unwrap()
843+
Packet::generate(src, dst, tcp_stack, Some(body)).unwrap()
844844
}
845845

846846
// Construct a single UDP packet with an optional payload
@@ -854,7 +854,7 @@ pub fn gen_udp_packet_loaded(
854854
IpAddr::V6(_) => vec![ipv6::IPPROTO_UDP.into(), eth::ETHER_IPV6],
855855
};
856856

857-
Packet::r#gen(src, dst, udp_stack, Some(body)).unwrap()
857+
Packet::generate(src, dst, udp_stack, Some(body)).unwrap()
858858
}
859859

860860
// Construct a single ICMP packet with an optional payload
@@ -868,7 +868,7 @@ pub fn gen_icmp_packet_loaded(
868868
IpAddr::V6(_) => vec![ipv6::IPPROTO_ICMPV6.into(), eth::ETHER_IPV6],
869869
};
870870

871-
Packet::r#gen(src, dst, icmp_stack, Some(body)).unwrap()
871+
Packet::generate(src, dst, icmp_stack, Some(body)).unwrap()
872872
}
873873

874874
// Given an ingressing IP packet, generate a corresponding IP packet egressing
@@ -995,7 +995,7 @@ pub fn gen_geneve_packet(
995995
}
996996
};
997997

998-
let mut pkt = Packet::r#gen(src, dst, udp_stack, Some(payload)).unwrap();
998+
let mut pkt = Packet::generate(src, dst, udp_stack, Some(payload)).unwrap();
999999
let geneve = pkt.hdrs.geneve_hdr.as_mut().unwrap();
10001000
geneve.vni = vni;
10011001

@@ -1396,7 +1396,7 @@ pub fn gen_ipv4_ping(
13961396
) -> Packet {
13971397
let type_code: u16 = (icmp_type as u16) << 8 | icmp_code as u16;
13981398

1399-
Packet::r#gen(
1399+
Packet::generate(
14001400
src,
14011401
tgt,
14021402
vec![type_code, ipv4::IPPROTO_ICMP as u16, eth::ETHER_IPV4],
@@ -1406,7 +1406,7 @@ pub fn gen_ipv4_ping(
14061406
}
14071407

14081408
pub fn gen_arp_reply(src: Endpoint, tgt: Endpoint) -> Packet {
1409-
Packet::r#gen(src, tgt, vec![arp::ARPOP_REPLY, eth::ETHER_ARP], None)
1409+
Packet::generate(src, tgt, vec![arp::ARPOP_REPLY, eth::ETHER_ARP], None)
14101410
.unwrap()
14111411
}
14121412

‎dpd-client/tests/integration_tests/service.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,8 @@ async fn execute_test_service_lldp(nat_only: bool) -> TestResult {
379379
// contains a single data-bearing TLV, while a real LLDP header has at
380380
// least 3 TLVs.
381381
let send_pkt =
382-
packet::Packet::r#gen(src, tgt, vec![eth::ETHER_LLDP], None).unwrap();
382+
packet::Packet::generate(src, tgt, vec![eth::ETHER_LLDP], None)
383+
.unwrap();
383384
let mut recv_pkt = send_pkt.clone();
384385

385386
let send = TestPacket {

‎dpd/src/nat.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,11 +568,11 @@ pub fn reset_ipv4(switch: &Switch) -> DpdResult<()> {
568568
}
569569
}
570570

571-
pub fn set_ipv4_nat_generation(switch: &Switch, r#gen: i64) {
571+
pub fn set_ipv4_nat_generation(switch: &Switch, generation: i64) {
572572
let mut nat = switch.nat.lock().unwrap();
573573

574574
debug!(switch.log, "setting nat generation");
575-
nat.ipv4_generation = r#gen;
575+
nat.ipv4_generation = generation;
576576
}
577577

578578
pub fn get_ipv4_nat_generation(switch: &Switch) -> i64 {

‎dpd/src/rpw/mod.rs‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -110,21 +110,26 @@ pub async fn ipv4_nat_workflow(
110110
wait(timer.clone()).await;
111111
debug!(log, "starting ipv4 nat reconciliation");
112112

113-
let r#gen = nat::get_ipv4_nat_generation(&switch);
114-
debug!(log, "we are currently at ipv4 nat generation: {}", r#gen);
113+
let generation = nat::get_ipv4_nat_generation(&switch);
114+
debug!(
115+
log,
116+
"we are currently at ipv4 nat generation: {}", generation
117+
);
115118

116-
let mut updates = match fetch_nat_updates(&client, r#gen, &log).await {
117-
Some(value) => value,
118-
None => {
119-
update_timer(timer.clone(), IPV4_NAT_INTERVAL);
120-
continue;
121-
}
122-
};
119+
let mut updates =
120+
match fetch_nat_updates(&client, generation, &log).await {
121+
Some(value) => value,
122+
None => {
123+
update_timer(timer.clone(), IPV4_NAT_INTERVAL);
124+
continue;
125+
}
126+
};
123127

124128
debug!(log, "request successful"; "response" => ?updates);
125129
while !updates.is_empty() {
126130
debug!(log, "applying updates");
127-
let new_gen = apply_updates(&switch, r#gen, updates.into_inner());
131+
let new_gen =
132+
apply_updates(&switch, generation, updates.into_inner());
128133

129134
updates = match fetch_nat_updates(&client, new_gen, &log).await {
130135
Some(value) => value,
@@ -139,11 +144,11 @@ pub async fn ipv4_nat_workflow(
139144

140145
async fn fetch_nat_updates(
141146
client: &NexusClient,
142-
r#gen: i64,
147+
generation: i64,
143148
log: &Logger,
144149
) -> Option<nexus_client::ResponseValue<Vec<NatEntryView>>> {
145150
debug!(log, "checking Nexus for updates");
146-
let updates = match client.ipv4_nat_changeset(r#gen, 100).await {
151+
let updates = match client.ipv4_nat_changeset(generation, 100).await {
147152
Ok(response) => response,
148153
Err(e) => {
149154
error!(log, "unable to retrieve nat updates"; "error" => ?e);
@@ -157,7 +162,7 @@ async fn fetch_nat_updates(
157162
/// applied change.
158163
fn apply_updates(
159164
switch: &Switch,
160-
mut r#gen: i64,
165+
mut generation: i64,
161166
updates: Vec<NatEntryView>,
162167
) -> i64 {
163168
for entry in &updates {
@@ -223,10 +228,10 @@ fn apply_updates(
223228
}
224229
}
225230
// update gen if nat entry update was successful
226-
r#gen = entry.r#gen;
227-
nat::set_ipv4_nat_generation(switch, r#gen);
231+
generation = entry.r#gen;
232+
nat::set_ipv4_nat_generation(switch, generation);
228233
}
229-
r#gen
234+
generation
230235
}
231236

232237
async fn wait(timer: Arc<RwLock<Instant>>) {

‎packet/src/arp.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ impl Protocol for ArpHdr {
8888
Ok(hdrs)
8989
}
9090

91-
fn r#gen(
91+
fn generate(
9292
src: Endpoint,
9393
dst: Endpoint,
9494
mut protos: Vec<u16>,

‎packet/src/eth.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ impl Protocol for EthHdr {
114114
Ok(hdrs)
115115
}
116116

117-
fn r#gen(
117+
fn generate(
118118
src: Endpoint,
119119
dst: Endpoint,
120120
mut protos: Vec<u16>,
@@ -123,10 +123,10 @@ impl Protocol for EthHdr {
123123
let eth_type = protos.pop().unwrap_or_default();
124124

125125
let mut pkt = match eth_type {
126-
ETHER_LLDP => LldpHdr::r#gen(src, dst, protos, body)?,
127-
ETHER_ARP => ArpHdr::r#gen(src, dst, protos, body)?,
128-
ETHER_IPV4 => Ipv4Hdr::r#gen(src, dst, protos, body)?,
129-
ETHER_IPV6 => Ipv6Hdr::r#gen(src, dst, protos, body)?,
126+
ETHER_LLDP => LldpHdr::generate(src, dst, protos, body)?,
127+
ETHER_ARP => ArpHdr::generate(src, dst, protos, body)?,
128+
ETHER_IPV4 => Ipv4Hdr::generate(src, dst, protos, body)?,
129+
ETHER_IPV6 => Ipv6Hdr::generate(src, dst, protos, body)?,
130130
_ => {
131131
println!(
132132
"unsupported ethertype: {}",

‎packet/src/geneve.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl Protocol for GeneveHdr {
7676
Ok(hdrs)
7777
}
7878

79-
fn r#gen(
79+
fn generate(
8080
_src: Endpoint,
8181
_dst: Endpoint,
8282
mut protos: Vec<u16>,

‎packet/src/icmp.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ impl Protocol for IcmpHdr {
123123
Ok(v)
124124
}
125125

126-
fn r#gen(
126+
fn generate(
127127
_src: Endpoint,
128128
dst: Endpoint,
129129
mut protos: Vec<u16>,

‎packet/src/ipv4.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ impl Protocol for Ipv4Hdr {
169169
Ok(hdrs)
170170
}
171171

172-
fn r#gen(
172+
fn generate(
173173
src: Endpoint,
174174
dst: Endpoint,
175175
mut protos: Vec<u16>,
@@ -178,9 +178,9 @@ impl Protocol for Ipv4Hdr {
178178
let proto = protos.pop().unwrap_or_default() as u8;
179179

180180
let mut pkt = match proto {
181-
IPPROTO_ICMP => icmp::IcmpHdr::r#gen(src, dst, protos, body)?,
182-
IPPROTO_TCP => tcp::TcpHdr::r#gen(src, dst, protos, body)?,
183-
IPPROTO_UDP => udp::UdpHdr::r#gen(src, dst, protos, body)?,
181+
IPPROTO_ICMP => icmp::IcmpHdr::generate(src, dst, protos, body)?,
182+
IPPROTO_TCP => tcp::TcpHdr::generate(src, dst, protos, body)?,
183+
IPPROTO_UDP => udp::UdpHdr::generate(src, dst, protos, body)?,
184184
_ => {
185185
println!("unsupported ip protocol: {proto}");
186186
Packet::new(body)

‎packet/src/ipv6.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ impl Protocol for Ipv6Hdr {
107107
Ok(hdrs)
108108
}
109109

110-
fn r#gen(
110+
fn generate(
111111
src: Endpoint,
112112
dst: Endpoint,
113113
mut protos: Vec<u16>,
@@ -122,9 +122,9 @@ impl Protocol for Ipv6Hdr {
122122
})?;
123123

124124
let mut pkt = match proto {
125-
IPPROTO_ICMPV6 => icmp::IcmpHdr::r#gen(src, dst, protos, body)?,
126-
IPPROTO_TCP => tcp::TcpHdr::r#gen(src, dst, protos, body)?,
127-
IPPROTO_UDP => udp::UdpHdr::r#gen(src, dst, protos, body)?,
125+
IPPROTO_ICMPV6 => icmp::IcmpHdr::generate(src, dst, protos, body)?,
126+
IPPROTO_TCP => tcp::TcpHdr::generate(src, dst, protos, body)?,
127+
IPPROTO_UDP => udp::UdpHdr::generate(src, dst, protos, body)?,
128128
_ => Packet::new(body),
129129
};
130130

0 commit comments

Comments
 (0)