diff options
Diffstat (limited to 'extras/vom/vom/acl_list_cmds.cpp')
-rw-r--r-- | extras/vom/vom/acl_list_cmds.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/extras/vom/vom/acl_list_cmds.cpp b/extras/vom/vom/acl_list_cmds.cpp index f873fd171c1..cb02edba98b 100644 --- a/extras/vom/vom/acl_list_cmds.cpp +++ b/extras/vom/vom/acl_list_cmds.cpp @@ -24,10 +24,9 @@ namespace list_cmds { static void to_vpp(const l2_rule& rule, vapi_type_macip_acl_rule& payload) { - payload.is_permit = (vapi_enum_acl_action)rule.action().value(); - rule.src_ip().to_vpp((uint8_t*)&payload.src_prefix.address.af, - (uint8_t*)&payload.src_prefix.address.un, - &payload.src_prefix.len); + payload.is_permit = rule.action().value(); + rule.src_ip().to_vpp( + &payload.is_ipv6, payload.src_ip_addr, &payload.src_ip_prefix_len); rule.mac().to_bytes(payload.src_mac, 6); rule.mac_mask().to_bytes(payload.src_mac_mask, 6); } @@ -35,15 +34,13 @@ to_vpp(const l2_rule& rule, vapi_type_macip_acl_rule& payload) static void to_vpp(const l3_rule& rule, vapi_type_acl_rule& payload) { - payload.is_permit = (vapi_enum_acl_action)rule.action().value(); - rule.src().to_vpp((uint8_t*)&payload.src_prefix.address.af, - (uint8_t*)&payload.src_prefix.address.un, - &payload.src_prefix.len); - rule.dst().to_vpp((uint8_t*)&payload.dst_prefix.address.af, - (uint8_t*)&payload.dst_prefix.address.un, - &payload.dst_prefix.len); - - payload.proto = (vapi_enum_ip_proto)rule.proto(); + payload.is_permit = rule.action().value(); + rule.src().to_vpp( + &payload.is_ipv6, payload.src_ip_addr, &payload.src_ip_prefix_len); + rule.dst().to_vpp( + &payload.is_ipv6, payload.dst_ip_addr, &payload.dst_ip_prefix_len); + + payload.proto = rule.proto(); payload.srcport_or_icmptype_first = rule.srcport_or_icmptype_first(); payload.srcport_or_icmptype_last = rule.srcport_or_icmptype_last(); payload.dstport_or_icmpcode_first = rule.dstport_or_icmpcode_first(); |