osmocom
/
libosmo-sccp
mirror of https://gerrit.osmocom.org/libosmo-sccp
11
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Introduce SS7 IPv6 support" 

This reverts commit 0b39f2cf7b.

Reason for revert:

Breaks ttcn test suites (at least for osmo-bsc) with osmo-stp error log:
"MTP-TRANSFER.req for DPC 187: no route!"

The breakage is fixed by only reverting the NULL -> "localhost" change
back to NULL. But the commit log indicated a reason for this, so rather
reverting the entire commit for now.

Change-Id: Ia97832f4e3ed646457d5c6eeba27352f1153edec
This commit is contained in:
Neels Hofmeyr 2020-08-28 08:07:31 +00:00
parent ce88150c05
commit ee81289297
5 changed files with 18 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/examples/osmo-stp-multihome.cfg
View File

@ -20,4 +20,3 @@ cs7 instance 0
accept-asp-connections dynamic-permitted
local-ip 127.0.0.2
local-ip 127.0.0.1
local-ip ::1

15
doc/manuals/vty/osmo-stp_vty_reference.xml
View File

@ -1741,18 +1741,16 @@
<param name='.TEXT' doc='Text until the end of the line' />
</params>
</command>
<command id='remote-ip (A.B.C.D|X:X::X:X)'>
<command id='remote-ip A.B.C.D'>
<params>
<param name='remote-ip' doc='Specify Remote IP Address of ASP' />
<param name='A.B.C.D' doc='Remote IPv4 Address of ASP' />
<param name='X:X::X:X' doc='Remote IPv6 Address of ASP' />
<param name='A.B.C.D' doc='Remote IP Address of ASP' />
</params>
</command>
<command id='local-ip (A.B.C.D|X:X::X:X)'>
<command id='local-ip A.B.C.D'>
<params>
<param name='local-ip' doc='Specify Local IP Address from which to contact ASP' />
<param name='A.B.C.D' doc='Local IPv4 Address from which to contact of ASP' />
<param name='X:X::X:X' doc='Local IPv6 Address from which to contact of ASP' />
<param name='A.B.C.D' doc='Local IP Address from which to contact of ASP' />
</params>
</command>
<command id='qos-class &lt;0-255&gt;'>
@ -1789,11 +1787,10 @@
</node>
<node id='config-cs7-listen'>
<name>config-cs7-listen</name>
<command id='local-ip (A.B.C.D|X:X::X:X)'>
<command id='local-ip A.B.C.D'>
<params>
<param name='local-ip' doc='Configure the Local IP Address for xUA' />
<param name='A.B.C.D' doc='IPv4 Address to use for XUA' />
<param name='X:X::X:X' doc='IPv6 Address to use for XUA' />
<param name='A.B.C.D' doc='IP Address to use for XUA' />
</params>
</command>
<command id='accept-asp-connections (pre-configured|dynamic-permitted)'>

19
src/osmo_ss7_vty.c
View File

@ -470,10 +470,9 @@ DEFUN(no_cs7_xua, no_cs7_xua_cmd,
}
DEFUN(xua_local_ip, xua_local_ip_cmd,
"local-ip " VTY_IPV46_CMD,
"local-ip A.B.C.D",
"Configure the Local IP Address for xUA\n"
"IPv4 Address to use for XUA\n"
"IPv6 Address to use for XUA\n")
"IP Address to use for XUA\n")
{
struct osmo_xua_server *xs = vty->index;
@ -624,10 +623,9 @@ DEFUN(no_cs7_asp, no_cs7_asp_cmd,
}
DEFUN(asp_local_ip, asp_local_ip_cmd,
"local-ip " VTY_IPV46_CMD,
"local-ip A.B.C.D",
"Specify Local IP Address from which to contact ASP\n"
"Local IPv4 Address from which to contact of ASP\n"
"Local IPv6 Address from which to contact of ASP\n")
"Local IP Address from which to contact of ASP\n")
{
struct osmo_ss7_asp *asp = vty->index;
osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, argv[0]);
@ -635,10 +633,9 @@ DEFUN(asp_local_ip, asp_local_ip_cmd,
}
DEFUN(asp_remote_ip, asp_remote_ip_cmd,
"remote-ip " VTY_IPV46_CMD,
"remote-ip A.B.C.D",
"Specify Remote IP Address of ASP\n"
"Remote IPv4 Address of ASP\n"
"Remote IPv6 Address of ASP\n")
"Remote IP Address of ASP\n")
{
struct osmo_ss7_asp *asp = vty->index;
osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, argv[0]);
@ -1809,10 +1806,10 @@ int osmo_ss7_vty_go_parent(struct vty *vty)
asp = vty->index;
/* If no local addr was set */
if (!asp->cfg.local.host_cnt)
osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "localhost");
osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, NULL);
/* If no remote addr was set */
if (!asp->cfg.remote.host_cnt)
osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "localhost");
osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "127.0.0.1");
osmo_ss7_asp_restart(asp);
vty->node = L_CS7_NODE;
vty->index = asp->inst;

4
tests/vty/ss7_asp_test.vty
View File

@ -215,8 +215,8 @@ ss7_asp_vty_test(config-cs7)# asp my-asp 12345 54321 m3ua
ss7_asp_vty_test(config-cs7-asp)# list
...
description .TEXT
remote-ip (A.B.C.D|X:X::X:X)
local-ip (A.B.C.D|X:X::X:X)
remote-ip A.B.C.D
local-ip A.B.C.D
qos-class <0-255>
role (sg|asp|ipsp)
sctp-role (client|server)

17
tests/vty/vty_test_runner.py
View File

@ -111,9 +111,7 @@ class TestVTYSTP(TestVTYBase):
# first check if STP is listening in required addresses:
found = False
for i in range(5):
if self.check_sctp_sock_local(['127.0.0.1', '127.0.0.2',
'0000:0000:0000:0000:0000:0000:0000:0001'],
2905):
if self.check_sctp_sock_local(['127.0.0.1', '127.0.0.2'], 2905):
found = True
break
else:
@ -124,7 +122,6 @@ class TestVTYSTP(TestVTYBase):
proto = socket.IPPROTO_SCTP
except AttributeError: # it seems to be not defined under python2?
proto = 132
# IPv4:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM, proto)
s.bind(('127.0.0.3', 0))
try:
@ -132,17 +129,7 @@ class TestVTYSTP(TestVTYBase):
except socket.error as msg:
s.close()
self.assertTrue(False)
print("Connected to STP through SCTP (IPv4)")
s.close()
# IPv6:
s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM, proto)
s.bind(('::1', 0))
try:
s.connect(('::1',2905))
except socket.error as msg:
s.close()
self.assertTrue(False)
print("Connected to STP through SCTP (IPv6)")
print("Connected to STP through SCTP")
s.close()
if __name__ == '__main__':