Skip to content

Commit fe5a9ff

Browse files
committed
freebsd: move net/if_mib.h contents to submodule
There is a conflict of NETLINK_GENERIC definitions between net/if_mib.h and netlink/netlink.h. netlink.h is already exported in the crate root for Linux (and those definitions are already used by at least crates neli and netlink-packet-route), and if_mib is not much used yet, so this moves if_mib contents into its own namespace to leave place for netlink support on FreeBSD (#3194). Module definition moved to the end of file to avoid cryptic style.rs error "constant found after module when it belongs before". ctest as of 0.22 cannot be told a given header's symbols live in a submodule, so let the tests ignore all of them. Signed-off-by: Yann Dirson <[email protected]>
1 parent 9593176 commit fe5a9ff

File tree

3 files changed

+74
-45
lines changed

3 files changed

+74
-45
lines changed

libc-test/build.rs

+27
Original file line numberDiff line numberDiff line change
@@ -2346,6 +2346,33 @@ fn test_freebsd(target: &str) {
23462346
// Added in FreeBSD 13.2
23472347
"AT_USRSTACKBASE" | "AT_USRSTACKLIM" if Some(13) > freebsd_ver => true,
23482348

2349+
// submodule ifmib, cannot be checked today
2350+
"DOT3COMPLIANCE_STATS"
2351+
| "DOT3COMPLIANCE_COLLS"
2352+
| "IFDATA_GENERAL"
2353+
| "IFDATA_LINKSPECIFIC"
2354+
| "IFDATA_DRIVERNAME"
2355+
| "IFMIB_IFCOUNT"
2356+
| "IFMIB_IFDATA"
2357+
| "IFMIB_SYSTEM"
2358+
| "NETLINK_GENERIC"
2359+
| "dot3ChipSetAMD7990"
2360+
| "dot3ChipSetAMD79900"
2361+
| "dot3ChipSetAMD79C940"
2362+
| "dot3ChipSetIntel82586"
2363+
| "dot3ChipSetIntel82596"
2364+
| "dot3ChipSetIntel82557"
2365+
| "dot3ChipSetNational8390"
2366+
| "dot3ChipSetNationalSonic"
2367+
| "dot3ChipSetFujitsu86950"
2368+
| "dot3ChipSetDigitalDC21040"
2369+
| "dot3ChipSetDigitalDC21140"
2370+
| "dot3ChipSetDigitalDC21041"
2371+
| "dot3ChipSetDigitalDC21140A"
2372+
| "dot3ChipSetDigitalDC21142"
2373+
| "dot3ChipSetWesternDigital83C690"
2374+
| "dot3ChipSetWesternDigital83C790" => true,
2375+
23492376
_ => false,
23502377
}
23512378
});
+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// sys/net/if_mib.h
2+
3+
/// non-interface-specific
4+
pub const IFMIB_SYSTEM: ::c_int = 1;
5+
/// per-interface data table
6+
pub const IFMIB_IFDATA: ::c_int = 2;
7+
8+
/// generic stats for all kinds of ifaces
9+
pub const IFDATA_GENERAL: ::c_int = 1;
10+
/// specific to the type of interface
11+
pub const IFDATA_LINKSPECIFIC: ::c_int = 2;
12+
/// driver name and unit
13+
pub const IFDATA_DRIVERNAME: ::c_int = 3;
14+
15+
/// number of interfaces configured
16+
pub const IFMIB_IFCOUNT: ::c_int = 1;
17+
18+
/// functions not specific to a type of iface
19+
pub const NETLINK_GENERIC: ::c_int = 0;
20+
21+
pub const DOT3COMPLIANCE_STATS: ::c_int = 1;
22+
pub const DOT3COMPLIANCE_COLLS: ::c_int = 2;
23+
24+
pub const dot3ChipSetAMD7990: ::c_int = 1;
25+
pub const dot3ChipSetAMD79900: ::c_int = 2;
26+
pub const dot3ChipSetAMD79C940: ::c_int = 3;
27+
28+
pub const dot3ChipSetIntel82586: ::c_int = 1;
29+
pub const dot3ChipSetIntel82596: ::c_int = 2;
30+
pub const dot3ChipSetIntel82557: ::c_int = 3;
31+
32+
pub const dot3ChipSetNational8390: ::c_int = 1;
33+
pub const dot3ChipSetNationalSonic: ::c_int = 2;
34+
35+
pub const dot3ChipSetFujitsu86950: ::c_int = 1;
36+
37+
pub const dot3ChipSetDigitalDC21040: ::c_int = 1;
38+
pub const dot3ChipSetDigitalDC21140: ::c_int = 2;
39+
pub const dot3ChipSetDigitalDC21041: ::c_int = 3;
40+
pub const dot3ChipSetDigitalDC21140A: ::c_int = 4;
41+
pub const dot3ChipSetDigitalDC21142: ::c_int = 5;
42+
43+
pub const dot3ChipSetWesternDigital83C690: ::c_int = 1;
44+
pub const dot3ChipSetWesternDigital83C790: ::c_int = 2;

src/unix/bsd/freebsdlike/freebsd/mod.rs

+3-45
Original file line numberDiff line numberDiff line change
@@ -3327,51 +3327,6 @@ pub const IFDR_MSG_SIZE: ::c_int = 64;
33273327
pub const IFDR_REASON_MSG: ::c_int = 1;
33283328
pub const IFDR_REASON_VENDOR: ::c_int = 2;
33293329

3330-
// sys/net/if_mib.h
3331-
3332-
/// non-interface-specific
3333-
pub const IFMIB_SYSTEM: ::c_int = 1;
3334-
/// per-interface data table
3335-
pub const IFMIB_IFDATA: ::c_int = 2;
3336-
3337-
/// generic stats for all kinds of ifaces
3338-
pub const IFDATA_GENERAL: ::c_int = 1;
3339-
/// specific to the type of interface
3340-
pub const IFDATA_LINKSPECIFIC: ::c_int = 2;
3341-
/// driver name and unit
3342-
pub const IFDATA_DRIVERNAME: ::c_int = 3;
3343-
3344-
/// number of interfaces configured
3345-
pub const IFMIB_IFCOUNT: ::c_int = 1;
3346-
3347-
/// functions not specific to a type of iface
3348-
pub const NETLINK_GENERIC: ::c_int = 0;
3349-
3350-
pub const DOT3COMPLIANCE_STATS: ::c_int = 1;
3351-
pub const DOT3COMPLIANCE_COLLS: ::c_int = 2;
3352-
3353-
pub const dot3ChipSetAMD7990: ::c_int = 1;
3354-
pub const dot3ChipSetAMD79900: ::c_int = 2;
3355-
pub const dot3ChipSetAMD79C940: ::c_int = 3;
3356-
3357-
pub const dot3ChipSetIntel82586: ::c_int = 1;
3358-
pub const dot3ChipSetIntel82596: ::c_int = 2;
3359-
pub const dot3ChipSetIntel82557: ::c_int = 3;
3360-
3361-
pub const dot3ChipSetNational8390: ::c_int = 1;
3362-
pub const dot3ChipSetNationalSonic: ::c_int = 2;
3363-
3364-
pub const dot3ChipSetFujitsu86950: ::c_int = 1;
3365-
3366-
pub const dot3ChipSetDigitalDC21040: ::c_int = 1;
3367-
pub const dot3ChipSetDigitalDC21140: ::c_int = 2;
3368-
pub const dot3ChipSetDigitalDC21041: ::c_int = 3;
3369-
pub const dot3ChipSetDigitalDC21140A: ::c_int = 4;
3370-
pub const dot3ChipSetDigitalDC21142: ::c_int = 5;
3371-
3372-
pub const dot3ChipSetWesternDigital83C690: ::c_int = 1;
3373-
pub const dot3ChipSetWesternDigital83C790: ::c_int = 2;
3374-
33753330
// sys/netinet/in.h
33763331
// Protocols (RFC 1700)
33773332
// NOTE: These are in addition to the constants defined in src/unix/mod.rs
@@ -5692,3 +5647,6 @@ cfg_if! {
56925647
// Unknown target_arch
56935648
}
56945649
}
5650+
5651+
// sys/net/if_mib.h
5652+
pub mod ifmib;

0 commit comments

Comments
 (0)