<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21460">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Change generic LOG messages so BVCI/NSEI fmt is consistent<br><br>We actually need to alter our compiler flags to avoid -Werror=trigraphs<br>creating trouble:<br><br>gb_proxy.c: In function ‘block_unblock_peer’:<br>gb_proxy.c:875:37: error: trigraph ??) ignored, use -trigraphs to enable [-Werror=trigraphs]<br> 875 | LOGP(DGPRS, LOGL_ERROR, "BVC(%05u/??) Cannot find BSS\n",<br> |<br><br>Fixes: SYS#5233<br>Change-Id: I93296353dd964602699480faae1248096e331c6a<br>---<br>M configure.ac<br>M src/gbproxy/gb_proxy.c<br>M src/gbproxy/gb_proxy_main.c<br>3 files changed, 44 insertions(+), 42 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 346e020..0ed36b8 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -118,8 +118,8 @@</span><br><span> CFLAGS="$saved_CFLAGS"</span><br><span> AC_SUBST(SYMBOL_VISIBILITY)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CPPFLAGS="$CPPFLAGS -Wall"</span><br><span style="color: hsl(0, 100%, 40%);">-CFLAGS="$CFLAGS -Wall"</span><br><span style="color: hsl(120, 100%, 40%);">+CPPFLAGS="$CPPFLAGS -Wall -Wno-trigraphs"</span><br><span style="color: hsl(120, 100%, 40%);">+CFLAGS="$CFLAGS -Wall -Wno-trigraphs"</span><br><span> </span><br><span> AX_CHECK_COMPILE_FLAG([-Werror=implicit], [CFLAGS="$CFLAGS -Werror=implicit"])</span><br><span> AX_CHECK_COMPILE_FLAG([-Werror=maybe-uninitialized], [CFLAGS="$CFLAGS -Werror=maybe-uninitialized"])</span><br><span>diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c</span><br><span>index 1602207..2c58e80 100644</span><br><span>--- a/src/gbproxy/gb_proxy.c</span><br><span>+++ b/src/gbproxy/gb_proxy.c</span><br><span>@@ -564,7 +564,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>@@ -600,11 +600,11 @@</span><br><span> </span><br><span> if (!rc && !parse_ctx.need_decryption) {</span><br><span> LOGP(DGPRS, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "NSEI=%u(BSS) patching: failed to parse invalid %s message\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "NSE(%05u/BSS) patching: failed to parse invalid %s message\n",</span><br><span> msgb_nsei(msg), gprs_gb_message_name(&parse_ctx, "NS_UNITDATA"));</span><br><span> gprs_gb_log_parse_context(LOGL_NOTICE, &parse_ctx, "NS_UNITDATA");</span><br><span> LOGP(DGPRS, LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- "NSEI=%u(BSS) invalid message was: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "NSE(%05u/BSS) invalid message was: %s\n",</span><br><span> msgb_nsei(msg), msgb_hexdump(msg));</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -717,11 +717,11 @@</span><br><span> </span><br><span> if (!rc && !parse_ctx.need_decryption) {</span><br><span> LOGP(DGPRS, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "NSEI=%u(SGSN) patching: failed to parse invalid %s message\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "NSE(%05u/SGSN) patching: failed to parse invalid %s message\n",</span><br><span> msgb_nsei(msg), gprs_gb_message_name(&parse_ctx, "NS_UNITDATA"));</span><br><span> gprs_gb_log_parse_context(LOGL_NOTICE, &parse_ctx, "NS_UNITDATA");</span><br><span> LOGP(DGPRS, LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- "NSEI=%u(SGSN) invalid message was: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "NSE(%05u/SGSN) invalid message was: %s\n",</span><br><span> msgb_nsei(msg), msgb_hexdump(msg));</span><br><span> return;</span><br><span> }</span><br><span>@@ -794,7 +794,7 @@</span><br><span> struct msgb *msg = bssgp_msgb_copy(old_msg, "msgb_relay2sgsn");</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DGPRS, "NSEI=%u proxying BTS->SGSN (NS_BVCI=%u, NSEI=%u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DGPRS, "NSE(%05u/BSS)-BVC(%05u) proxying BTS->SGSN NSE(%05u/SGSN)\n",</span><br><span> msgb_nsei(msg), ns_bvci, sgsn_nsei);</span><br><span> </span><br><span> nsp.bvci = ns_bvci;</span><br><span>@@ -824,7 +824,7 @@</span><br><span> uint32_t tlli;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DGPRS, "NSEI=%u proxying SGSN->BSS (NS_BVCI=%u, NSEI=%u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DGPRS, "NSE(%05u/SGSN)-BVC(%05u) proxying SGSN->BSS NSE(%05u/BSS)\n",</span><br><span> msgb_nsei(msg), ns_bvci, nse->nsei);</span><br><span> </span><br><span> nsp.bvci = ns_bvci;</span><br><span>@@ -872,7 +872,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>@@ -902,7 +902,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>@@ -928,8 +928,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>@@ -972,8 +972,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>@@ -1022,7 +1022,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>@@ -1031,7 +1031,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>@@ -1065,14 +1065,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>@@ -1088,8 +1088,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>@@ -1101,13 +1101,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>@@ -1143,12 +1144,12 @@</span><br><span> </span><br><span> return gbprox_relay2sgsn(cfg, msg, ns_bvci, cfg->nsip_sgsn_nsei);</span><br><span> err_no_peer:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_ERROR, "NSEI=%u(BSS) cannot find peer based on NSEI\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_ERROR, "NSE(%05u/BSS) cannot find peer based on NSEI\n",</span><br><span> nsei);</span><br><span> rate_ctr_inc(&cfg->ctrg->ctr[GBPROX_GLOB_CTR_INV_NSEI]);</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg);</span><br><span> err_mand_ie:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_ERROR, "NSEI=%u(BSS) missing mandatory RA IE\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_ERROR, "NSE(%05u/BSS) missing mandatory RA IE\n",</span><br><span> nsei);</span><br><span> rate_ctr_inc(&cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_BSS]);</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_MISSING_MAND_IE, NULL, msg);</span><br><span>@@ -1165,15 +1166,15 @@</span><br><span> </span><br><span> /* FIXME: Handle paging logic to only page each matching NSE */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_INFO, "NSEI=%u(SGSN) BSSGP PAGING\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_INFO, "NSE(%05u/SGSN) BSSGP PAGING\n",</span><br><span> nsei);</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> errctr = GBPROX_GLOB_CTR_OTHER_ERR;</span><br><span> peer = gbproxy_peer_by_bvci(cfg, bvci);</span><br><span> if (!peer) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_NOTICE, "NSEI=%u(SGSN) BSSGP PAGING: "</span><br><span style="color: hsl(0, 100%, 40%);">- "unable to route: BVCI=%u unknown\n", nsei, bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/SGSN) BSSGP PAGING: "</span><br><span style="color: hsl(120, 100%, 40%);">+ "unable to route: BVCI=%05u unknown\n", nsei, bvci);</span><br><span> rate_ctr_inc(&cfg->ctrg->ctr[errctr]);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span>@@ -1219,13 +1220,13 @@</span><br><span> }</span><br><span> }</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_ERROR, "NSEI=%u(SGSN) BSSGP PAGING: "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_ERROR, "NSE(%05u/SGSN) BSSGP PAGING: "</span><br><span> "unable to route, missing IE\n", nsei);</span><br><span> rate_ctr_inc(&cfg->ctrg->ctr[errctr]);</span><br><span> }</span><br><span> </span><br><span> if (n_nses == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_ERROR, "NSEI=%u(SGSN) BSSGP PAGING: "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_ERROR, "NSE(%05u/SGSN) BSSGP PAGING: "</span><br><span> "unable to route, no destination found\n", nsei);</span><br><span> rate_ctr_inc(&cfg->ctrg->ctr[errctr]);</span><br><span> return -EINVAL;</span><br><span>@@ -1256,7 +1257,7 @@</span><br><span> * respective peer */</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, "NSEI=%u BVCI=%u: Cannot find BSS\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_ERROR, "NSE(%05u/SGSN) BVCI=%05u: Cannot find BSS\n",</span><br><span> nsei, ptp_bvci);</span><br><span> rate_ctr_inc(&cfg->ctrg-></span><br><span> ctr[GBPROX_GLOB_CTR_INV_BVCI]);</span><br><span>@@ -1295,7 +1296,7 @@</span><br><span> int cause;</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(SGSN) BVCI=%u is not "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/SGSN) BVCI=%05u is not "</span><br><span> "signalling\n", nsei, ns_bvci);</span><br><span> /* FIXME: Send proper error message */</span><br><span> return -EINVAL;</span><br><span>@@ -1305,7 +1306,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(SGSN) UNITDATA not allowed in "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/SGSN) UNITDATA not allowed in "</span><br><span> "signalling\n", nsei);</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, orig_msg);</span><br><span> }</span><br><span>@@ -1349,7 +1350,7 @@</span><br><span> case BSSGP_PDUT_STATUS:</span><br><span> /* Some exception has occurred */</span><br><span> LOGP(DGPRS, LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- "NSEI=%u(SGSN) BSSGP STATUS ", nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ "NSE(%05u/SGSN) BSSGP STATUS ", nsei);</span><br><span> if (!TLVP_PRESENT(&tp, BSSGP_IE_CAUSE)) {</span><br><span> LOGPC(DGPRS, LOGL_NOTICE, "\n");</span><br><span> goto err_mand_ie;</span><br><span>@@ -1360,7 +1361,7 @@</span><br><span> bssgp_cause_str(cause));</span><br><span> if (TLVP_PRESENT(&tp, BSSGP_IE_BVCI)) {</span><br><span> bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI));</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPC(DGPRS, LOGL_NOTICE, "BVCI=%u\n", bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DGPRS, LOGL_NOTICE, "BVCI=%05u\n", bvci);</span><br><span> </span><br><span> if (cause == BSSGP_CAUSE_UNKNOWN_BVCI)</span><br><span> rc = gbprox_relay2bvci(cfg, msg, bvci, ns_bvci);</span><br><span>@@ -1386,7 +1387,7 @@</span><br><span> goto err_mand_ie;</span><br><span> bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI));</span><br><span> if (bvci == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_NOTICE, "NSEI=%u(SGSN) BSSGP "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/SGSN) BSSGP "</span><br><span> "%sBLOCK_ACK for signalling BVCI ?!?\n", nsei,</span><br><span> pdu_type == BSSGP_PDUT_BVC_UNBLOCK_ACK ? "UN":"");</span><br><span> /* should we send STATUS ? */</span><br><span>@@ -1400,13 +1401,14 @@</span><br><span> break;</span><br><span> case BSSGP_PDUT_SGSN_INVOKE_TRACE:</span><br><span> LOGP(DGPRS, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "NSEI=%u(SGSN) BSSGP INVOKE TRACE not supported\n",nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ "NSE(%05u/SGSN) BSSGP INVOKE TRACE not supported\n", nsei);</span><br><span> rate_ctr_inc(&cfg->ctrg-></span><br><span> ctr[GBPROX_GLOB_CTR_NOT_SUPPORTED_SGSN]);</span><br><span> rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL, orig_msg);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_NOTICE, "BSSGP PDU type %s not supported\n", bssgp_pdu_str(pdu_type));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/SGSN) BSSGP PDU type %s not supported\n", nsei,</span><br><span style="color: hsl(120, 100%, 40%);">+ bssgp_pdu_str(pdu_type));</span><br><span> rate_ctr_inc(&cfg->ctrg-></span><br><span> ctr[GBPROX_GLOB_CTR_PROTO_ERR_SGSN]);</span><br><span> rc = bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, orig_msg);</span><br><span>@@ -1417,14 +1419,14 @@</span><br><span> </span><br><span> return rc;</span><br><span> err_mand_ie:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_ERROR, "NSEI=%u(SGSN) missing mandatory IE\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_ERROR, "NSE(%05u/SGSN) missing mandatory IE\n",</span><br><span> nsei);</span><br><span> rate_ctr_inc(&cfg->ctrg-></span><br><span> ctr[GBPROX_GLOB_CTR_PROTO_ERR_SGSN]);</span><br><span> msgb_free(msg);</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_MISSING_MAND_IE, NULL, orig_msg);</span><br><span> err_no_peer:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_ERROR, "NSEI=%u(SGSN) cannot find peer based on RAI\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DGPRS, LOGL_ERROR, "NSE(%05u/SGSN) cannot find peer based on RAI\n",</span><br><span> nsei);</span><br><span> rate_ctr_inc(&cfg->ctrg-> ctr[GBPROX_GLOB_CTR_INV_RAI]);</span><br><span> msgb_free(msg);</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: 3 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </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-MessageType: merged </div>