<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20294">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</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>Related: Iae854875a45dbc29cd46a267ccaf60f1f2ac2973<br>Related: SYS#4915<br>Change-Id: I740be0a401612bb5ed4e8ccd7f4be8176b936449<br>---<br>M include/osmocom/bsc/pcuif_proto.h<br>M src/osmo-bsc/pcu_sock.c<br>2 files changed, 28 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h</span><br><span>index 80d4f90..8f72602 100644</span><br><span>--- a/include/osmocom/bsc/pcuif_proto.h</span><br><span>+++ b/include/osmocom/bsc/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/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c</span><br><span>index 4e9f7bf..a1a1cfc 100644</span><br><span>--- a/src/osmo-bsc/pcu_sock.c</span><br><span>+++ b/src/osmo-bsc/pcu_sock.c</span><br><span>@@ -204,17 +204,25 @@</span><br><span> for (i = 0; i < ARRAY_SIZE(info_ind->nsvci); i++) {</span><br><span> nsvc = &bts->gprs.nsvc[i];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nsvc->remote.u.sa.sa_family == AF_INET6) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DPCU, LOGL_ERROR, "PCU does not support IPv6 NSVC but an IPv6 NSVC was configured!\n");</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (nsvc->remote.u.sa.sa_family != AF_INET)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> info_ind->nsvci[i] = nsvc->nsvci;</span><br><span> info_ind->local_port[i] = nsvc->local_port;</span><br><span style="color: hsl(0, 100%, 40%);">- info_ind->remote_port[i] = osmo_ntohs(nsvc->remote.u.sin.sin_port);</span><br><span style="color: hsl(0, 100%, 40%);">- info_ind->remote_ip[i] = osmo_ntohl(nsvc->remote.u.sin.sin_addr.s_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (nsvc->remote.u.sas.ss_family) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET:</span><br><span style="color: hsl(120, 100%, 40%);">+ info_ind->address_type[i] = PCU_IF_ADDR_TYPE_IPV4;</span><br><span style="color: hsl(120, 100%, 40%);">+ info_ind->remote_ip[i].v4 = nsvc->remote.u.sin.sin_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ info_ind->remote_port[i] = nsvc->remote.u.sin.sin_port;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET6:</span><br><span style="color: hsl(120, 100%, 40%);">+ info_ind->address_type[i] = PCU_IF_ADDR_TYPE_IPV6;</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&info_ind->remote_ip[i].v6,</span><br><span style="color: hsl(120, 100%, 40%);">+ &nsvc->remote.u.sin6.sin6_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(struct in6_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ info_ind->remote_port[i] = nsvc->remote.u.sin6.sin6_port;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ info_ind->address_type[i] = PCU_IF_ADDR_TYPE_UNSPEC;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> for (i = 0; i < ARRAY_SIZE(info_ind->trx); i++) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20294">change 20294</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-bsc/+/20294"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I740be0a401612bb5ed4e8ccd7f4be8176b936449 </div>
<div style="display:none"> Gerrit-Change-Number: 20294 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>