feat(netlink): debug rule logs contain the ip family

This commit is contained in:
Quentin McGaw
2024-11-03 20:14:41 +00:00
parent ddd3876f92
commit 96a8015af6
2 changed files with 17 additions and 4 deletions

View File

@@ -77,7 +77,18 @@ func netlinkRuleToRule(netlinkRule netlink.Rule) (rule Rule) {
} }
func ruleDbgMsg(add bool, rule Rule) (debugMessage string) { func ruleDbgMsg(add bool, rule Rule) (debugMessage string) {
debugMessage = "ip rule" debugMessage = "ip"
switch rule.Family {
case FamilyV4:
debugMessage += " -f inet"
case FamilyV6:
debugMessage += " -f inet6"
default:
debugMessage += " -f " + fmt.Sprint(rule.Family)
}
debugMessage += " rule"
if add { if add {
debugMessage += " add" debugMessage += " add"

View File

@@ -15,26 +15,28 @@ func Test_ruleDbgMsg(t *testing.T) {
dbgMsg string dbgMsg string
}{ }{
"default values": { "default values": {
dbgMsg: "ip rule del pref 0", dbgMsg: "ip -f 0 rule del pref 0",
}, },
"add rule": { "add rule": {
add: true, add: true,
rule: Rule{ rule: Rule{
Family: FamilyV4,
Src: makeNetipPrefix(1), Src: makeNetipPrefix(1),
Dst: makeNetipPrefix(2), Dst: makeNetipPrefix(2),
Table: 100, Table: 100,
Priority: 101, Priority: 101,
}, },
dbgMsg: "ip rule add from 1.1.1.0/24 to 2.2.2.0/24 lookup 100 pref 101", dbgMsg: "ip -f inet rule add from 1.1.1.0/24 to 2.2.2.0/24 lookup 100 pref 101",
}, },
"del rule": { "del rule": {
rule: Rule{ rule: Rule{
Family: FamilyV4,
Src: makeNetipPrefix(1), Src: makeNetipPrefix(1),
Dst: makeNetipPrefix(2), Dst: makeNetipPrefix(2),
Table: 100, Table: 100,
Priority: 101, Priority: 101,
}, },
dbgMsg: "ip rule del from 1.1.1.0/24 to 2.2.2.0/24 lookup 100 pref 101", dbgMsg: "ip -f inet rule del from 1.1.1.0/24 to 2.2.2.0/24 lookup 100 pref 101",
}, },
} }