<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20238">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcuif_proto: version 10: add support for IPv6 NSVCs<br><br>Introduce a address_type in the NSVC configuration pass the given<br>protocol. The remote_ip is network byte order, the default<br>encoding for in_addr and in6_addr.<br><br>Change-Id: Ia0852f9f4395f1248b39363ef90f6f5673b24e2f<br>Related: SYS#4915<br>---<br>M include/osmocom/pcu/pcuif_proto.h<br>M src/pcu_l1_if.cpp<br>2 files changed, 24 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h</span><br><span>index 61c63af..82d761d 100644</span><br><span>--- a/include/osmocom/pcu/pcuif_proto.h</span><br><span>+++ b/include/osmocom/pcu/pcuif_proto.h</span><br><span>@@ -2,6 +2,7 @@</span><br><span> #define _PCUIF_PROTO_H</span><br><span> </span><br><span> #include <osmocom/gsm/l1sap.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <arpa/inet.h></span><br><span> </span><br><span> #define PCU_SOCK_DEFAULT "/tmp/pcu_bts"</span><br><span> </span><br><span>@@ -50,6 +51,11 @@</span><br><span> #define PCU_IF_FLAG_MCS8 (1 << 27)</span><br><span> #define PCU_IF_FLAG_MCS9 (1 << 28)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* NSVC address type */</span><br><span style="color: hsl(120, 100%, 40%);">+#define PCU_IF_ADDR_TYPE_UNSPEC 0x00 /* No address - empty entry */</span><br><span style="color: hsl(120, 100%, 40%);">+#define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */</span><br><span style="color: hsl(120, 100%, 40%);">+#define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> enum gsm_pcu_if_text_type {</span><br><span> PCU_VERSION,</span><br><span> PCU_OML_ALERT,</span><br><span>@@ -164,7 +170,11 @@</span><br><span> uint16_t nsvci[2];</span><br><span> uint16_t local_port[2];</span><br><span> uint16_t remote_port[2];</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t remote_ip[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t address_type[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ union {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct in_addr v4;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct in6_addr v6;</span><br><span style="color: hsl(120, 100%, 40%);">+ } remote_ip[2];</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span> struct gsm_pcu_if_act_req {</span><br><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index c2cc2c1..21eacfd 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -567,11 +567,22 @@</span><br><span> LOGP(DL1IF, LOGL_DEBUG, " nsvci=%d\n", info_ind->nsvci[0]);</span><br><span> LOGP(DL1IF, LOGL_DEBUG, " local_port=%d\n", info_ind->local_port[0]);</span><br><span> LOGP(DL1IF, LOGL_DEBUG, " remote_port=%d\n", info_ind->remote_port[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- ia.s_addr = htonl(info_ind->remote_ip[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ ia.s_addr = info_ind->remote_ip[0].v4.s_addr;</span><br><span> LOGP(DL1IF, LOGL_DEBUG, " remote_ip=%s\n", inet_ntoa(ia));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ switch (info_ind->address_type[0]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case PCU_IF_ADDR_TYPE_IPV4:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case PCU_IF_ADDR_TYPE_IPV6:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_ERROR, "This PCU does not support IPv6 NSVC!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ goto bssgp_failed;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_ERROR, "No IPv4 NSVC given!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ goto bssgp_failed;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> pcu = gprs_bssgp_create_and_connect(bts, info_ind->local_port[0],</span><br><span style="color: hsl(0, 100%, 40%);">- info_ind->remote_ip[0], info_ind->remote_port[0],</span><br><span style="color: hsl(120, 100%, 40%);">+ ntohl(info_ind->remote_ip[0].v4.s_addr), info_ind->remote_port[0],</span><br><span> info_ind->nsei, info_ind->nsvci[0], info_ind->bvci,</span><br><span> info_ind->mcc, info_ind->mnc, info_ind->mnc_3_digits, info_ind->lac, info_ind->rac,</span><br><span> info_ind->cell_id);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20238">change 20238</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-pcu/+/20238"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia0852f9f4395f1248b39363ef90f6f5673b24e2f </div>
<div style="display:none"> Gerrit-Change-Number: 20238 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@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: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>