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

reassembly: replace asserts with error counters

Browse Source 
Change-Id: Iaa39aea990bc04147f6a049215e990a567d30106
Signed-off-by: Klement Sekera <ksekera@cisco.com>
This commit is contained in:
Klement Sekera
2018-12-14 17:24:13 +01:00
committed by Damjan Marion
parent aefbedeb5d
commit d0f70a346d
5 changed files with 277 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vnet/ip/ip4_error.h
View File

@ -87,7 +87,8 @@
_ (REASS_DUPLICATE_FRAGMENT, "duplicate/overlapping fragments") \ _ (REASS_DUPLICATE_FRAGMENT, "duplicate/overlapping fragments") \
_ (REASS_LIMIT_REACHED, "drops due to concurrent reassemblies limit") \ _ (REASS_LIMIT_REACHED, "drops due to concurrent reassemblies limit") \
_ (REASS_TIMEOUT, "fragments dropped due to reassembly timeout") \ _ (REASS_TIMEOUT, "fragments dropped due to reassembly timeout") \
_ (REASS_MALFORMED_PACKET, "malformed packets") _ (REASS_MALFORMED_PACKET, "malformed packets") \
_ (REASS_INTERNAL_ERROR, "drops due to internal reassembly error")
typedef enum typedef enum
{ {

249
src/vnet/ip/ip4_reassembly.c
View File

File diff suppressed because it is too large Load Diff

3
src/vnet/ip/ip6_error.h
View File

@ -81,7 +81,8 @@
_ (REASS_DUPLICATE_FRAGMENT, "duplicate fragments") \ _ (REASS_DUPLICATE_FRAGMENT, "duplicate fragments") \
_ (REASS_OVERLAPPING_FRAGMENT, "overlapping fragments") \ _ (REASS_OVERLAPPING_FRAGMENT, "overlapping fragments") \
_ (REASS_LIMIT_REACHED, "drops due to concurrent reassemblies limit") \ _ (REASS_LIMIT_REACHED, "drops due to concurrent reassemblies limit") \
_ (REASS_TIMEOUT, "fragments dropped due to reassembly timeout") _ (REASS_TIMEOUT, "fragments dropped due to reassembly timeout") \
_ (REASS_INTERNAL_ERROR, "drops due to internal reassembly error")
typedef enum typedef enum
{ {

149
src/vnet/ip/ip6_reassembly.c
View File

File diff suppressed because it is too large Load Diff

5
test/test_reassembly.py
View File

@ -17,7 +17,8 @@ from vpp_gre_interface import VppGreInterface, VppGre6Interface
from vpp_ip import DpoProto from vpp_ip import DpoProto
from vpp_ip_route import VppIpRoute, VppRoutePath from vpp_ip_route import VppIpRoute, VppRoutePath
test_packet_count = 257 # 35 is enough to have >257 400-byte fragments
test_packet_count = 35
class TestIPv4Reassembly(VppTestCase): class TestIPv4Reassembly(VppTestCase):
@ -60,7 +61,7 @@ class TestIPv4Reassembly(VppTestCase):
@classmethod @classmethod
def create_stream(cls, packet_sizes, packet_count=test_packet_count): def create_stream(cls, packet_sizes, packet_count=test_packet_count):
"""Create input packet stream for defined interface. """Create input packet stream
:param list packet_sizes: Required packet sizes. :param list packet_sizes: Required packet sizes.
""" """