<p>daniel has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21460">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Change generic LOG messageas so BVCI/NSEI fmt is consistent<br><br>Fixes: SYS#5233<br>Change-Id: I93296353dd964602699480faae1248096e331c6a<br>---<br>M src/gbproxy/gb_proxy.c<br>M src/gbproxy/gb_proxy_main.c<br>2 files changed, 18 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/60/21460/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c</span><br><span>index af8c5fc..bad3838 100644</span><br><span>--- a/src/gbproxy/gb_proxy.c</span><br><span>+++ b/src/gbproxy/gb_proxy.c</span><br><span>@@ -570,7 +570,7 @@</span><br><span> </span><br><span> if (!peer) {</span><br><span> LOGP(DLLC, LOGL_INFO,</span><br><span style="color: hsl(0, 100%, 40%);">- "NSEI=%d(%s) patching: didn't find peer for message, "</span><br><span style="color: hsl(120, 100%, 40%);">+ "NSE(%05u)(%s) patching: didn't find peer for message, "</span><br><span> "PDU %d\n",</span><br><span> msgb_nsei(msg), parse_ctx->to_bss ? "BSS" : "SGSN",</span><br><span> parse_ctx->pdu_type);</span><br><span>@@ -878,7 +878,7 @@</span><br><span> </span><br><span> peer = gbproxy_peer_by_bvci(cfg, ptp_bvci);</span><br><span> if (!peer) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_ERROR, "BVCI=%u: Cannot find BSS\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_ERROR, "BVC(%05u/??) Cannot find BSS\n",</span><br><span> ptp_bvci);</span><br><span> rate_ctr_inc(&cfg->ctrg->ctr[GBPROX_GLOB_CTR_INV_BVCI]);</span><br><span> return -ENOENT;</span><br><span>@@ -908,7 +908,7 @@</span><br><span> </span><br><span> peer = gbproxy_peer_by_bvci(cfg, ptp_bvci);</span><br><span> if (!peer) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_ERROR, "BVCI=%u: Cannot find BSS\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_ERROR, "BVC(%05u/??) Cannot find BSS\n",</span><br><span> ptp_bvci);</span><br><span> rate_ctr_inc(&cfg->ctrg->ctr[GBPROX_GLOB_CTR_INV_BVCI]);</span><br><span> return -ENOENT;</span><br><span>@@ -934,8 +934,8 @@</span><br><span> </span><br><span> peer = gbproxy_peer_by_bvci(cfg, ns_bvci);</span><br><span> if (!peer) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_NOTICE, "Didn't find peer for "</span><br><span style="color: hsl(0, 100%, 40%);">- "BVCI=%u for PTP message from NSEI=%u (BSS), "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_NOTICE, "BVC(%05u/??) Didn't find peer "</span><br><span style="color: hsl(120, 100%, 40%);">+ "for PTP message from NSE(%05u/BSS), "</span><br><span> "discarding message\n",</span><br><span> ns_bvci, nsei);</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_UNKNOWN_BVCI,</span><br><span>@@ -978,8 +978,8 @@</span><br><span> /* Send status messages before patching */</span><br><span> </span><br><span> if (!peer) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_INFO, "Didn't find peer for "</span><br><span style="color: hsl(0, 100%, 40%);">- "BVCI=%u for message from NSEI=%u (SGSN)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_INFO, "BVC(%05u/??) Didn't find peer for "</span><br><span style="color: hsl(120, 100%, 40%);">+ "for message from NSE(%05u/SGSN)\n",</span><br><span> ns_bvci, nsei);</span><br><span> rate_ctr_inc(&cfg->ctrg-></span><br><span> ctr[GBPROX_GLOB_CTR_INV_BVCI]);</span><br><span>@@ -1029,7 +1029,7 @@</span><br><span> int rc;</span><br><span> </span><br><span> if (ns_bvci != 0 && ns_bvci != 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_NOTICE, "NSEI=%u BVCI=%u is not signalling\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u) BVCI=%05u is not signalling\n",</span><br><span> nsei, ns_bvci);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span>@@ -1038,7 +1038,7 @@</span><br><span> * just to make sure */</span><br><span> if (pdu_type == BSSGP_PDUT_UL_UNITDATA ||</span><br><span> pdu_type == BSSGP_PDUT_DL_UNITDATA) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_NOTICE, "NSEI=%u UNITDATA not allowed in "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u) UNITDATA not allowed in "</span><br><span> "signalling\n", nsei);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span>@@ -1072,14 +1072,14 @@</span><br><span> * is common for all point-to-point BVCs (and thus all BTS) */</span><br><span> if (TLVP_PRESENT(&tp, BSSGP_IE_BVCI)) {</span><br><span> uint16_t bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI));</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_INFO, "NSEI=%u Rx BVC RESET (BVCI=%u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_INFO, "NSE(%05u) Rx BVC RESET (BVCI=%05u)\n",</span><br><span> nsei, bvci);</span><br><span> if (bvci == 0) {</span><br><span> struct gbproxy_nse *nse;</span><br><span> /* Ensure the NSE peer is there and clear all PtP BVCs */</span><br><span> nse = gbproxy_nse_by_nsei_or_new(cfg, nsei);</span><br><span> if (!nse) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_ERROR, "Could not allocate NSE for NSEI=%u\n", nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_ERROR, "Could not create NSE(%05u)\n", nsei);</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, 0, msg);</span><br><span> }</span><br><span> </span><br><span>@@ -1095,8 +1095,8 @@</span><br><span> if (!from_peer) {</span><br><span> struct gbproxy_nse *nse = gbproxy_nse_by_nsei(cfg, nsei);</span><br><span> if (!nse) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_NOTICE, "Got PtP BVC reset before signalling reset for "</span><br><span style="color: hsl(0, 100%, 40%);">- "BVCI=%u NSEI=%u\n", bvci, nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u) Got PtP BVC reset before signalling reset for "</span><br><span style="color: hsl(120, 100%, 40%);">+ "BVCI=%05u\n", nsei, bvci);</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_STATE, NULL, msg);</span><br><span> }</span><br><span> /* if a PTP-BVC is reset, and we don't know that</span><br><span>@@ -1108,13 +1108,14 @@</span><br><span> </span><br><span> /* Could have moved to a different NSE */</span><br><span> if (!check_peer_nsei(from_peer, nsei)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPBVC(from_peer, LOGL_NOTICE, "moving peer to NSE(%05u)\n", nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct gbproxy_nse *nse_new = gbproxy_nse_by_nsei(cfg, nsei);</span><br><span> if (!nse_new) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_NOTICE, "Got PtP BVC reset before signalling reset for "</span><br><span style="color: hsl(0, 100%, 40%);">- "BVCI=%u NSEI=%u\n", bvci, nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u) Got PtP BVC reset before signalling reset for "</span><br><span style="color: hsl(120, 100%, 40%);">+ "BVCI=%05u\n", bvci, nsei);</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_STATE, NULL, msg);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPBVC(from_peer, LOGL_NOTICE, "Peer moved to NSEI=%u\n", nsei);</span><br><span> </span><br><span> /* Move peer to different NSE */</span><br><span> gbproxy_peer_move(from_peer, nse_new);</span><br><span>diff --git a/src/gbproxy/gb_proxy_main.c b/src/gbproxy/gb_proxy_main.c</span><br><span>index 3ab8e49..c7ff78c 100644</span><br><span>--- a/src/gbproxy/gb_proxy_main.c</span><br><span>+++ b/src/gbproxy/gb_proxy_main.c</span><br><span>@@ -321,7 +321,7 @@</span><br><span> }</span><br><span> </span><br><span> if (!gprs_ns2_nse_by_nsei(gbcfg->nsi, gbcfg->nsip_sgsn_nsei)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_FATAL, "You cannot proxy to NSEI %u "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_FATAL, "You cannot proxy to NSE(%05u) "</span><br><span> "without creating that NSEI before\n",</span><br><span> gbcfg->nsip_sgsn_nsei);</span><br><span> exit(2);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21460">change 21460</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-sgsn/+/21460"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I93296353dd964602699480faae1248096e331c6a </div>
<div style="display:none"> Gerrit-Change-Number: 21460 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>