Skip to content

Commit d478ea2

Browse files
drunkirishcoderdrunkirishcoder
committed
remove ip4 and ip6 alias
1 parent bfeb7a9 commit d478ea2

36 files changed

+255
-263
lines changed

‎bench/packets.rs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
use anyhow::Result;
2020
use capsule::fieldmap;
2121
use capsule::packets::ethernet::Ethernet;
22-
use capsule::packets::ip::v4::Ip4;
23-
use capsule::packets::ip::v6::{Ip6, SegmentRouting};
22+
use capsule::packets::ip::v4::Ipv4;
23+
use capsule::packets::ip::v6::{Ipv6, SegmentRouting};
2424
use capsule::packets::udp::Udp4;
2525
use capsule::packets::{Mbuf, Packet};
2626
use capsule::testils::criterion::BencherExt;
@@ -32,11 +32,11 @@ use std::net::Ipv6Addr;
3232

3333
const BATCH_SIZE: usize = 500;
3434

35-
fn single_parse_udp(ip4: Ip4) -> Udp4 {
35+
fn single_parse_udp(ip4: Ipv4) -> Udp4 {
3636
ip4.parse::<Udp4>().unwrap()
3737
}
3838

39-
fn single_peek_udp(ip4: Ip4) -> Ip4 {
39+
fn single_peek_udp(ip4: Ipv4) -> Ipv4 {
4040
ip4.peek::<Udp4>().unwrap();
4141
ip4
4242
}
@@ -66,13 +66,13 @@ fn single_peek_vs_parse(c: &mut Criterion) {
6666

6767
fn multi_parse_udp(mbuf: Mbuf) -> Udp4 {
6868
let ethernet = mbuf.parse::<Ethernet>().unwrap();
69-
let ip4 = ethernet.parse::<Ip4>().unwrap();
69+
let ip4 = ethernet.parse::<Ipv4>().unwrap();
7070
ip4.parse::<Udp4>().unwrap()
7171
}
7272

7373
fn multi_peek_udp(mbuf: Mbuf) -> Mbuf {
7474
let ethernet = mbuf.peek::<Ethernet>().unwrap();
75-
let ip4 = ethernet.peek::<Ip4>().unwrap();
75+
let ip4 = ethernet.peek::<Ipv4>().unwrap();
7676
ip4.peek::<Udp4>().unwrap();
7777
mbuf
7878
}
@@ -94,8 +94,8 @@ fn multi_peek_vs_parse(c: &mut Criterion) {
9494
group.finish()
9595
}
9696

97-
fn single_parse_sr(ip6: Ip6) -> SegmentRouting<Ip6> {
98-
ip6.parse::<SegmentRouting<Ip6>>().unwrap()
97+
fn single_parse_sr(ip6: Ipv6) -> SegmentRouting<Ipv6> {
98+
ip6.parse::<SegmentRouting<Ipv6>>().unwrap()
9999
}
100100

101101
#[capsule::bench(mempool_capacity = 511)]
@@ -135,10 +135,10 @@ fn single_parse_sr_segments_sizes(c: &mut Criterion) {
135135
group.finish()
136136
}
137137

138-
fn multi_parse_sr(mbuf: Mbuf) -> SegmentRouting<Ip6> {
138+
fn multi_parse_sr(mbuf: Mbuf) -> SegmentRouting<Ipv6> {
139139
let ethernet = mbuf.parse::<Ethernet>().unwrap();
140-
let ip6 = ethernet.parse::<Ip6>().unwrap();
141-
ip6.parse::<SegmentRouting<Ip6>>().unwrap()
140+
let ip6 = ethernet.parse::<Ipv6>().unwrap();
141+
ip6.parse::<SegmentRouting<Ipv6>>().unwrap()
142142
}
143143

144144
#[capsule::bench(mempool_capacity = 511)]
@@ -177,7 +177,7 @@ fn reset(c: &mut Criterion) {
177177

178178
fn multi_push_udp(mbuf: Mbuf) -> Udp4 {
179179
let ethernet = mbuf.push::<Ethernet>().unwrap();
180-
let ip4 = ethernet.push::<Ip4>().unwrap();
180+
let ip4 = ethernet.push::<Ipv4>().unwrap();
181181
ip4.push::<Udp4>().unwrap()
182182
}
183183

@@ -189,7 +189,7 @@ fn multi_push(c: &mut Criterion) {
189189
});
190190
}
191191

192-
fn single_push_udp(ip4: Ip4) -> Udp4 {
192+
fn single_push_udp(ip4: Ipv4) -> Udp4 {
193193
ip4.push::<Udp4>().unwrap()
194194
}
195195

@@ -204,7 +204,7 @@ fn single_push(c: &mut Criterion) {
204204
});
205205
}
206206

207-
fn single_remove_udp(udp: Udp4) -> Ip4 {
207+
fn single_remove_udp(udp: Udp4) -> Ipv4 {
208208
udp.remove().unwrap()
209209
}
210210

@@ -230,7 +230,7 @@ fn multi_remove(c: &mut Criterion) {
230230
});
231231
}
232232

233-
fn set_sr_segments(mut args: (SegmentRouting<Ip6>, Vec<Ipv6Addr>)) -> Result<()> {
233+
fn set_sr_segments(mut args: (SegmentRouting<Ipv6>, Vec<Ipv6Addr>)) -> Result<()> {
234234
args.0.set_segments(&args.1)
235235
}
236236

‎core/src/packets/icmp/v4/echo_reply.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ struct EchoReplyBody {
222222
mod tests {
223223
use super::*;
224224
use crate::packets::ethernet::Ethernet;
225-
use crate::packets::ip::v4::Ip4;
225+
use crate::packets::ip::v4::Ipv4;
226226
use crate::packets::Mbuf;
227227

228228
#[test]
@@ -234,8 +234,8 @@ mod tests {
234234
fn push_and_set_echo_reply() {
235235
let packet = Mbuf::new().unwrap();
236236
let ethernet = packet.push::<Ethernet>().unwrap();
237-
let ip4 = ethernet.push::<Ip4>().unwrap();
238-
let mut echo = ip4.push::<EchoReply<Ip4>>().unwrap();
237+
let ip4 = ethernet.push::<Ipv4>().unwrap();
238+
let mut echo = ip4.push::<EchoReply<Ipv4>>().unwrap();
239239

240240
assert_eq!(4, echo.header_len());
241241
assert_eq!(EchoReplyBody::size_of(), echo.payload_len());

‎core/src/packets/icmp/v4/echo_request.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ struct EchoRequestBody {
223223
mod tests {
224224
use super::*;
225225
use crate::packets::ethernet::Ethernet;
226-
use crate::packets::ip::v4::Ip4;
226+
use crate::packets::ip::v4::Ipv4;
227227
use crate::packets::Mbuf;
228228

229229
#[test]
@@ -235,8 +235,8 @@ mod tests {
235235
fn push_and_set_echo_request() {
236236
let packet = Mbuf::new().unwrap();
237237
let ethernet = packet.push::<Ethernet>().unwrap();
238-
let ip4 = ethernet.push::<Ip4>().unwrap();
239-
let mut echo = ip4.push::<EchoRequest<Ip4>>().unwrap();
238+
let ip4 = ethernet.push::<Ipv4>().unwrap();
239+
let mut echo = ip4.push::<EchoRequest<Ipv4>>().unwrap();
240240

241241
assert_eq!(4, echo.header_len());
242242
assert_eq!(EchoRequestBody::size_of(), echo.payload_len());

‎core/src/packets/icmp/v4/mod.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ pub trait Icmpv4Packet {
449449
mod tests {
450450
use super::*;
451451
use crate::packets::ethernet::Ethernet;
452-
use crate::packets::ip::v4::Ip4;
452+
use crate::packets::ip::v4::Ipv4;
453453
use crate::packets::Mbuf;
454454
use crate::testils::byte_arrays::{ICMPV4_PACKET, IPV4_UDP_PACKET};
455455

@@ -462,16 +462,16 @@ mod tests {
462462
fn parse_icmpv4_packet() {
463463
let packet = Mbuf::from_bytes(&ICMPV4_PACKET).unwrap();
464464
let ethernet = packet.parse::<Ethernet>().unwrap();
465-
let ip4 = ethernet.parse::<Ip4>().unwrap();
466-
let icmp4 = ip4.parse::<Icmpv4<Ip4>>().unwrap();
465+
let ip4 = ethernet.parse::<Ipv4>().unwrap();
466+
let icmp4 = ip4.parse::<Icmpv4<Ipv4>>().unwrap();
467467

468468
// parses the generic header
469469
assert_eq!(Icmpv4Types::EchoRequest, icmp4.msg_type());
470470
assert_eq!(0, icmp4.code());
471471
assert_eq!(0x2a5c, icmp4.checksum());
472472

473473
// downcasts to specific message
474-
let echo = icmp4.downcast::<EchoRequest<Ip4>>().unwrap();
474+
let echo = icmp4.downcast::<EchoRequest<Ipv4>>().unwrap();
475475
assert_eq!(Icmpv4Types::EchoRequest, echo.msg_type());
476476
assert_eq!(0, echo.code());
477477
assert_eq!(0x2a5c, echo.checksum());
@@ -480,34 +480,34 @@ mod tests {
480480

481481
// also can one-step parse
482482
let ip4 = echo.deparse();
483-
assert!(ip4.parse::<EchoRequest<Ip4>>().is_ok());
483+
assert!(ip4.parse::<EchoRequest<Ipv4>>().is_ok());
484484
}
485485

486486
#[capsule::test]
487487
fn parse_wrong_icmpv4_type() {
488488
let packet = Mbuf::from_bytes(&ICMPV4_PACKET).unwrap();
489489
let ethernet = packet.parse::<Ethernet>().unwrap();
490-
let ip4 = ethernet.parse::<Ip4>().unwrap();
491-
let icmp4 = ip4.parse::<Icmpv4<Ip4>>().unwrap();
490+
let ip4 = ethernet.parse::<Ipv4>().unwrap();
491+
let icmp4 = ip4.parse::<Icmpv4<Ipv4>>().unwrap();
492492

493-
assert!(icmp4.downcast::<EchoReply<Ip4>>().is_err());
493+
assert!(icmp4.downcast::<EchoReply<Ipv4>>().is_err());
494494
}
495495

496496
#[capsule::test]
497497
fn parse_non_icmpv4_packet() {
498498
let packet = Mbuf::from_bytes(&IPV4_UDP_PACKET).unwrap();
499499
let ethernet = packet.parse::<Ethernet>().unwrap();
500-
let ip4 = ethernet.parse::<Ip4>().unwrap();
500+
let ip4 = ethernet.parse::<Ipv4>().unwrap();
501501

502-
assert!(ip4.parse::<Icmpv4<Ip4>>().is_err());
502+
assert!(ip4.parse::<Icmpv4<Ipv4>>().is_err());
503503
}
504504

505505
#[capsule::test]
506506
fn compute_checksum() {
507507
let packet = Mbuf::from_bytes(&ICMPV4_PACKET).unwrap();
508508
let ethernet = packet.parse::<Ethernet>().unwrap();
509-
let ip4 = ethernet.parse::<Ip4>().unwrap();
510-
let mut icmp4 = ip4.parse::<Icmpv4<Ip4>>().unwrap();
509+
let ip4 = ethernet.parse::<Ipv4>().unwrap();
510+
let mut icmp4 = ip4.parse::<Icmpv4<Ipv4>>().unwrap();
511511

512512
let expected = icmp4.checksum();
513513
// no payload change but force a checksum recompute anyway
@@ -519,8 +519,8 @@ mod tests {
519519
fn push_icmpv4_header_without_body() {
520520
let packet = Mbuf::new().unwrap();
521521
let ethernet = packet.push::<Ethernet>().unwrap();
522-
let ip4 = ethernet.push::<Ip4>().unwrap();
522+
let ip4 = ethernet.push::<Ipv4>().unwrap();
523523

524-
assert!(ip4.push::<Icmpv4<Ip4>>().is_err());
524+
assert!(ip4.push::<Icmpv4<Ipv4>>().is_err());
525525
}
526526
}

‎core/src/packets/icmp/v4/redirect.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ impl Default for RedirectBody {
219219
mod tests {
220220
use super::*;
221221
use crate::packets::ethernet::Ethernet;
222-
use crate::packets::ip::v4::Ip4;
222+
use crate::packets::ip::v4::Ipv4;
223223
use crate::packets::Mbuf;
224224
use crate::testils::byte_arrays::IPV4_TCP_PACKET;
225225

@@ -232,10 +232,10 @@ mod tests {
232232
fn push_and_set_redirect() {
233233
let packet = Mbuf::from_bytes(&IPV4_TCP_PACKET).unwrap();
234234
let ethernet = packet.parse::<Ethernet>().unwrap();
235-
let ip4 = ethernet.parse::<Ip4>().unwrap();
235+
let ip4 = ethernet.parse::<Ipv4>().unwrap();
236236
let tcp_len = ip4.payload_len();
237237

238-
let mut redirect = ip4.push::<Redirect<Ip4>>().unwrap();
238+
let mut redirect = ip4.push::<Redirect<Ipv4>>().unwrap();
239239

240240
assert_eq!(4, redirect.header_len());
241241
assert_eq!(RedirectBody::size_of() + tcp_len, redirect.payload_len());
@@ -259,8 +259,8 @@ mod tests {
259259
// starts with buffer larger than min MTU of 68 bytes.
260260
let packet = Mbuf::from_bytes(&[42; 100]).unwrap();
261261
let ethernet = packet.push::<Ethernet>().unwrap();
262-
let ip4 = ethernet.push::<Ip4>().unwrap();
263-
let mut redirect = ip4.push::<Redirect<Ip4>>().unwrap();
262+
let ip4 = ethernet.push::<Ipv4>().unwrap();
263+
let mut redirect = ip4.push::<Redirect<Ipv4>>().unwrap();
264264
assert!(redirect.data_len() > IPV4_MIN_MTU);
265265

266266
redirect.reconcile_all();
@@ -272,8 +272,8 @@ mod tests {
272272
// starts with buffer smaller than min MTU of 68 bytes.
273273
let packet = Mbuf::from_bytes(&[42; 50]).unwrap();
274274
let ethernet = packet.push::<Ethernet>().unwrap();
275-
let ip4 = ethernet.push::<Ip4>().unwrap();
276-
let mut redirect = ip4.push::<Redirect<Ip4>>().unwrap();
275+
let ip4 = ethernet.push::<Ipv4>().unwrap();
276+
let mut redirect = ip4.push::<Redirect<Ipv4>>().unwrap();
277277
assert!(redirect.data_len() < IPV4_MIN_MTU);
278278

279279
redirect.reconcile_all();

‎core/src/packets/icmp/v4/time_exceeded.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ struct TimeExceededBody {
183183
mod tests {
184184
use super::*;
185185
use crate::packets::ethernet::Ethernet;
186-
use crate::packets::ip::v4::Ip4;
186+
use crate::packets::ip::v4::Ipv4;
187187
use crate::packets::Mbuf;
188188
use crate::testils::byte_arrays::IPV4_TCP_PACKET;
189189

@@ -196,10 +196,10 @@ mod tests {
196196
fn push_and_set_time_exceeded() {
197197
let packet = Mbuf::from_bytes(&IPV4_TCP_PACKET).unwrap();
198198
let ethernet = packet.parse::<Ethernet>().unwrap();
199-
let ip4 = ethernet.parse::<Ip4>().unwrap();
199+
let ip4 = ethernet.parse::<Ipv4>().unwrap();
200200
let tcp_len = ip4.payload_len();
201201

202-
let mut exceeded = ip4.push::<TimeExceeded<Ip4>>().unwrap();
202+
let mut exceeded = ip4.push::<TimeExceeded<Ipv4>>().unwrap();
203203

204204
assert_eq!(4, exceeded.header_len());
205205
assert_eq!(
@@ -222,8 +222,8 @@ mod tests {
222222
// starts with a buffer with a message body larger than min MTU.
223223
let packet = Mbuf::from_bytes(&[42; 100]).unwrap();
224224
let ethernet = packet.push::<Ethernet>().unwrap();
225-
let ip4 = ethernet.push::<Ip4>().unwrap();
226-
let mut exceeded = ip4.push::<TimeExceeded<Ip4>>().unwrap();
225+
let ip4 = ethernet.push::<Ipv4>().unwrap();
226+
let mut exceeded = ip4.push::<TimeExceeded<Ipv4>>().unwrap();
227227
assert!(exceeded.data_len() > IPV4_MIN_MTU);
228228

229229
exceeded.reconcile_all();
@@ -235,8 +235,8 @@ mod tests {
235235
// starts with a buffer with a message body smaller than min MTU.
236236
let packet = Mbuf::from_bytes(&[42; 50]).unwrap();
237237
let ethernet = packet.push::<Ethernet>().unwrap();
238-
let ip4 = ethernet.push::<Ip4>().unwrap();
239-
let mut exceeded = ip4.push::<TimeExceeded<Ip4>>().unwrap();
238+
let ip4 = ethernet.push::<Ipv4>().unwrap();
239+
let mut exceeded = ip4.push::<TimeExceeded<Ipv4>>().unwrap();
240240
assert!(exceeded.data_len() < IPV4_MIN_MTU);
241241

242242
exceeded.reconcile_all();

‎core/src/packets/icmp/v6/echo_reply.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ struct EchoReplyBody {
218218
mod tests {
219219
use super::*;
220220
use crate::packets::ethernet::Ethernet;
221-
use crate::packets::ip::v6::Ip6;
221+
use crate::packets::ip::v6::Ipv6;
222222
use crate::packets::Mbuf;
223223

224224
#[test]
@@ -230,8 +230,8 @@ mod tests {
230230
fn push_and_set_echo_reply() {
231231
let packet = Mbuf::new().unwrap();
232232
let ethernet = packet.push::<Ethernet>().unwrap();
233-
let ip6 = ethernet.push::<Ip6>().unwrap();
234-
let mut echo = ip6.push::<EchoReply<Ip6>>().unwrap();
233+
let ip6 = ethernet.push::<Ipv6>().unwrap();
234+
let mut echo = ip6.push::<EchoReply<Ipv6>>().unwrap();
235235

236236
assert_eq!(4, echo.header_len());
237237
assert_eq!(EchoReplyBody::size_of(), echo.payload_len());

‎core/src/packets/icmp/v6/echo_request.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ struct EchoRequestBody {
219219
mod tests {
220220
use super::*;
221221
use crate::packets::ethernet::Ethernet;
222-
use crate::packets::ip::v6::Ip6;
222+
use crate::packets::ip::v6::Ipv6;
223223
use crate::packets::Mbuf;
224224

225225
#[test]
@@ -231,8 +231,8 @@ mod tests {
231231
fn push_and_set_echo_request() {
232232
let packet = Mbuf::new().unwrap();
233233
let ethernet = packet.push::<Ethernet>().unwrap();
234-
let ip6 = ethernet.push::<Ip6>().unwrap();
235-
let mut echo = ip6.push::<EchoRequest<Ip6>>().unwrap();
234+
let ip6 = ethernet.push::<Ipv6>().unwrap();
235+
let mut echo = ip6.push::<EchoRequest<Ipv6>>().unwrap();
236236

237237
assert_eq!(4, echo.header_len());
238238
assert_eq!(EchoRequestBody::size_of(), echo.payload_len());

0 commit comments

Comments
 (0)