<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/20053">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP: mncc: Support IPv6 addresses (new version mncc 7)<br><br>Change-Id: I6002b648bcb2055dcbbdae3f688f6e2cb7282b7f<br>---<br>M include/osmocom/msc/mncc.h<br>M src/libmsc/gsm_04_08_cc.c<br>M src/libmsc/mncc_call.c<br>M src/libmsc/sdp_msg.c<br>M tests/mncc/mncc_test.ok<br>5 files changed, 22 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/53/20053/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h</span><br><span>index cf7d7ce..1c8aff0 100644</span><br><span>--- a/include/osmocom/msc/mncc.h</span><br><span>+++ b/include/osmocom/msc/mncc.h</span><br><span>@@ -28,6 +28,7 @@</span><br><span> #include <osmocom/gsm/mncc.h></span><br><span> </span><br><span> #include <stdint.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <netinet/in.h></span><br><span> </span><br><span> struct gsm_network;</span><br><span> struct msgb;</span><br><span>@@ -170,7 +171,7 @@</span><br><span> unsigned char data[0];</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define MNCC_SOCK_VERSION 6</span><br><span style="color: hsl(120, 100%, 40%);">+#define MNCC_SOCK_VERSION 7</span><br><span> struct gsm_mncc_hello {</span><br><span> uint32_t msg_type;</span><br><span> uint32_t version;</span><br><span>@@ -189,8 +190,7 @@</span><br><span> struct gsm_mncc_rtp {</span><br><span> uint32_t msg_type;</span><br><span> uint32_t callref;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t ip;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t port;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sockaddr_storage addr;</span><br><span> uint32_t payload_type;</span><br><span> uint32_t payload_msg_type;</span><br><span> char sdp[1024];</span><br><span>diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c</span><br><span>index 8cfb611..d385c83 100644</span><br><span>--- a/src/libmsc/gsm_04_08_cc.c</span><br><span>+++ b/src/libmsc/gsm_04_08_cc.c</span><br><span>@@ -1623,8 +1623,8 @@</span><br><span> rtp->callref = callref;</span><br><span> rtp->msg_type = cmd;</span><br><span> if (rtp_addr) {</span><br><span style="color: hsl(0, 100%, 40%);">- rtp->ip = osmo_htonl(inet_addr(rtp_addr->ip));</span><br><span style="color: hsl(0, 100%, 40%);">- rtp->port = rtp_addr->port;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_to_sockaddr(rtp_addr, &rtp->addr) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span> }</span><br><span> rtp->payload_type = payload_type;</span><br><span> rtp->payload_msg_type = payload_msg_type;</span><br><span>@@ -1746,7 +1746,8 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_str_from_32n(&rtp_addr, rtp->ip, rtp->port);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_from_sockaddr(&rtp_addr, &rtp->addr) <0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span> rtp_stream_set_remote_addr(rtps, &rtp_addr);</span><br><span> rtp_stream_commit(rtps);</span><br><span> return 0;</span><br><span>diff --git a/src/libmsc/mncc_call.c b/src/libmsc/mncc_call.c</span><br><span>index 0deb903..9d52952 100644</span><br><span>--- a/src/libmsc/mncc_call.c</span><br><span>+++ b/src/libmsc/mncc_call.c</span><br><span>@@ -303,11 +303,10 @@</span><br><span> .rtp = {</span><br><span> .msg_type = MNCC_RTP_CREATE,</span><br><span> .callref = mncc_call->callref,</span><br><span style="color: hsl(0, 100%, 40%);">- .port = rtp_local->port,</span><br><span> },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_sockaddr_str_to_32n(rtp_local, &mncc_msg.rtp.ip)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_to_sockaddr(rtp_local, &mncc_msg.rtp.addr)) {</span><br><span> mncc_call_error(mncc_call, "Failed to compose IP address " OSMO_SOCKADDR_STR_FMT "\n",</span><br><span> OSMO_SOCKADDR_STR_FMT_ARGS(rtp_local));</span><br><span> return false;</span><br><span>@@ -332,7 +331,7 @@</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_sockaddr_str_from_32n(&rtp, mncc_msg->ip, mncc_msg->port)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_sockaddr_str_from_sockaddr(&rtp, &mncc_msg->addr)) {</span><br><span> mncc_call_error(mncc_call, "Cannot RTP-CONNECT, invalid RTP IP:port in incoming MNCC message\n");</span><br><span> return false;</span><br><span> }</span><br><span>diff --git a/src/libmsc/sdp_msg.c b/src/libmsc/sdp_msg.c</span><br><span>index cc54249..6170e8e 100644</span><br><span>--- a/src/libmsc/sdp_msg.c</span><br><span>+++ b/src/libmsc/sdp_msg.c</span><br><span>@@ -168,15 +168,16 @@</span><br><span> const struct sdp_audio_codec *codec;</span><br><span> struct osmo_strbuf sb = { .buf = dst, .len = dst_size };</span><br><span> const char *ip = sdp->rtp.ip[0] ? sdp->rtp.ip : "0.0.0.0";</span><br><span style="color: hsl(120, 100%, 40%);">+ char ipv = osmo_ip_str_type(ip) == AF_INET6 ? '6' : '4';</span><br><span> </span><br><span> OSMO_STRBUF_PRINTF(sb,</span><br><span> "v=0\r\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "o=OsmoMSC 0 0 IN IP4 %s\r\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "o=OsmoMSC 0 0 IN IP%c %s\r\n"</span><br><span> "s=GSM Call\r\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "c=IN IP4 %s\r\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "c=IN IP%c %s\r\n"</span><br><span> "t=0 0\r\n"</span><br><span> "m=audio %d RTP/AVP",</span><br><span style="color: hsl(0, 100%, 40%);">- ip, ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ ipv, ip, ipv, ip,</span><br><span> sdp->rtp.port);</span><br><span> </span><br><span> /* Append all payload type numbers to 'm=audio <port> RTP/AVP 3 4 112' line */</span><br><span>diff --git a/tests/mncc/mncc_test.ok b/tests/mncc/mncc_test.ok</span><br><span>index 807904d..9334706 100644</span><br><span>--- a/tests/mncc/mncc_test.ok</span><br><span>+++ b/tests/mncc/mncc_test.ok</span><br><span>@@ -12,12 +12,12 @@</span><br><span> len zero: len=0 sdplen=-834 sdp=- rc=-22</span><br><span> </span><br><span> struct gsm_mncc_rtp:</span><br><span style="color: hsl(0, 100%, 40%);">-empty SDP: len=1048 sdplen=1024 sdp="\0" rc=0</span><br><span style="color: hsl(0, 100%, 40%);">-empty SDP, shortest possible: len=25 sdplen=1 sdp="\0" rc=0</span><br><span style="color: hsl(0, 100%, 40%);">-empty SDP, zero len: len=24 sdplen=0 sdp=- rc=-22</span><br><span style="color: hsl(0, 100%, 40%);">-terminated SDP str: len=1048 sdplen=1024 sdp="Privacy is a desirable marketing option\0" rc=0</span><br><span style="color: hsl(0, 100%, 40%);">-terminated SDP str, shortest possible: len=64 sdplen=40 sdp="Privacy is a desirable marketing option\0" rc=0</span><br><span style="color: hsl(0, 100%, 40%);">-terminated SDP str, but len excludes nul: len=63 sdplen=39 sdp="Privacy is a desirable marketing option" rc=-22</span><br><span style="color: hsl(0, 100%, 40%);">-terminated SDP str, but len too short: len=47 sdplen=23 sdp="Privacy is a desirable " rc=-22</span><br><span style="color: hsl(0, 100%, 40%);">-len way too short: len=10 sdplen=-14 sdp=- rc=-22</span><br><span style="color: hsl(0, 100%, 40%);">-len zero: len=0 sdplen=-24 sdp=- rc=-22</span><br><span style="color: hsl(120, 100%, 40%);">+empty SDP: len=1168 sdplen=1024 sdp="\0" rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+empty SDP, shortest possible: len=145 sdplen=1 sdp="\0" rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+empty SDP, zero len: len=144 sdplen=0 sdp=- rc=-22</span><br><span style="color: hsl(120, 100%, 40%);">+terminated SDP str: len=1168 sdplen=1024 sdp="Privacy is a desirable marketing option\0" rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+terminated SDP str, shortest possible: len=184 sdplen=40 sdp="Privacy is a desirable marketing option\0" rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+terminated SDP str, but len excludes nul: len=183 sdplen=39 sdp="Privacy is a desirable marketing option" rc=-22</span><br><span style="color: hsl(120, 100%, 40%);">+terminated SDP str, but len too short: len=167 sdplen=23 sdp="Privacy is a desirable " rc=-22</span><br><span style="color: hsl(120, 100%, 40%);">+len way too short: len=10 sdplen=-134 sdp=- rc=-22</span><br><span style="color: hsl(120, 100%, 40%);">+len zero: len=0 sdplen=-144 sdp=- rc=-22</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/20053">change 20053</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/osmo-msc/+/20053"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I6002b648bcb2055dcbbdae3f688f6e2cb7282b7f </div>
<div style="display:none"> Gerrit-Change-Number: 20053 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>