1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
|
--- erbium-net/src/netinfo.rs
+++ erbium-net/src/netinfo.rs
@@ -22,4 +22,9 @@
use netlink_packet_core::*;
-use netlink_packet_route::RtnlMessage::*;
-use netlink_packet_route::{constants::*, AddressMessage, LinkMessage, RouteMessage, RtnlMessage};
+use netlink_packet_route::RouteNetlinkMessage::*;
+use netlink_packet_route::{
+ address::{AddressAttribute, AddressMessage},
+ link::{LinkAttribute, LinkFlag, LinkLayerType, LinkMessage},
+ route::{RouteAddress, RouteAttribute, RouteMessage},
+ AddressFamily, RouteNetlinkMessage,
+};
use netlink_sys::TokioSocket as Socket;
@@ -27,2 +32,11 @@
+// These were removed in https://github.com/rust-netlink/netlink-packet-route/commit/88b1348cc0a257c55e520cae3bde3c66d5bc65a3 with no obvious replacement.
+// I imagine that .add_membership() will eventually be cleaned up to require some new type and
+// these will be redundant then.
+const RTNLGRP_LINK: u32 = 1;
+const RTNLGRP_IPV4_IFADDR: u32 = 5;
+const RTNLGRP_IPV4_ROUTE: u32 = 7;
+const RTNLGRP_IPV6_IFADDR: u32 = 9;
+const RTNLGRP_IPV6_ROUTE: u32 = 11;
+
#[cfg(not(test))]
@@ -55,8 +69,8 @@
-#[derive(Debug, Clone, Copy)]
-pub struct IfFlags(u32);
+#[derive(Debug, Clone)]
+pub struct IfFlags(Vec<LinkFlag>);
impl IfFlags {
- pub const fn has_multicast(&self) -> bool {
- self.0 & IFF_MULTICAST != 0
+ pub fn has_multicast(&self) -> bool {
+ self.0.iter().any(|&x| x == LinkFlag::Multicast)
}
@@ -119,18 +133,2 @@
-fn convert_address(addr: &[u8], family: u16) -> std::net::IpAddr {
- match family {
- AF_INET => {
- std::net::IpAddr::V4(std::net::Ipv4Addr::new(addr[0], addr[1], addr[2], addr[3]))
- }
- AF_INET6 => std::net::IpAddr::V6(
- [
- addr[0], addr[1], addr[2], addr[3], addr[4], addr[5], addr[6], addr[7], addr[8],
- addr[9], addr[10], addr[11], addr[12], addr[13], addr[14], addr[15],
- ]
- .into(),
- ),
- x => panic!("Unknown address family {:?}", x),
- }
-}
-
struct NetLinkNetInfo {}
@@ -138,9 +136,9 @@
impl NetLinkNetInfo {
- fn decode_linklayer(linktype: u16, addr: &[u8]) -> LinkLayer {
+ fn decode_linklayer(linktype: LinkLayerType, addr: &[u8]) -> LinkLayer {
match linktype {
- ARPHRD_ETHER => {
+ LinkLayerType::Ether => {
LinkLayer::Ethernet([addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]])
}
- ARPHRD_LOOPBACK => LinkLayer::None,
- ARPHRD_SIT => LinkLayer::None, // Actually this is a IpAddr, but we don't do DHCP over it, so...
+ LinkLayerType::Loopback => LinkLayer::None,
+ LinkLayerType::Sit => LinkLayer::None, // Actually this is a IpAddr, but we don't do DHCP over it, so...
l => {
@@ -153,9 +151,7 @@
fn parse_addr(addr: &AddressMessage) -> (std::net::IpAddr, u8) {
- use netlink_packet_route::address::nlas::Nla::*;
let mut ifaddr = None;
- let iffamily = addr.header.family;
let ifprefixlen = addr.header.prefix_len;
- for i in &addr.nlas {
- if let Address(a) = i {
- ifaddr = Some(convert_address(a, iffamily.into()));
+ for i in &addr.attributes {
+ if let AddressAttribute::Address(a) = i {
+ ifaddr = Some(*a)
}
@@ -205,3 +201,2 @@
async fn process_newlink(sni: &SharedNetInfo, link: &LinkMessage) {
- use netlink_packet_route::link::nlas::Nla::*;
let mut ifname: Option<String> = None;
@@ -209,9 +204,9 @@
let mut ifaddr = None;
- let ifflags = link.header.flags;
+ let ifflags = link.header.flags.clone();
let ifidx = link.header.index;
- for i in &link.nlas {
+ for i in &link.attributes {
match i {
- IfName(name) => ifname = Some(name.clone()),
- Mtu(mtu) => ifmtu = Some(*mtu),
- Address(addr) => ifaddr = Some(addr.clone()),
+ LinkAttribute::IfName(name) => ifname = Some(name.clone()),
+ LinkAttribute::Mtu(mtu) => ifmtu = Some(*mtu),
+ LinkAttribute::Address(addr) => ifaddr = Some(addr.clone()),
_ => (),
@@ -251,4 +246,2 @@
fn decode_route(route: &RouteMessage) -> Option<RouteInfo> {
- use netlink_packet_route::rtnl::nlas::route::Nla::*;
- use std::convert::TryFrom as _;
let mut destination = None;
@@ -256,30 +249,22 @@
let mut gateway = None;
- for nla in &route.nlas {
+ for nla in &route.attributes {
match nla {
- Destination(dest) => {
- destination = match route.header.address_family as u16 {
- AF_INET => <[u8; 4]>::try_from(&dest[..])
- .map(std::net::IpAddr::from)
- .ok(),
- AF_INET6 => <[u8; 16]>::try_from(&dest[..])
- .map(std::net::IpAddr::from)
- .ok(),
- f => panic!("Unexpected family {}", f),
+ RouteAttribute::Destination(dest) => {
+ destination = match dest {
+ RouteAddress::Inet(addr) => Some((*addr).into()),
+ RouteAddress::Inet6(addr) => Some((*addr).into()),
+ f => panic!("Unexpected family {:?}", f),
}
}
- Gateway(via) => {
- gateway = match route.header.address_family as u16 {
- AF_INET => <[u8; 4]>::try_from(&via[..])
- .map(std::net::IpAddr::from)
- .ok(),
- AF_INET6 => <[u8; 16]>::try_from(&via[..])
- .map(std::net::IpAddr::from)
- .ok(),
- f => panic!("Unexpected family {}", f),
+ RouteAttribute::Gateway(via) => {
+ gateway = match via {
+ RouteAddress::Inet(addr) => Some((*addr).into()),
+ RouteAddress::Inet6(addr) => Some((*addr).into()),
+ f => panic!("Unexpected family {:?}", f),
}
}
- Oif(oif) => oifidx = Some(oif),
- Table(254) => (),
- Table(_) => return None, /* Skip routes that are not in the "main" table */
- _ => (), /* Ignore unknown nlas */
+ RouteAttribute::Oif(oif) => oifidx = Some(oif),
+ RouteAttribute::Table(254) => (),
+ RouteAttribute::Table(_) => return None, /* Skip routes that are not in the "main" table */
+ _ => (), /* Ignore unknown nlas */
}
@@ -287,5 +272,5 @@
Some(RouteInfo {
- addr: destination.unwrap_or_else(|| match route.header.address_family as u16 {
- AF_INET => "0.0.0.0".parse().unwrap(),
- AF_INET6 => "::".parse().unwrap(),
+ addr: destination.unwrap_or_else(|| match route.header.address_family {
+ AddressFamily::Inet => "0.0.0.0".parse().unwrap(),
+ AddressFamily::Inet6 => "::".parse().unwrap(),
_ => unreachable!(),
@@ -322,3 +307,3 @@
hdr,
- NetlinkPayload::from(RtnlMessage::GetLink(LinkMessage::default())),
+ NetlinkPayload::InnerMessage(RouteNetlinkMessage::GetLink(LinkMessage::default())),
);
@@ -349,5 +334,7 @@
let mut rmsg = RouteMessage::default();
- rmsg.header.address_family = address_family;
- let mut packet =
- NetlinkMessage::new(hdr, NetlinkPayload::from(RtnlMessage::GetRoute(rmsg)));
+ rmsg.header.address_family = netlink_packet_route::AddressFamily::Other(address_family);
+ let mut packet = NetlinkMessage::new(
+ hdr,
+ NetlinkPayload::InnerMessage(RouteNetlinkMessage::GetRoute(rmsg)),
+ );
@@ -366,4 +353,4 @@
- match address_family as u16 {
- AF_INET => socket
+ match address_family.into() {
+ AddressFamily::Inet => socket
.socket_mut()
@@ -371,3 +358,3 @@
.unwrap(),
- AF_INET6 => socket
+ AddressFamily::Inet6 => socket
.socket_mut()
@@ -389,6 +376,8 @@
let mut amsg = AddressMessage::default();
- amsg.header.family = AF_PACKET as u8;
+ amsg.header.family = AddressFamily::Packet;
- let mut packet =
- NetlinkMessage::new(hdr, NetlinkPayload::from(RtnlMessage::GetAddress(amsg)));
+ let mut packet = NetlinkMessage::new(
+ hdr,
+ NetlinkPayload::InnerMessage(RouteNetlinkMessage::GetAddress(amsg)),
+ );
@@ -421,3 +410,6 @@
- async fn process_message(sni: &SharedNetInfo, rx_packet: &NetlinkMessage<RtnlMessage>) -> bool {
+ async fn process_message(
+ sni: &SharedNetInfo,
+ rx_packet: &NetlinkMessage<RouteNetlinkMessage>,
+ ) -> bool {
match &rx_packet.payload {
@@ -443,3 +435,3 @@
}
- NetlinkPayload::Done => true,
+ NetlinkPayload::Done(_) => true,
e => {
@@ -469,3 +461,4 @@
while offset < pkt.len() {
- let rx_packet = <NetlinkMessage<RtnlMessage>>::deserialize(&pkt[offset..]).unwrap();
+ let rx_packet =
+ <NetlinkMessage<RouteNetlinkMessage>>::deserialize(&pkt[offset..]).unwrap();
offset += rx_packet.header.length as usize;
@@ -481,3 +474,8 @@
trace!("Finished Addr");
- NetLinkNetInfo::send_routedump(&mut socket, &mut seq, AF_INET as u8).await;
+ NetLinkNetInfo::send_routedump(
+ &mut socket,
+ &mut seq,
+ AddressFamily::Inet.into(),
+ )
+ .await;
state = State::ReadingRoute4
@@ -486,3 +484,8 @@
trace!("Finished Route4");
- NetLinkNetInfo::send_routedump(&mut socket, &mut seq, AF_INET6 as u8).await;
+ NetLinkNetInfo::send_routedump(
+ &mut socket,
+ &mut seq,
+ AddressFamily::Inet6.into(),
+ )
+ .await;
state = State::ReadingRoute6
@@ -526,3 +529,3 @@
mtu: 65536,
- flags: IfFlags(IFF_MULTICAST),
+ flags: IfFlags(vec![LinkFlag::Multicast]),
},
@@ -536,3 +539,3 @@
mtu: 1500,
- flags: IfFlags(IFF_MULTICAST),
+ flags: IfFlags(vec![LinkFlag::Multicast]),
},
@@ -615,3 +618,8 @@
pub async fn get_flags_by_ifidx(&self, ifidx: u32) -> Option<IfFlags> {
- self.0.read().await.intf.get(&ifidx).map(|x| x.flags)
+ self.0
+ .read()
+ .await
+ .intf
+ .get(&ifidx)
+ .map(|x| x.flags.clone())
}
@@ -659,3 +667,2 @@
async fn test_interface() {
- use netlink_packet_route::rtnl;
const IFIDX: u32 = 10;
@@ -666,8 +673,8 @@
lmsg.header.index = IFIDX;
- lmsg.header.link_layer_type = ARPHRD_ETHER;
- lmsg.nlas = vec![
- rtnl::link::nlas::Nla::IfName("test1".into()),
- rtnl::link::nlas::Nla::Mtu(1500),
- rtnl::link::nlas::Nla::Address(vec![0x00, 0x53, 0x00, 0x00, 0x00, 0x00]),
- rtnl::link::nlas::Nla::Broadcast(vec![0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF]),
+ lmsg.header.link_layer_type = LinkLayerType::Ether;
+ lmsg.attributes = vec![
+ LinkAttribute::IfName("test1".into()),
+ LinkAttribute::Mtu(1500),
+ LinkAttribute::Address(vec![0x00, 0x53, 0x00, 0x00, 0x00, 0x00]),
+ LinkAttribute::Broadcast(vec![0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF]),
];
@@ -675,3 +682,6 @@
&ni,
- &NetlinkMessage::new(hdr, NetlinkPayload::from(RtnlMessage::NewLink(lmsg))),
+ &NetlinkMessage::new(
+ hdr,
+ NetlinkPayload::from(RouteNetlinkMessage::NewLink(lmsg)),
+ ),
)
@@ -681,8 +691,11 @@
amsg.header.index = IFIDX;
- amsg.header.family = AF_INET as u8;
+ amsg.header.family = AddressFamily::Inet;
amsg.header.prefix_len = 24;
- amsg.nlas = vec![rtnl::address::nlas::Nla::Address(vec![192, 0, 2, 1])];
+ amsg.attributes = vec![AddressAttribute::Address("192.0.2.1".parse().unwrap())];
NetLinkNetInfo::process_message(
&ni,
- &NetlinkMessage::new(hdr, NetlinkPayload::from(RtnlMessage::NewAddress(amsg))),
+ &NetlinkMessage::new(
+ hdr,
+ NetlinkPayload::from(RouteNetlinkMessage::NewAddress(amsg)),
+ ),
)
@@ -691,10 +704,11 @@
a6msg.header.index = IFIDX;
- a6msg.header.family = AF_INET as u8;
+ a6msg.header.family = AddressFamily::Inet6;
a6msg.header.prefix_len = 24;
- a6msg.nlas = vec![rtnl::address::nlas::Nla::Address(vec![
- 0x20, 0x1, 0xd, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- ])];
+ a6msg.attributes = vec![AddressAttribute::Address("2001:db8::".parse().unwrap())];
NetLinkNetInfo::process_message(
&ni,
- &NetlinkMessage::new(hdr, NetlinkPayload::from(RtnlMessage::NewAddress(a6msg))),
+ &NetlinkMessage::new(
+ hdr,
+ NetlinkPayload::from(RouteNetlinkMessage::NewAddress(a6msg)),
+ ),
)
@@ -716,8 +730,8 @@
lmsg.header.index = IFIDX;
- lmsg.header.link_layer_type = ARPHRD_ETHER;
- lmsg.nlas = vec![
- rtnl::link::nlas::Nla::IfName("test1".into()),
- rtnl::link::nlas::Nla::Mtu(1501),
- rtnl::link::nlas::Nla::Address(vec![0x00, 0x53, 0x00, 0x00, 0x00, 0x01]),
- rtnl::link::nlas::Nla::Broadcast(vec![0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE]),
+ lmsg.header.link_layer_type = LinkLayerType::Ether;
+ lmsg.attributes = vec![
+ LinkAttribute::IfName("test1".into()),
+ LinkAttribute::Mtu(1501),
+ LinkAttribute::Address(vec![0x00, 0x53, 0x00, 0x00, 0x00, 0x01]),
+ LinkAttribute::Broadcast(vec![0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE]),
];
@@ -725,3 +739,6 @@
&ni,
- &NetlinkMessage::new(hdr, NetlinkPayload::from(RtnlMessage::NewLink(lmsg))),
+ &NetlinkMessage::new(
+ hdr,
+ NetlinkPayload::from(RouteNetlinkMessage::NewLink(lmsg)),
+ ),
)
|
