diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2015-12-06 23:12:02 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2015-12-07 13:37:15 +0100 |
| commit | d010c49407220f7efe55d50d1dbf261a70f756d2 (patch) | |
| tree | b28f32d25b3661cd4839b06df5bd3a3896b3576d /openbsc/tests/gtphub/gtphub_test.ok | |
| parent | bee75969cc90d3969dd23c1c79afc70755c87177 (diff) | |
gtphub: improve handling of restarted peer.
Handle peer restart earlier, so that all the tunnels are deleted by the restart
code path, instead of the first one being deleted due to reused TEI. That
caused confusing logging messages.
Also, when receiving Delete confirmations from the peer that didn't restart,
don't complain about unknown peer, but acknowledge and remove the half
invalidated tunnel. This means that the pending delete entry from the restart
code path is not needed / not used, so don't bother to add pending delete
entries upon peer restart.
The test test_peer_restarted_reusing_tei() hits the situation where a tunnel is
removed because of a reused TEI rather than the restart counter. Adjust the
test to expect the "out-of-band" delete request earlier on, and to still see
the half invalidated tunnel around. Enhance the test by adding the delete
response from the peer that didn't restart, and add a final tunnels_are()
verification.
Sponsored-by: On-Waves ehi
Diffstat (limited to 'openbsc/tests/gtphub/gtphub_test.ok')
| -rw-r--r-- | openbsc/tests/gtphub/gtphub_test.ok | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/openbsc/tests/gtphub/gtphub_test.ok b/openbsc/tests/gtphub/gtphub_test.ok index 4a6118f5b..e60d5f2b2 100644 --- a/openbsc/tests/gtphub/gtphub_test.ok +++ b/openbsc/tests/gtphub/gtphub_test.ok @@ -17,14 +17,17 @@ test_reused_tei test_peer_restarted - __wrap_gtphub_resolve_ggsn_addr(): returning GGSN addr from imsi 240010123456789 ni internet: 192.168.43.34 port 2123 -- __wrap_gtphub_resolve_ggsn_addr(): - returning GGSN addr from imsi 240010123456789 ni internet: 192.168.43.34 port 2123 Out-of-band gtphub_write(16): to 192.168.43.34 port 2123 32 14 00 08 00 00 07 65 6d 32 00 00 13 ff 14 00 +- __wrap_gtphub_resolve_ggsn_addr(): + returning GGSN addr from imsi 240010123456789 ni internet: 192.168.43.34 port 2123 test_peer_restarted_reusing_tei - __wrap_gtphub_resolve_ggsn_addr(): returning GGSN addr from imsi 240010123456789 ni internet: 192.168.43.34 port 2123 +Out-of-band gtphub_write(16): +to 192.168.43.34 port 2123 +32 14 00 08 00 00 07 65 6d 32 00 00 13 ff 14 00 - __wrap_gtphub_resolve_ggsn_addr(): returning GGSN addr from imsi 240010123456789 ni internet: 192.168.43.34 port 2123 test_user_data |