Skip to content

Commit 400b741

Browse files
committed
Add extern C f! macro and final newline
1 parent 18de902 commit 400b741

File tree

2 files changed

+33
-32
lines changed

2 files changed

+33
-32
lines changed

src/new/nto/net/bpf.rs

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -39,44 +39,45 @@ pub const BPF_A: u16 = 0x10;
3939
pub const BPF_TAX: u16 = 0x00;
4040
pub const BPF_TXA: u16 = 0x80;
4141

42+
f! {
43+
pub fn BPF_CLASS(code: u32) -> u32 {
44+
code & 0x07
45+
}
4246

43-
pub fn BPF_CLASS(code: u32) -> u32 {
44-
code & 0x07
45-
}
47+
pub fn BPF_SIZE(code: u32) -> u32 {
48+
code & 0x18
49+
}
4650

47-
pub fn BPF_SIZE(code: u32) -> u32 {
48-
code & 0x18
49-
}
51+
pub fn BPF_MODE(code: u32) -> u32 {
52+
code & 0xe0
53+
}
5054

51-
pub fn BPF_MODE(code: u32) -> u32 {
52-
code & 0xe0
53-
}
55+
pub fn BPF_OP(code: u32) -> u32 {
56+
code & 0xf0
57+
}
5458

55-
pub fn BPF_OP(code: u32) -> u32 {
56-
code & 0xf0
57-
}
59+
pub fn BPF_SRC(code: u32) -> u32 {
60+
code & 0x08
61+
}
5862

59-
pub fn BPF_SRC(code: u32) -> u32 {
60-
code & 0x08
61-
}
63+
pub fn BPF_RVAL(code: u32) -> u32 {
64+
code & 0x18
65+
}
6266

63-
pub fn BPF_RVAL(code: u32) -> u32 {
64-
code & 0x18
65-
}
67+
pub fn BPF_MISCOP(code: u32) -> u32 {
68+
code & 0xf8
69+
}
6670

67-
pub fn BPF_MISCOP(code: u32) -> u32 {
68-
code & 0xf8
69-
}
71+
pub fn BPF_STMT(code: u16, k: u32) -> bpf_insn {
72+
bpf_insn {
73+
code,
74+
jt: 0,
75+
jf: 0,
76+
k,
77+
}
78+
}
7079

71-
pub fn BPF_STMT(code: u16, k: u32) -> bpf_insn {
72-
bpf_insn {
73-
code,
74-
jt: 0,
75-
jf: 0,
76-
k,
80+
pub fn BPF_JUMP(code: u16, k: u32, jt: u8, jf: u8) -> bpf_insn {
81+
bpf_insn { code, jt, jf, k }
7782
}
7883
}
79-
80-
pub fn BPF_JUMP(code: u16, k: u32, jt: u8, jf: u8) -> bpf_insn {
81-
bpf_insn { code, jt, jf, k }
82-
}

src/new/nto/net/if_.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ s_no_extra_traits! {
3030
pub ifru_fib: c_uint,
3131
pub ifru_vlan_pcp: c_uchar,
3232
}
33-
}
33+
}

0 commit comments

Comments
 (0)