<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/21728">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: follow ns2 dialect changes<br><br>NS2 introduce a ns dialect to differentiate<br>between the 4 possible dialects.<br><br>Related: OS#4472, OS#4890<br>Depends: libosmocore.git Ia118bb6f994845d84db09de7a94856f5ca573404<br>Change-Id: I16dc82c38eb75c2b9d1197640a955fec7df84efc<br>---<br>M src/bts.h<br>M src/gprs_bssgp_pcu.cpp<br>M src/pcu_vty.c<br>3 files changed, 13 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index fd52067..055b131 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -23,17 +23,23 @@</span><br><span> </span><br><span> #ifdef __cplusplus</span><br><span> extern "C" {</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> #include <osmocom/core/rate_ctr.h></span><br><span> #include <osmocom/core/stat_item.h></span><br><span> #include <osmocom/core/tdef.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gprs/gprs_ns2.h></span><br><span> #include <osmocom/gsm/l1sap.h></span><br><span> #include <osmocom/gsm/protocol/gsm_04_08.h></span><br><span> #include <osmocom/gsm/gsm48.h></span><br><span> #include "mslot_class.h"</span><br><span> #include "gsm_rlcmac.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __cplusplus</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __cplusplus</span><br><span> #include "poll_controller.h"</span><br><span> #include "sba.h"</span><br><span> #include "tbf.h"</span><br><span>@@ -170,7 +176,7 @@</span><br><span> char *pcu_sock_path;</span><br><span> </span><br><span> /* Are we talking Gb with IP-SNS (true) or classic Gb? */</span><br><span style="color: hsl(0, 100%, 40%);">- bool gb_dialect_sns;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gprs_ns2_dialect ns_dialect;</span><br><span> </span><br><span> /* Packet Application Information (3GPP TS 44.060 11.2.47, usually ETWS primary message). We don't need to store</span><br><span> * more than one message, because they get sent so rarely. */</span><br><span>diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp</span><br><span>index 934d8fc..4d24d2e 100644</span><br><span>--- a/src/gprs_bssgp_pcu.cpp</span><br><span>+++ b/src/gprs_bssgp_pcu.cpp</span><br><span>@@ -984,7 +984,7 @@</span><br><span> bts->nse = gprs_ns2_nse_by_nsei(bts->nsi, nsei);</span><br><span> if (!bts->nse)</span><br><span> bts->nse = gprs_ns2_create_nse(bts->nsi, nsei,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS2_LL_UDP);</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_LL_UDP, bts->ns_dialect);</span><br><span> </span><br><span> if (!bts->nse) {</span><br><span> LOGP(DBSSGP, LOGL_ERROR, "Failed to create NSE\n");</span><br><span>@@ -997,7 +997,7 @@</span><br><span> continue;</span><br><span> </span><br><span> /* FIXME: for SNS we just use the first successful NS-VC instead of all for the initial connect */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->gb_dialect_sns) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->ns_dialect == NS2_DIALECT_SNS) {</span><br><span> rc = gprs_ns2_ip_connect_sns(bind[i], &remote[i], nsei);</span><br><span> if (!rc)</span><br><span> return rc;</span><br><span>@@ -1066,7 +1066,7 @@</span><br><span> gprs_ns2_free_nses(bts->nsi);</span><br><span> gprs_ns2_free_binds(bts->nsi);</span><br><span> rc = ns_create_nsvc(bts, nsei, local, remote, nsvci, valid);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (bts->gb_dialect_sns) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (bts->ns_dialect == NS2_DIALECT_SNS) {</span><br><span> /* SNS: check if the initial nsvc is the same, if not recreate it */</span><br><span> const struct osmo_sockaddr *initial = gprs_ns2_nse_sns_remote(bts->nse);</span><br><span> for (unsigned int i = 0; i < PCU_IF_NUM_NSVC; i++) {</span><br><span>diff --git a/src/pcu_vty.c b/src/pcu_vty.c</span><br><span>index bf45686..800079c 100644</span><br><span>--- a/src/pcu_vty.c</span><br><span>+++ b/src/pcu_vty.c</span><br><span>@@ -246,7 +246,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->gb_dialect_sns)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->ns_dialect == NS2_DIALECT_SNS)</span><br><span> vty_out(vty, " gb-dialect ip-sns%s", VTY_NEWLINE);</span><br><span> else</span><br><span> vty_out(vty, " gb-dialect classic%s", VTY_NEWLINE);</span><br><span>@@ -1131,11 +1131,9 @@</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span> </span><br><span> if (!strcmp(argv[0], "ip-sns")) {</span><br><span style="color: hsl(0, 100%, 40%);">- bts->gb_dialect_sns = true;</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns2_vty_force_vc_mode(true, NS2_VC_MODE_ALIVE, "gb-dialect is ip-sns");</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->ns_dialect = NS2_DIALECT_SNS;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- bts->gb_dialect_sns = false;</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns2_vty_force_vc_mode(false, 0, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->ns_dialect = NS2_DIALECT_IPACCESS;</span><br><span> }</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/21728">change 21728</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/+/21728"/><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: I16dc82c38eb75c2b9d1197640a955fec7df84efc </div>
<div style="display:none"> Gerrit-Change-Number: 21728 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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>