<p>lynxis lazus <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/PCUIF_Types: version 10: support IPv6 NSVC addr<br><br>Change-Id: I13b03c380edc2dc609c5e4053462a3cd6f78ce72<br>Tweaked-By: Vadim Yanitskiy <vyanitskiy@sysmocom.de><br>Related: SYS#4915<br>---<br>M library/NS_Emulation.ttcn<br>M library/PCUIF_Types.ttcn<br>M pcu/PCU_Tests.ttcn<br>M pcu/SGSN_Components.ttcn<br>M sgsn/gen_links.sh<br>5 files changed, 59 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn</span><br><span>index 697a482..6f9bc39 100644</span><br><span>--- a/library/NS_Emulation.ttcn</span><br><span>+++ b/library/NS_Emulation.ttcn</span><br><span>@@ -16,6 +16,7 @@</span><br><span> import from NS_CodecPort all;</span><br><span> import from NS_CodecPort_CtrlFunct all;</span><br><span> import from IPL4asp_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from PCUIF_Types all;</span><br><span> </span><br><span> type record NsUnitdataRequest {</span><br><span> BssgpBvci bvci,</span><br><span>@@ -124,6 +125,7 @@</span><br><span> }</span><br><span> </span><br><span> type record NSConfiguration {</span><br><span style="color: hsl(120, 100%, 40%);">+ PCUIF_AddrType remote_proto,</span><br><span> PortNumber local_udp_port,</span><br><span> charstring local_ip,</span><br><span> PortNumber remote_udp_port,</span><br><span>diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn</span><br><span>index f0200af..b400267 100644</span><br><span>--- a/library/PCUIF_Types.ttcn</span><br><span>+++ b/library/PCUIF_Types.ttcn</span><br><span>@@ -13,6 +13,7 @@</span><br><span> </span><br><span> import from General_Types all;</span><br><span> import from Osmocom_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from Native_Functions all;</span><br><span> </span><br><span> modulepar {</span><br><span> /* PCUIF version supported by the IUT */</span><br><span>@@ -212,13 +213,34 @@</span><br><span> record length(2) of uint16_t nsvci,</span><br><span> record length(2) of uint16_t local_port,</span><br><span> record length(2) of uint16_t remote_port,</span><br><span style="color: hsl(0, 100%, 40%);">- record length(2) of OCT4 remote_ip</span><br><span style="color: hsl(120, 100%, 40%);">+ PCUIF_RemoteAddr remote_addr</span><br><span> } with {</span><br><span> /* NOTE: TITAN is not smart enough to handle 'version < 10' and 'version > 9',</span><br><span> * so we cannot support more than two versions at the same time here. Sigh. */</span><br><span> variant (trx) "CROSSTAG(v09, version = 9; v10, version = 10)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (remote_addr) "CROSSTAG(v09, version = 9; v10, version = 10)"</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+type union PCUIF_RemoteAddr {</span><br><span style="color: hsl(120, 100%, 40%);">+ PCUIF_RemoteAddrV09 v09,</span><br><span style="color: hsl(120, 100%, 40%);">+ PCUIF_RemoteAddrV10 v10</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant "" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+type record PCUIF_RemoteAddrV09 {</span><br><span style="color: hsl(120, 100%, 40%);">+ record length(2) of OCT4 addr</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant "" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+type enumerated PCUIF_AddrType {</span><br><span style="color: hsl(120, 100%, 40%);">+ PCUIF_ADDR_TYPE_UNSPEC ('00'O),</span><br><span style="color: hsl(120, 100%, 40%);">+ PCUIF_ADDR_TYPE_IPV4 ('04'O),</span><br><span style="color: hsl(120, 100%, 40%);">+ PCUIF_ADDR_TYPE_IPV6 ('29'O)</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant "FIELDLENGTH(8)" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+type record PCUIF_RemoteAddrV10 {</span><br><span style="color: hsl(120, 100%, 40%);">+ record length(2) of PCUIF_AddrType addr_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ record length(2) of octetstring addr length(16)</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant "" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type record PCUIF_act_req {</span><br><span> uint8_t is_activate,</span><br><span> uint8_t trx_nr,</span><br><span>@@ -839,7 +861,7 @@</span><br><span> nsvci := ?,</span><br><span> local_port := ?,</span><br><span> remote_port := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := ?</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_addr := ?</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -947,5 +969,34 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* TODO: second (redundant) NSVC connection is not (yet) supported */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_PCUIF_ver_INFO_RemoteAddr(PCUIF_AddrType addr_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ charstring addr)</span><br><span style="color: hsl(120, 100%, 40%);">+return PCUIF_RemoteAddr {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PCUIF_RemoteAddr remote_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (PCUIF_Types.mp_pcuif_version >= 10) {</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_addr.v10.addr_type[0] := addr_type;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (addr_type == PCUIF_ADDR_TYPE_IPV4) {</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_addr.v10.addr[0] := f_inet_addr(addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_addr.v10.addr[0] := f_inet6_addr(addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_addr.v10.addr_type[1] := PCUIF_ADDR_TYPE_UNSPEC;</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_addr.v10.addr[1] := f_pad_oct(''O, 16, '00'O);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (addr_type != PCUIF_ADDR_TYPE_IPV4) {</span><br><span style="color: hsl(120, 100%, 40%);">+ testcase.stop("NSVC address type := ", addr_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ "is not supported in version := ",</span><br><span style="color: hsl(120, 100%, 40%);">+ PCUIF_Types.mp_pcuif_version);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* v9 requires the IP in host byte order */</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_addr.v09.addr[0] := f_inet_haddr(addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_addr.v09.addr[0] := f_pad_oct(''O, 4, '00'O);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return remote_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> } with { encode "RAW" variant "BYTEORDER(first)" };</span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index df2964c..f5176d4 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -92,7 +92,8 @@</span><br><span> nsvci := { mp_nsconfig.nsvci, 0 },</span><br><span> local_port := { mp_nsconfig.remote_udp_port, 0 },</span><br><span> remote_port := { mp_nsconfig.local_udp_port, 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := { f_inet_haddr(mp_nsconfig.local_ip) , '00000000'O }</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_addr := f_PCUIF_ver_INFO_RemoteAddr(</span><br><span style="color: hsl(120, 100%, 40%);">+ mp_nsconfig.remote_proto, mp_nsconfig.local_ip)</span><br><span> }</span><br><span> </span><br><span> type record lqual_range {</span><br><span>diff --git a/pcu/SGSN_Components.ttcn b/pcu/SGSN_Components.ttcn</span><br><span>index 4bbd18c..7bf8705 100644</span><br><span>--- a/pcu/SGSN_Components.ttcn</span><br><span>+++ b/pcu/SGSN_Components.ttcn</span><br><span>@@ -35,6 +35,7 @@</span><br><span> };</span><br><span> </span><br><span> NSConfiguration mp_nsconfig := {</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_proto := PCUIF_ADDR_TYPE_IPV4,</span><br><span> local_udp_port := 23000,</span><br><span> local_ip := "127.0.0.1",</span><br><span> remote_udp_port := 21000,</span><br><span>diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh</span><br><span>index bd3a7ea..541670d 100755</span><br><span>--- a/sgsn/gen_links.sh</span><br><span>+++ b/sgsn/gen_links.sh</span><br><span>@@ -84,7 +84,7 @@</span><br><span> </span><br><span> DIR=../library</span><br><span> FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc "</span><br><span style="color: hsl(0, 100%, 40%);">-FILES+="NS_Emulation.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc "</span><br><span style="color: hsl(120, 100%, 40%);">+FILES+="NS_Emulation.ttcn PCUIF_Types.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc "</span><br><span> FILES+="BSSGP_Emulation.ttcn Osmocom_Gb_Types.ttcn "</span><br><span> FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn "</span><br><span> FILES+="Osmocom_VTY_Functions.ttcn "</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420">change 19420</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-ttcn3-hacks/+/19420"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I13b03c380edc2dc609c5e4053462a3cd6f78ce72 </div>
<div style="display:none"> Gerrit-Change-Number: 19420 </div>
<div style="display:none"> Gerrit-PatchSet: 8 </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: 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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>