Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion tests/marine/test_marine.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"""
import pytest
from typing import List, Union, Optional, Dict
from marine.marine import Marine
from marine.marine import Marine, MarineFieldsValidationResult
from marine.marine_pool import MarinePool

from pypacker.layer12 import ethernet, arp, radiotap, ieee80211, llc
Expand Down Expand Up @@ -978,6 +978,23 @@ def test_validate_fields_with_field_template(marine_instance: Marine):
)


def test_validate_fields_with_field_of_length_23(marine_instance: Marine):
"""
We did not allocate err_msg in parse_output_fields in marine.c properly,
and fields of length (23 + 16*n) specifically would cause an error.
This error was probably was caused by overriding memory that was used by the allocator.
"""
fields = ["a" * 23]
assert marine_instance.validate_fields(fields) == MarineFieldsValidationResult(
False, fields
)


def test_validate_fields_errors_order(marine_instance: Marine):
fields = ["wrong", "this too", "wtf"]
assert marine_instance.validate_fields(fields).errors == fields


def test_auto_encap_on_empty_fields(marine_instance: Marine):
assert marine_instance._detect_encap(None) == encap_consts.ENCAP_ETHERNET

Expand All @@ -1001,3 +1018,10 @@ def test_report_fields(marine_instance: Marine, capfd: pytest.CaptureFixture):
out = capfd.readouterr().out
assert "eth.src" in out
assert "ip.src" in out


def test_parse_fields_preserves_order(marine_instance: Marine, tcp_packet: bytes):
assert marine_instance.parse(tcp_packet, fields=["udp.srcport", "tcp.srcport"]) == {
"udp.srcport": None,
"tcp.srcport": "16424",
}