Skip to content

Commit 359cc37

Browse files
committed
fix tests
1 parent 938a370 commit 359cc37

2 files changed

Lines changed: 30 additions & 30 deletions

File tree

src/fields/net_header.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ mod tests {
5555
let headers = PacketHeaders::from_ethernet_slice(&TCP_PACKET).unwrap();
5656
let net_header = headers.net;
5757
assert_eq!(
58-
get_source(&net_header),
58+
get_source(net_header.as_ref()),
5959
Some(IpAddr::from_str("192.168.200.135").unwrap())
6060
);
6161
}
@@ -65,7 +65,7 @@ mod tests {
6565
let headers = PacketHeaders::from_ethernet_slice(&ICMP_PACKET).unwrap();
6666
let net_header = headers.net;
6767
assert_eq!(
68-
get_source(&net_header),
68+
get_source(net_header.as_ref()),
6969
Some(IpAddr::from_str("2.1.1.2").unwrap())
7070
);
7171
}
@@ -74,15 +74,15 @@ mod tests {
7474
fn test_get_source_arp_packet() {
7575
let headers = PacketHeaders::from_ethernet_slice(&ARP_PACKET).unwrap();
7676
let net_header = headers.net;
77-
assert_eq!(get_source(&net_header), None);
77+
assert_eq!(get_source(net_header.as_ref()), None);
7878
}
7979

8080
#[test]
8181
fn test_get_source_udp_ipv6_packet() {
8282
let headers = PacketHeaders::from_ethernet_slice(&UDP_IPV6_PACKET).unwrap();
8383
let net_header = headers.net;
8484
assert_eq!(
85-
get_source(&net_header),
85+
get_source(net_header.as_ref()),
8686
Some(IpAddr::from_str("3ffe:501:4819::42").unwrap())
8787
);
8888
}
@@ -92,7 +92,7 @@ mod tests {
9292
let headers = PacketHeaders::from_ethernet_slice(&ICMPV6_PACKET).unwrap();
9393
let net_header = headers.net;
9494
assert_eq!(
95-
get_source(&net_header),
95+
get_source(net_header.as_ref()),
9696
Some(IpAddr::from_str("3ffe:501:4819::42").unwrap())
9797
);
9898
}
@@ -102,7 +102,7 @@ mod tests {
102102
let headers = PacketHeaders::from_ethernet_slice(&TCP_PACKET).unwrap();
103103
let net_header = headers.net;
104104
assert_eq!(
105-
get_dest(&net_header),
105+
get_dest(net_header.as_ref()),
106106
Some(IpAddr::from_str("192.168.200.21").unwrap())
107107
);
108108
}
@@ -112,7 +112,7 @@ mod tests {
112112
let headers = PacketHeaders::from_ethernet_slice(&ICMP_PACKET).unwrap();
113113
let net_header = headers.net;
114114
assert_eq!(
115-
get_dest(&net_header),
115+
get_dest(net_header.as_ref()),
116116
Some(IpAddr::from_str("2.1.1.1").unwrap())
117117
);
118118
}
@@ -121,15 +121,15 @@ mod tests {
121121
fn test_get_dest_arp_packet() {
122122
let headers = PacketHeaders::from_ethernet_slice(&ARP_PACKET).unwrap();
123123
let net_header = headers.net;
124-
assert_eq!(get_dest(&net_header), None);
124+
assert_eq!(get_dest(net_header.as_ref()), None);
125125
}
126126

127127
#[test]
128128
fn test_get_dest_udp_ipv6_packet() {
129129
let headers = PacketHeaders::from_ethernet_slice(&UDP_IPV6_PACKET).unwrap();
130130
let net_header = headers.net;
131131
assert_eq!(
132-
get_dest(&net_header),
132+
get_dest(net_header.as_ref()),
133133
Some(IpAddr::from_str("3ffe:507:0:1:200:86ff:fe05:8da").unwrap())
134134
);
135135
}
@@ -139,7 +139,7 @@ mod tests {
139139
let headers = PacketHeaders::from_ethernet_slice(&ICMPV6_PACKET).unwrap();
140140
let net_header = headers.net;
141141
assert_eq!(
142-
get_dest(&net_header),
142+
get_dest(net_header.as_ref()),
143143
Some(IpAddr::from_str("3ffe:507:0:1:200:86ff:fe05:8da").unwrap())
144144
);
145145
}
@@ -148,34 +148,34 @@ mod tests {
148148
fn test_get_proto_tcp_packet() {
149149
let headers = PacketHeaders::from_ethernet_slice(&TCP_PACKET).unwrap();
150150
let net_header = headers.net;
151-
assert_eq!(get_proto(&net_header), Some(6)); // tcp
151+
assert_eq!(get_proto(net_header.as_ref()), Some(6)); // tcp
152152
}
153153

154154
#[test]
155155
fn test_get_proto_icmp_packet() {
156156
let headers = PacketHeaders::from_ethernet_slice(&ICMP_PACKET).unwrap();
157157
let net_header = headers.net;
158-
assert_eq!(get_proto(&net_header), Some(1)); // icmp
158+
assert_eq!(get_proto(net_header.as_ref()), Some(1)); // icmp
159159
}
160160

161161
#[test]
162162
fn test_get_proto_arp_packet() {
163163
let headers = PacketHeaders::from_ethernet_slice(&ARP_PACKET).unwrap();
164164
let net_header = headers.net;
165-
assert_eq!(get_proto(&net_header), None);
165+
assert_eq!(get_proto(net_header.as_ref()), None);
166166
}
167167

168168
#[test]
169169
fn test_get_proto_udp_ipv6_packet() {
170170
let headers = PacketHeaders::from_ethernet_slice(&UDP_IPV6_PACKET).unwrap();
171171
let net_header = headers.net;
172-
assert_eq!(get_proto(&net_header), Some(17)); // udp
172+
assert_eq!(get_proto(net_header.as_ref()), Some(17)); // udp
173173
}
174174

175175
#[test]
176176
fn test_get_proto_icmpv6_packet() {
177177
let headers = PacketHeaders::from_ethernet_slice(&ICMPV6_PACKET).unwrap();
178178
let net_header = headers.net;
179-
assert_eq!(get_proto(&net_header), Some(58)); // icmpv6
179+
assert_eq!(get_proto(net_header.as_ref()), Some(58)); // icmpv6
180180
}
181181
}

src/fields/transport_header.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,104 +49,104 @@ mod tests {
4949
fn test_get_sport_tcp_packet() {
5050
let headers = PacketHeaders::from_ethernet_slice(&TCP_PACKET).unwrap();
5151
let transport_header = headers.transport;
52-
assert_eq!(get_sport(&transport_header), Some(6711));
52+
assert_eq!(get_sport(transport_header.as_ref()), Some(6711));
5353
}
5454

5555
#[test]
5656
fn test_get_sport_icmp_packet() {
5757
let headers = PacketHeaders::from_ethernet_slice(&ICMP_PACKET).unwrap();
5858
let transport_header = headers.transport;
59-
assert_eq!(get_sport(&transport_header), None);
59+
assert_eq!(get_sport(transport_header.as_ref()), None);
6060
}
6161

6262
#[test]
6363
fn test_get_sport_arp_packet() {
6464
let headers = PacketHeaders::from_ethernet_slice(&ARP_PACKET).unwrap();
6565
let transport_header = headers.transport;
66-
assert_eq!(get_sport(&transport_header), None);
66+
assert_eq!(get_sport(transport_header.as_ref()), None);
6767
}
6868

6969
#[test]
7070
fn test_get_sport_udp_ipv6_packet() {
7171
let headers = PacketHeaders::from_ethernet_slice(&UDP_IPV6_PACKET).unwrap();
7272
let transport_header = headers.transport;
73-
assert_eq!(get_sport(&transport_header), Some(53));
73+
assert_eq!(get_sport(transport_header.as_ref()), Some(53));
7474
}
7575

7676
#[test]
7777
fn test_get_sport_icmpv6_packet() {
7878
let headers = PacketHeaders::from_ethernet_slice(&ICMPV6_PACKET).unwrap();
7979
let transport_header = headers.transport;
80-
assert_eq!(get_sport(&transport_header), None);
80+
assert_eq!(get_sport(transport_header.as_ref()), None);
8181
}
8282

8383
#[test]
8484
fn test_get_dport_tcp_packet() {
8585
let headers = PacketHeaders::from_ethernet_slice(&TCP_PACKET).unwrap();
8686
let transport_header = headers.transport;
87-
assert_eq!(get_dport(&transport_header), Some(2000));
87+
assert_eq!(get_dport(transport_header.as_ref()), Some(2000));
8888
}
8989

9090
#[test]
9191
fn test_get_dport_icmp_packet() {
9292
let headers = PacketHeaders::from_ethernet_slice(&ICMP_PACKET).unwrap();
9393
let transport_header = headers.transport;
94-
assert_eq!(get_dport(&transport_header), None);
94+
assert_eq!(get_dport(transport_header.as_ref()), None);
9595
}
9696

9797
#[test]
9898
fn test_get_dport_arp_packet() {
9999
let headers = PacketHeaders::from_ethernet_slice(&ARP_PACKET).unwrap();
100100
let transport_header = headers.transport;
101-
assert_eq!(get_dport(&transport_header), None);
101+
assert_eq!(get_dport(transport_header.as_ref()), None);
102102
}
103103

104104
#[test]
105105
fn test_get_dport_udp_ipv6_packet() {
106106
let headers = PacketHeaders::from_ethernet_slice(&UDP_IPV6_PACKET).unwrap();
107107
let transport_header = headers.transport;
108-
assert_eq!(get_dport(&transport_header), Some(2396));
108+
assert_eq!(get_dport(transport_header.as_ref()), Some(2396));
109109
}
110110

111111
#[test]
112112
fn test_get_dport_icmpv6_packet() {
113113
let headers = PacketHeaders::from_ethernet_slice(&ICMPV6_PACKET).unwrap();
114114
let transport_header = headers.transport;
115-
assert_eq!(get_dport(&transport_header), None);
115+
assert_eq!(get_dport(transport_header.as_ref()), None);
116116
}
117117

118118
#[test]
119119
fn test_get_icmp_type_tcp_packet() {
120120
let headers = PacketHeaders::from_ethernet_slice(&TCP_PACKET).unwrap();
121121
let transport_header = headers.transport;
122-
assert_eq!(get_icmp_type(&transport_header), None);
122+
assert_eq!(get_icmp_type(transport_header.as_ref()), None);
123123
}
124124

125125
#[test]
126126
fn test_get_icmp_type_icmp_packet() {
127127
let headers = PacketHeaders::from_ethernet_slice(&ICMP_PACKET).unwrap();
128128
let transport_header = headers.transport;
129-
assert_eq!(get_icmp_type(&transport_header), Some(8)); // echo request
129+
assert_eq!(get_icmp_type(transport_header.as_ref()), Some(8)); // echo request
130130
}
131131

132132
#[test]
133133
fn test_get_icmp_type_arp_packet() {
134134
let headers = PacketHeaders::from_ethernet_slice(&ARP_PACKET).unwrap();
135135
let transport_header = headers.transport;
136-
assert_eq!(get_icmp_type(&transport_header), None);
136+
assert_eq!(get_icmp_type(transport_header.as_ref()), None);
137137
}
138138

139139
#[test]
140140
fn test_get_icmp_type_udp_ipv6_packet() {
141141
let headers = PacketHeaders::from_ethernet_slice(&UDP_IPV6_PACKET).unwrap();
142142
let transport_header = headers.transport;
143-
assert_eq!(get_icmp_type(&transport_header), None);
143+
assert_eq!(get_icmp_type(transport_header.as_ref()), None);
144144
}
145145

146146
#[test]
147147
fn test_get_icmp_type_icmpv6_packet() {
148148
let headers = PacketHeaders::from_ethernet_slice(&ICMPV6_PACKET).unwrap();
149149
let transport_header = headers.transport;
150-
assert_eq!(get_icmp_type(&transport_header), Some(135)); // neighbor solicitation
150+
assert_eq!(get_icmp_type(transport_header.as_ref()), Some(135)); // neighbor solicitation
151151
}
152152
}

0 commit comments

Comments
 (0)