mptcp: add_addr: merge 'retry' v4 and v6

The only difference was the injected and faulty ADD_ADDR: if it is faulty, it doesn't really matter if it is in v4 or v6, the main point is to send an ADD_ADDR with the wrong IP. While at it, also add 'errors' in the name in preparation to other 'retry' scenarios. Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> (cherry picked from commit 70bd9c3) Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
multipath-tcp · Nov 7, 2022 · 121699f · 121699f
1 parent 99fc45e
commit 121699f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 35 deletions.
diff --git a/.../net/mptcp/add_addr/add_addr_retry_v6.pkt → .../mptcp/add_addr/add_addr_retry_errors.pkt b/.../net/mptcp/add_addr/add_addr_retry_v6.pkt → .../mptcp/add_addr/add_addr_retry_errors.pkt
@@ -18,7 +18,7 @@
 // ADD_ADDR is sent directly (>= 5.12), not after first data (< 5.12)
 +0       >   .  1:1(0)        ack 1           <add_address address_id=1  addr[saddr0] hmac=auto>
 // send echo with wrong address, expect a retry in 1s
-+0       <   .  1:1(0)        ack 1  win 257  <add_address address_id=1  addr[ep=inet6_addr("2001:db8::c1a0")] addr_echo>
++0       <   .  1:1(0)        ack 1  win 257  <add_address address_id=1  addr[ep=inet_addr("1.2.3.4")] addr_echo, dss dack4=1 ssn=1 dll=0 nocs>
 +1.0     >   .  1:1(0)        ack 1           <add_address address_id=1  addr[saddr0] hmac=auto>
 // send echo with wrong id, expect a retry in 1s
 +0       <   .  1:1(0)        ack 1  win 257  <add_address address_id=90 addr[saddr0] addr_echo>

diff --git a/gtests/net/mptcp/add_addr/add_addr_retry_v4.pkt b/gtests/net/mptcp/add_addr/add_addr_retry_v4.pkt