ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

session: sesssion_rule_add_del API parsing port in wrong order

Browse Source 
The convention in the binary API is that fields encoded in network order.
For some reason, port was parsed in host order.

Type: fix

Change-Id: I31ea313937097e2547226566b7869be4e28251b8
Signed-off-by: Steven Luong <sluong@cisco.com>
This commit is contained in:
Steven Luong
2024-10-24 10:36:10 -07:00
committed by Florin Coras
parent 0af11f537f
commit bfad6b7a8f
2 changed files with 87 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/vnet/session/session_api.c
View File

@ -1181,8 +1181,8 @@ vl_api_session_rule_add_del_t_handler (vl_api_session_rule_add_del_t * mp)
ip_prefix_decode (&mp->lcl, &table_args->lcl);
ip_prefix_decode (&mp->rmt, &table_args->rmt);
table_args->lcl_port = mp->lcl_port;
table_args->rmt_port = mp->rmt_port;
table_args->lcl_port = clib_net_to_host_u16 (mp->lcl_port);
table_args->rmt_port = clib_net_to_host_u16 (mp->rmt_port);
table_args->action_index = clib_net_to_host_u32 (mp->action_index);
table_args->is_add = mp->is_add;
mp->tag[sizeof (mp->tag) - 1] = 0;
@ -1232,8 +1232,8 @@ send_session_rule_details4 (mma_rule_16_t * rule, u8 is_local,
ip_prefix_encode (&lcl, &rmp->lcl);
ip_prefix_encode (&rmt, &rmp->rmt);
rmp->lcl_port = match->lcl_port;
rmp->rmt_port = match->rmt_port;
rmp->lcl_port = clib_host_to_net_u16 (match->lcl_port);
rmp->rmt_port = clib_host_to_net_u16 (match->rmt_port);
rmp->action_index = clib_host_to_net_u32 (rule->action_index);
rmp->scope =
is_local ? SESSION_RULE_SCOPE_API_LOCAL : SESSION_RULE_SCOPE_API_GLOBAL;
@ -1276,8 +1276,8 @@ send_session_rule_details6 (mma_rule_40_t * rule, u8 is_local,
ip_prefix_encode (&lcl, &rmp->lcl);
ip_prefix_encode (&rmt, &rmp->rmt);
rmp->lcl_port = match->lcl_port;
rmp->rmt_port = match->rmt_port;
rmp->lcl_port = clib_host_to_net_u16 (match->lcl_port);
rmp->rmt_port = clib_host_to_net_u16 (match->rmt_port);
rmp->action_index = clib_host_to_net_u32 (rule->action_index);
rmp->scope =
is_local ? SESSION_RULE_SCOPE_API_LOCAL : SESSION_RULE_SCOPE_API_GLOBAL;

81
test/asf/test_session.py
View File

@ -8,7 +8,9 @@ from asfframework import (
tag_fixme_vpp_workers,
tag_run_solo,
)
from vpp_papi import VppEnum
from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
from ipaddress import IPv4Network
from config import config
@ -149,6 +151,85 @@ class TestSessionUnitTests(VppAsfTestCase):
self.vapi.session_enable_disable(is_enable=0)
@tag_fixme_vpp_workers
class TestSessionRuleTableTests(VppAsfTestCase):
"""Session Rule Table Tests Case"""
@classmethod
def setUpClass(cls):
super(TestSessionRuleTableTests, cls).setUpClass()
@classmethod
def tearDownClass(cls):
super(TestSessionRuleTableTests, cls).tearDownClass()
def setUp(self):
super(TestSessionRuleTableTests, self).setUp()
self.vapi.session_enable_disable_v2(
rt_engine_type=VppEnum.vl_api_rt_backend_engine_t.RT_BACKEND_ENGINE_API_RULE_TABLE
)
def test_session_rule_table(self):
"""Session Rule Table Tests"""
LCL_IP = "172.100.1.1/32"
RMT_IP = "172.100.1.2/32"
LCL_PORT = 5000
RMT_PORT = 80
# Add a rule table entry
self.vapi.session_rule_add_del(
transport_proto=VppEnum.vl_api_transport_proto_t.TRANSPORT_PROTO_API_TCP,
lcl=LCL_IP,
rmt=RMT_IP,
lcl_port=LCL_PORT,
rmt_port=RMT_PORT,
action_index=1,
is_add=1,
appns_index=0,
scope=VppEnum.vl_api_session_rule_scope_t.SESSION_RULE_SCOPE_API_GLOBAL,
tag="rule-1",
)
# Verify it is correctly injected
dump = self.vapi.session_rules_dump()
self.assertTrue(len(dump) > 1)
self.assertEqual(dump[1].rmt_port, RMT_PORT)
self.assertEqual(dump[1].lcl_port, LCL_PORT)
self.assertEqual(dump[1].lcl, IPv4Network(LCL_IP))
self.assertEqual(dump[1].rmt, IPv4Network(RMT_IP))
self.assertEqual(dump[1].action_index, 1)
self.assertEqual(dump[1].appns_index, 0)
self.assertEqual(
dump[1].scope,
VppEnum.vl_api_session_rule_scope_t.SESSION_RULE_SCOPE_API_GLOBAL,
)
# Delete the entry
self.vapi.session_rule_add_del(
transport_proto=VppEnum.vl_api_transport_proto_t.TRANSPORT_PROTO_API_TCP,
lcl=LCL_IP,
rmt=RMT_IP,
lcl_port=LCL_PORT,
rmt_port=RMT_PORT,
action_index=1,
is_add=0,
appns_index=0,
scope=VppEnum.vl_api_session_rule_scope_t.SESSION_RULE_SCOPE_API_GLOBAL,
tag="rule-1",
)
dump2 = self.vapi.session_rules_dump()
# Verify it is removed
self.assertTrue((len(dump) - 1) == len(dump2))
def tearDown(self):
super(TestSessionRuleTableTests, self).tearDown()
self.vapi.session_enable_disable_v2(
rt_engine_type=VppEnum.vl_api_rt_backend_engine_t.RT_BACKEND_ENGINE_API_DISABLE
)
@tag_run_solo
class TestSegmentManagerTests(VppAsfTestCase):
"""SVM Fifo Unit Tests Case"""