From 091871c6a3cbeded00d95c23d3665c65142edc6e Mon Sep 17 00:00:00 2001 From: Mohsin Kazmi Date: Wed, 13 Dec 2017 17:59:33 +0100 Subject: vom: acl: Extend constructor for l3 rule New constructor can construct the l3 rule using all or partial paratmeters. Change-Id: I828ec1c4713decb5824e4a73c3692cebc2324cc2 Signed-off-by: Mohsin Kazmi --- src/vpp-api/vom/acl_l3_rule.cpp | 23 +++++++++++++++-------- src/vpp-api/vom/acl_l3_rule.hpp | 9 ++++++++- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/vpp-api/vom/acl_l3_rule.cpp b/src/vpp-api/vom/acl_l3_rule.cpp index 6a9383aba0b..4b96cae6c50 100644 --- a/src/vpp-api/vom/acl_l3_rule.cpp +++ b/src/vpp-api/vom/acl_l3_rule.cpp @@ -22,18 +22,25 @@ namespace ACL { l3_rule::l3_rule(uint32_t priority, const action_t& action, const route::prefix_t& src, - const route::prefix_t& dst) + const route::prefix_t& dst, + uint8_t proto, + uint16_t srcport_or_icmptype_first, + uint16_t srcport_or_icmptype_last, + uint16_t dstport_or_icmpcode_first, + uint16_t dstport_or_icmpcode_last, + uint8_t tcp_flags_mask, + uint8_t tcp_flags_value) : m_priority(priority) , m_action(action) , m_src(src) , m_dst(dst) - , m_proto(0) - , m_srcport_or_icmptype_first(0) - , m_srcport_or_icmptype_last(0) - , m_dstport_or_icmpcode_first(0) - , m_dstport_or_icmpcode_last(0) - , m_tcp_flags_mask(0) - , m_tcp_flags_value(0) + , m_proto(proto) + , m_srcport_or_icmptype_first(srcport_or_icmptype_first) + , m_srcport_or_icmptype_last(srcport_or_icmptype_last) + , m_dstport_or_icmpcode_first(dstport_or_icmpcode_first) + , m_dstport_or_icmpcode_last(dstport_or_icmpcode_last) + , m_tcp_flags_mask(tcp_flags_mask) + , m_tcp_flags_value(tcp_flags_value) { } diff --git a/src/vpp-api/vom/acl_l3_rule.hpp b/src/vpp-api/vom/acl_l3_rule.hpp index 16a8718a99e..25a2a471d24 100644 --- a/src/vpp-api/vom/acl_l3_rule.hpp +++ b/src/vpp-api/vom/acl_l3_rule.hpp @@ -37,7 +37,14 @@ public: l3_rule(uint32_t priority, const action_t& action, const route::prefix_t& src, - const route::prefix_t& dst); + const route::prefix_t& dst, + uint8_t proto = 0, + uint16_t srcport_or_icmptype_first = 0, + uint16_t srcport_or_icmptype_last = 0, + uint16_t dstport_or_icmpcode_first = 0, + uint16_t dstport_or_icmpcode_last = 0, + uint8_t tcp_flags_mask = 0, + uint8_t tcp_flags_value = 0); /** * Copy Constructor -- cgit 1.2.3-korg