<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/19856">View Change</a></p><div style="white-space:pre-wrap">Approvals:
neels: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "Introduce SS7 IPv6 support"<br><br>This reverts commit 0b39f2cf7bab5cf3924d8b0b753f41b5b0cabd25.<br><br>Reason for revert:<br><br>Breaks ttcn test suites (at least for osmo-bsc) with osmo-stp error log:<br>"MTP-TRANSFER.req for DPC 187: no route!"<br><br>The breakage is fixed by only reverting the NULL -> "localhost" change<br>back to NULL. But the commit log indicated a reason for this, so rather<br>reverting the entire commit for now.<br><br>Change-Id: Ia97832f4e3ed646457d5c6eeba27352f1153edec<br>---<br>M doc/examples/osmo-stp-multihome.cfg<br>M doc/manuals/vty/osmo-stp_vty_reference.xml<br>M src/osmo_ss7_vty.c<br>M tests/vty/ss7_asp_test.vty<br>M tests/vty/vty_test_runner.py<br>5 files changed, 18 insertions(+), 38 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/examples/osmo-stp-multihome.cfg b/doc/examples/osmo-stp-multihome.cfg</span><br><span>index 64874da..5b0c84f 100644</span><br><span>--- a/doc/examples/osmo-stp-multihome.cfg</span><br><span>+++ b/doc/examples/osmo-stp-multihome.cfg</span><br><span>@@ -20,4 +20,3 @@</span><br><span> accept-asp-connections dynamic-permitted</span><br><span> local-ip 127.0.0.2</span><br><span> local-ip 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">- local-ip ::1</span><br><span>diff --git a/doc/manuals/vty/osmo-stp_vty_reference.xml b/doc/manuals/vty/osmo-stp_vty_reference.xml</span><br><span>index ff8103a..e904469 100644</span><br><span>--- a/doc/manuals/vty/osmo-stp_vty_reference.xml</span><br><span>+++ b/doc/manuals/vty/osmo-stp_vty_reference.xml</span><br><span>@@ -1741,18 +1741,16 @@</span><br><span> <param name='.TEXT' doc='Text until the end of the line' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='remote-ip (A.B.C.D|X:X::X:X)'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='remote-ip A.B.C.D'></span><br><span> <params></span><br><span> <param name='remote-ip' doc='Specify Remote IP Address of ASP' /></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='A.B.C.D' doc='Remote IPv4 Address of ASP' /></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='X:X::X:X' doc='Remote IPv6 Address of ASP' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='A.B.C.D' doc='Remote IP Address of ASP' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='local-ip (A.B.C.D|X:X::X:X)'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='local-ip A.B.C.D'></span><br><span> <params></span><br><span> <param name='local-ip' doc='Specify Local IP Address from which to contact ASP' /></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='A.B.C.D' doc='Local IPv4 Address from which to contact of ASP' /></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='X:X::X:X' doc='Local IPv6 Address from which to contact of ASP' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='A.B.C.D' doc='Local IP Address from which to contact of ASP' /></span><br><span> </params></span><br><span> </command></span><br><span> <command id='qos-class <0-255>'></span><br><span>@@ -1789,11 +1787,10 @@</span><br><span> </node></span><br><span> <node id='config-cs7-listen'></span><br><span> <name>config-cs7-listen</name></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='local-ip (A.B.C.D|X:X::X:X)'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='local-ip A.B.C.D'></span><br><span> <params></span><br><span> <param name='local-ip' doc='Configure the Local IP Address for xUA' /></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='A.B.C.D' doc='IPv4 Address to use for XUA' /></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='X:X::X:X' doc='IPv6 Address to use for XUA' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='A.B.C.D' doc='IP Address to use for XUA' /></span><br><span> </params></span><br><span> </command></span><br><span> <command id='accept-asp-connections (pre-configured|dynamic-permitted)'></span><br><span>diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c</span><br><span>index fad93f5..9c31c00 100644</span><br><span>--- a/src/osmo_ss7_vty.c</span><br><span>+++ b/src/osmo_ss7_vty.c</span><br><span>@@ -470,10 +470,9 @@</span><br><span> }</span><br><span> </span><br><span> DEFUN(xua_local_ip, xua_local_ip_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "local-ip " VTY_IPV46_CMD,</span><br><span style="color: hsl(120, 100%, 40%);">+ "local-ip A.B.C.D",</span><br><span> "Configure the Local IP Address for xUA\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "IPv4 Address to use for XUA\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "IPv6 Address to use for XUA\n")</span><br><span style="color: hsl(120, 100%, 40%);">+ "IP Address to use for XUA\n")</span><br><span> {</span><br><span> struct osmo_xua_server *xs = vty->index;</span><br><span> </span><br><span>@@ -624,10 +623,9 @@</span><br><span> }</span><br><span> </span><br><span> DEFUN(asp_local_ip, asp_local_ip_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "local-ip " VTY_IPV46_CMD,</span><br><span style="color: hsl(120, 100%, 40%);">+ "local-ip A.B.C.D",</span><br><span> "Specify Local IP Address from which to contact ASP\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Local IPv4 Address from which to contact of ASP\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Local IPv6 Address from which to contact of ASP\n")</span><br><span style="color: hsl(120, 100%, 40%);">+ "Local IP Address from which to contact of ASP\n")</span><br><span> {</span><br><span> struct osmo_ss7_asp *asp = vty->index;</span><br><span> osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, argv[0]);</span><br><span>@@ -635,10 +633,9 @@</span><br><span> }</span><br><span> </span><br><span> DEFUN(asp_remote_ip, asp_remote_ip_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "remote-ip " VTY_IPV46_CMD,</span><br><span style="color: hsl(120, 100%, 40%);">+ "remote-ip A.B.C.D",</span><br><span> "Specify Remote IP Address of ASP\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Remote IPv4 Address of ASP\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Remote IPv6 Address of ASP\n")</span><br><span style="color: hsl(120, 100%, 40%);">+ "Remote IP Address of ASP\n")</span><br><span> {</span><br><span> struct osmo_ss7_asp *asp = vty->index;</span><br><span> osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, argv[0]);</span><br><span>@@ -1809,10 +1806,10 @@</span><br><span> asp = vty->index;</span><br><span> /* If no local addr was set */</span><br><span> if (!asp->cfg.local.host_cnt)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "localhost");</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, NULL);</span><br><span> /* If no remote addr was set */</span><br><span> if (!asp->cfg.remote.host_cnt)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "localhost");</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "127.0.0.1");</span><br><span> osmo_ss7_asp_restart(asp);</span><br><span> vty->node = L_CS7_NODE;</span><br><span> vty->index = asp->inst;</span><br><span>diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty</span><br><span>index ee1b3e5..7411b1f 100644</span><br><span>--- a/tests/vty/ss7_asp_test.vty</span><br><span>+++ b/tests/vty/ss7_asp_test.vty</span><br><span>@@ -215,8 +215,8 @@</span><br><span> ss7_asp_vty_test(config-cs7-asp)# list</span><br><span> ...</span><br><span> description .TEXT</span><br><span style="color: hsl(0, 100%, 40%);">- remote-ip (A.B.C.D|X:X::X:X)</span><br><span style="color: hsl(0, 100%, 40%);">- local-ip (A.B.C.D|X:X::X:X)</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip A.B.C.D</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip A.B.C.D</span><br><span> qos-class <0-255></span><br><span> role (sg|asp|ipsp)</span><br><span> sctp-role (client|server)</span><br><span>diff --git a/tests/vty/vty_test_runner.py b/tests/vty/vty_test_runner.py</span><br><span>index dff26c3..605bc93 100755</span><br><span>--- a/tests/vty/vty_test_runner.py</span><br><span>+++ b/tests/vty/vty_test_runner.py</span><br><span>@@ -111,9 +111,7 @@</span><br><span> # first check if STP is listening in required addresses:</span><br><span> found = False</span><br><span> for i in range(5):</span><br><span style="color: hsl(0, 100%, 40%);">- if self.check_sctp_sock_local(['127.0.0.1', '127.0.0.2',</span><br><span style="color: hsl(0, 100%, 40%);">- '0000:0000:0000:0000:0000:0000:0000:0001'],</span><br><span style="color: hsl(0, 100%, 40%);">- 2905):</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.check_sctp_sock_local(['127.0.0.1', '127.0.0.2'], 2905):</span><br><span> found = True</span><br><span> break</span><br><span> else:</span><br><span>@@ -124,7 +122,6 @@</span><br><span> proto = socket.IPPROTO_SCTP</span><br><span> except AttributeError: # it seems to be not defined under python2?</span><br><span> proto = 132</span><br><span style="color: hsl(0, 100%, 40%);">- # IPv4:</span><br><span> s = socket.socket(socket.AF_INET, socket.SOCK_STREAM, proto)</span><br><span> s.bind(('127.0.0.3', 0))</span><br><span> try:</span><br><span>@@ -132,17 +129,7 @@</span><br><span> except socket.error as msg:</span><br><span> s.close()</span><br><span> self.assertTrue(False)</span><br><span style="color: hsl(0, 100%, 40%);">- print("Connected to STP through SCTP (IPv4)")</span><br><span style="color: hsl(0, 100%, 40%);">- s.close()</span><br><span style="color: hsl(0, 100%, 40%);">- # IPv6:</span><br><span style="color: hsl(0, 100%, 40%);">- s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM, proto)</span><br><span style="color: hsl(0, 100%, 40%);">- s.bind(('::1', 0))</span><br><span style="color: hsl(0, 100%, 40%);">- try:</span><br><span style="color: hsl(0, 100%, 40%);">- s.connect(('::1',2905))</span><br><span style="color: hsl(0, 100%, 40%);">- except socket.error as msg:</span><br><span style="color: hsl(0, 100%, 40%);">- s.close()</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertTrue(False)</span><br><span style="color: hsl(0, 100%, 40%);">- print("Connected to STP through SCTP (IPv6)")</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Connected to STP through SCTP")</span><br><span> s.close()</span><br><span> </span><br><span> if __name__ == '__main__':</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/19856">change 19856</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmo-sccp/+/19856"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia97832f4e3ed646457d5c6eeba27352f1153edec </div>
<div style="display:none"> Gerrit-Change-Number: 19856 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>