diff options
| author | Maciej Żenczykowski <maze@google.com> | 2022-12-23 07:50:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-12-23 07:50:36 +0000 |
| commit | aa41db8bbc2f90681eeb2ef0e2c6b0baf8468421 (patch) | |
| tree | e71a9c952a9db60f4a0793f6b1c21e54b79ed9a9 | |
| parent | 35274362d479472d3891c085b3f326c87a40f32c (diff) | |
| parent | 7f8083bf049ae47053c9b5c665eba4b8baf74707 (diff) | |
Merge "Manually generate ESP headers to work with older scapy versions."
| -rwxr-xr-x | net/test/xfrm_test.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/net/test/xfrm_test.py b/net/test/xfrm_test.py index 8672762..4c5bff5 100755 --- a/net/test/xfrm_test.py +++ b/net/test/xfrm_test.py @@ -444,20 +444,24 @@ class XfrmFunctionalTest(xfrm_base.XfrmLazyTest): datalen = len(data) data += xfrm_base.GetEspTrailer(len(data), IPPROTO_UDP) self.assertEqual(32, len(data) + 8) + # TODO: update scapy and use scapy.ESP instead of manually generating ESP header. + inner_pkt = xfrm.EspHdr(spi=TEST_SPI, seqnum=1).Pack() + bytes( + scapy.UDP(sport=443, dport=32123) / data) input_pkt = (IpType(src=remoteaddr, dst=myaddr) / scapy.UDP(sport=4500, dport=encap_port) / - scapy.ESP(spi=TEST_SPI, seq=1) / - scapy.UDP(sport=443, dport=32123) / data) + inner_pkt) else: # TODO: test IPv4 in IPv6 encap and vice versa. data = b"" # Empty UDP payload datalen = len(data) + {4: 20, 6: 40}[version] data += xfrm_base.GetEspTrailer(len(data), IPPROTO_UDP) + # TODO: update scapy and use scapy.ESP instead of manually generating ESP header. + inner_pkt = xfrm.EspHdr(spi=TEST_SPI, seqnum=1).Pack() + bytes( + IpType(src=remoteaddr, dst=myaddr) / + scapy.UDP(sport=443, dport=32123) / data) input_pkt = (IpType(src=remoteaddr, dst=myaddr) / scapy.UDP(sport=4500, dport=encap_port) / - scapy.ESP(spi=TEST_SPI, seq=1) / - IpType(src=remoteaddr, dst=myaddr) / - scapy.UDP(sport=443, dport=32123) / data) + inner_pkt) # input_pkt.show2() self.ReceivePacketOn(netid, input_pkt) |