proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-27 18:42:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14093 from mjstapp/fix_pbr_style

Browse Source 
lib,pbrd: clean up style issues
This commit is contained in:
Jafar Al-Gharaibeh 2023-07-25 21:38:39 -05:00 committed by GitHub
commit 11d19d1279
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/zclient.c
View File

@ -1628,7 +1628,7 @@ stream_failure:
static void zapi_pbr_rule_filter_encode(struct stream *s, struct pbr_filter *f) static void zapi_pbr_rule_filter_encode(struct stream *s, struct pbr_filter *f)
{ {
assert(f->src_ip.family == f->dst_ip.family); assert(f->src_ip.family == f->dst_ip.family);
assert((AF_INET == f->src_ip.family) || (AF_INET6 == f->src_ip.family)); assert((f->src_ip.family == AF_INET) || (f->src_ip.family == AF_INET6));
stream_putl(s, f->filter_bm); stream_putl(s, f->filter_bm);
stream_putc(s, f->ip_proto); stream_putc(s, f->ip_proto);

8
pbrd/pbr_zebra.c
View File

@ -588,13 +588,13 @@ static bool pbr_encode_pbr_map_sequence(struct stream *s,
* can copy here instead of trying to infer from magic values. * can copy here instead of trying to infer from magic values.
*/ */
SET_FLAG(r.action.flags, PBR_ACTION_TABLE); /* always valid */ SET_FLAG(r.action.flags, PBR_ACTION_TABLE); /* always valid */
if (PBR_MAP_UNDEFINED_QUEUE_ID != pbrms->action_queue_id) if (pbrms->action_queue_id != PBR_MAP_UNDEFINED_QUEUE_ID)
SET_FLAG(r.action.flags, PBR_ACTION_QUEUE_ID); SET_FLAG(r.action.flags, PBR_ACTION_QUEUE_ID);
if (0 != pbrms->action_pcp) if (pbrms->action_pcp != 0)
SET_FLAG(r.action.flags, PBR_ACTION_PCP); SET_FLAG(r.action.flags, PBR_ACTION_PCP);
if (0 != pbrms->action_vlan_id) if (pbrms->action_vlan_id != 0)
SET_FLAG(r.action.flags, PBR_ACTION_VLAN_ID); SET_FLAG(r.action.flags, PBR_ACTION_VLAN_ID);
if (0 != pbrms->action_vlan_flags) if (pbrms->action_vlan_flags != 0)
SET_FLAG(r.action.flags, PBR_ACTION_VLAN_FLAGS); SET_FLAG(r.action.flags, PBR_ACTION_VLAN_FLAGS);
/* /*