From bb0a53ba40222afd3d3625e5adc3c0f1bfe6dd80 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Mon, 12 Oct 2020 04:18:03 +0200 Subject: gprs_ns2: fix empty prefix in TLV Parse error Those messages were printed without any prefix because LOGPC was used. LOGPC means continue a log line. This must happened while copying this part of code over from ns1 where has been a LOGP in this function. Related: OS#4792 Change-Id: I2672ea0e34d19ea6172cb3458b8ff98d9700b2d0 --- src/gb/gprs_ns2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 7a153527..334989c4 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -864,7 +864,7 @@ int ns2_recv_vc(struct gprs_ns2_vc *nsvc, rc = ns2_tlv_parse(&tp, nsh->data+1, msgb_l2len(msg) - sizeof(*nsh)-1, 0, 0); if (rc < 0) { - LOGPC(DLNS, LOGL_NOTICE, "Error during TLV Parse in %s\n", msgb_hexdump(msg)); + LOGP(DLNS, LOGL_NOTICE, "Error during TLV Parse in %s\n", msgb_hexdump(msg)); return rc; } /* All sub-network service related message types */ @@ -878,7 +878,7 @@ int ns2_recv_vc(struct gprs_ns2_vc *nsvc, rc = ns2_tlv_parse(&tp, nsh->data+5, msgb_l2len(msg) - sizeof(*nsh)-5, 0, 0); if (rc < 0) { - LOGPC(DLNS, LOGL_NOTICE, "Error during TLV Parse in %s\n", msgb_hexdump(msg)); + LOGP(DLNS, LOGL_NOTICE, "Error during TLV Parse in %s\n", msgb_hexdump(msg)); return rc; } tp.lv[NS_IE_NSEI].val = nsh->data+2; @@ -893,7 +893,7 @@ int ns2_recv_vc(struct gprs_ns2_vc *nsvc, rc = ns2_tlv_parse(&tp, nsh->data, msgb_l2len(msg) - sizeof(*nsh), 0, 0); if (rc < 0) { - LOGPC(DLNS, LOGL_NOTICE, "Error during TLV Parse in %s\n", msgb_hexdump(msg)); + LOGP(DLNS, LOGL_NOTICE, "Error during TLV Parse in %s\n", msgb_hexdump(msg)); return rc; } /* All sub-network service related message types */ @@ -907,7 +907,7 @@ int ns2_recv_vc(struct gprs_ns2_vc *nsvc, rc = ns2_tlv_parse(&tp, nsh->data, msgb_l2len(msg) - sizeof(*nsh), 0, 0); if (rc < 0) { - LOGPC(DLNS, LOGL_NOTICE, "Error during TLV Parse\n"); + LOGP(DLNS, LOGL_NOTICE, "Error during TLV Parse\n"); if (nsh->pdu_type != NS_PDUT_STATUS) ns2_tx_status(nsvc, NS_CAUSE_PROTO_ERR_UNSPEC, 0, msg); return rc; -- cgit v1.2.3