pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-gprs/+/34027 )
(
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: llc,sndcp: Add missing hex prefix to log line printing TLLI
......................................................................
llc,sndcp: Add missing hex prefix to log line printing TLLI
Change-Id: I8d31ed7cf89555a1ec3cbd91a77cc00cc42b546f
---
M src/llc/llc_llgmm.c
M src/sndcp/sndcp_prim.c
M tests/llc/llc_prim_test.err
M tests/sndcp/sndcp_prim_test.err
4 files changed, 27 insertions(+), 18 deletions(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/llc/llc_llgmm.c b/src/llc/llc_llgmm.c
index 438de51..27150cc 100644
--- a/src/llc/llc_llgmm.c
+++ b/src/llc/llc_llgmm.c
@@ -166,7 +166,7 @@
goto ret_free;
}
- LOGLLME(llme, LOGL_NOTICE, "LLGM Assign pre (%08x => %08x)\n",
old_tlli, new_tlli);
+ LOGLLME(llme, LOGL_NOTICE, "LLGM Assign pre (0x%08x => 0x%08x)\n",
old_tlli, new_tlli);
if (old_tlli == TLLI_UNASSIGNED && new_tlli != TLLI_UNASSIGNED) {
/* TLLI Assignment 8.3.1 */
@@ -221,7 +221,7 @@
free = true;
}
- LOGLLME(llme, LOGL_NOTICE, "LLGM Assign post (%08x => %08x)\n",
old_tlli, new_tlli);
+ LOGLLME(llme, LOGL_NOTICE, "LLGM Assign post (0x%08x => 0x%08x)\n",
old_tlli, new_tlli);
if (free)
gprs_llc_llme_free(llme);
diff --git a/src/sndcp/sndcp_prim.c b/src/sndcp/sndcp_prim.c
index 45d6a0f..c07508a 100644
--- a/src/sndcp/sndcp_prim.c
+++ b/src/sndcp/sndcp_prim.c
@@ -335,7 +335,7 @@
sndcp_prim->sn.data_req.nsapi);
if (!sne) {
LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity "
- "(TLLI=%08x, SAPI=%u, NSAPI=%u)\n",
+ "(TLLI=0x%08x, SAPI=%u, NSAPI=%u)\n",
sndcp_prim->sn.tlli, sndcp_prim->sn.sapi,
sndcp_prim->sn.data_req.nsapi);
rc = -EIO;
@@ -360,7 +360,7 @@
sndcp_prim->sn.unitdata_req.nsapi);
if (!sne) {
LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity "
- "(TLLI=%08x, SAPI=%u, NSAPI=%u)\n",
+ "(TLLI=0x%08x, SAPI=%u, NSAPI=%u)\n",
sndcp_prim->sn.tlli, sndcp_prim->sn.sapi,
sndcp_prim->sn.unitdata_req.nsapi);
rc = -EIO;
@@ -383,7 +383,7 @@
sndcp_prim->sn.xid_req.nsapi);
if (!sne) {
LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity "
- "(TLLI=%08x, SAPI=%u, NSAPI=%u)\n",
+ "(TLLI=0x%08x, SAPI=%u, NSAPI=%u)\n",
sndcp_prim->sn.tlli, sndcp_prim->sn.sapi,
sndcp_prim->sn.xid_req.nsapi);
rc = -EIO;
@@ -405,7 +405,7 @@
sndcp_prim->sn.xid_rsp.nsapi);
if (!sne) {
LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity "
- "(TLLI=%08x, SAPI=%u, NSAPI=%u)\n",
+ "(TLLI=0x%08x, SAPI=%u, NSAPI=%u)\n",
sndcp_prim->sn.tlli, sndcp_prim->sn.sapi,
sndcp_prim->sn.xid_rsp.nsapi);
rc = -EIO;
@@ -476,7 +476,7 @@
sne = gprs_sndcp_sne_by_dlci_nsapi(llc_prim->ll.tlli,
llc_prim->ll.sapi, sch->nsapi);
if (!sne) {
LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity "
- "(TLLI=%08x, SAPI=%u, NSAPI=%u)\n",
+ "(TLLI=0x%08x, SAPI=%u, NSAPI=%u)\n",
llc_prim->ll.tlli, llc_prim->ll.sapi, sch->nsapi);
return -EIO;
}
@@ -493,7 +493,7 @@
sne = gprs_sndcp_sne_by_dlci(llc_prim->ll.tlli, llc_prim->ll.sapi);
if (!sne) {
LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity "
- "(TLLI=%08x, SAPI=%u)\n",
+ "(TLLI=0x%08x, SAPI=%u)\n",
llc_prim->ll.tlli, llc_prim->ll.sapi);
return -EIO;
}
@@ -510,7 +510,7 @@
snme = gprs_sndcp_snme_find_by_tlli(llc_prim->ll.tlli);
if (!snme) {
LOGSNDCP(LOGL_ERROR, "SNDCP-LL-XID.ind: Message for
non-existing SNDCP Entity "
- "(TLLI=%08x, SAPI=%u)\n",
+ "(TLLI=0x%08x, SAPI=%u)\n",
llc_prim->ll.tlli, llc_prim->ll.sapi);
return -EIO;
}
@@ -529,7 +529,7 @@
snme = gprs_sndcp_snme_find_by_tlli(llc_prim->ll.tlli);
if (!snme) {
LOGSNDCP(LOGL_ERROR, "SNDCP-LL-XID.cnf: Message for
non-existing SNDCP Entity "
- "(TLLI=%08x, SAPI=%u)\n",
+ "(TLLI=0x%08x, SAPI=%u)\n",
llc_prim->ll.tlli, llc_prim->ll.sapi);
return -EIO;
}
@@ -546,7 +546,7 @@
snme = gprs_sndcp_snme_find_by_tlli(llc_prim->ll.tlli);
if (!snme) {
- LOGSNDCP(LOGL_ERROR, "SNDCP-LL-ASSIGN.ind: Message for
non-existing SNDCP Entity (TLLI=%08x)\n",
+ LOGSNDCP(LOGL_ERROR, "SNDCP-LL-ASSIGN.ind: Message for
non-existing SNDCP Entity (TLLI=0x%08x)\n",
llc_prim->ll.tlli);
return -EIO;
}
@@ -639,7 +639,7 @@
struct gprs_sndcp_entity *sne;
struct osmo_gprs_sm_qos_profile_decoded decoded;
- LOGSNDCP(LOGL_INFO, "SNSM-ACTIVATE.ind (TLLI=%08x, SAPI=%u,
NSAPI=%u)\n",
+ LOGSNDCP(LOGL_INFO, "SNSM-ACTIVATE.ind (TLLI=0x%08x, SAPI=%u,
NSAPI=%u)\n",
tlli, sapi, nsapi);
snme = gprs_sndcp_snme_find_by_tlli(tlli);
@@ -709,14 +709,14 @@
snme = gprs_sndcp_snme_find_by_tlli(tlli);
if (!snme) {
LOGSNDCP(LOGL_ERROR, "SNSM-DEACTIVATE.ind: Message for
non-existing SNDCP Management Entity "
- "(TLLI=%08x, NSAPI=%u)\n", tlli, nsapi);
+ "(TLLI=0x%08x, NSAPI=%u)\n", tlli, nsapi);
return -EIO;
}
sne = gprs_sndcp_snme_get_sne(snme, nsapi);
if (!sne) {
LOGSNDCP(LOGL_ERROR, "SNSM-DEACTIVATE.ind: Message for
non-existing SNDCP Entity "
- "(TLLI=%08x, NSAPI=%u)\n", tlli, nsapi);
+ "(TLLI=0x%08x, NSAPI=%u)\n", tlli, nsapi);
return -EIO;
}
diff --git a/tests/llc/llc_prim_test.err b/tests/llc/llc_prim_test.err
index 022dfac..e13bd7b 100644
--- a/tests/llc/llc_prim_test.err
+++ b/tests/llc/llc_prim_test.err
@@ -26,8 +26,8 @@
DLGLOBAL DEBUG LLE(ffffffff/e1c5d364,GMM){UNASSIGNED} Rx SAPI=1 (GMM), UI
func=UI C/R=0 PM=0 E=0 IP=0 N(U)=0 FCS=f218e2
DLGLOBAL INFO Rx from upper layers: LL-UNITDATA.request
DLGLOBAL INFO Rx from upper layers: LLGMM-ASSIGN.request
-DLGLOBAL NOTICE LLME(ffffffff/e1c5d364){UNASSIGNED} LLGM Assign pre (e1c5d364
=> e1c5d364)
-DLGLOBAL NOTICE LLME(e1c5d364/e1c5d364){ASSIGNED} LLGM Assign post (e1c5d364
=> e1c5d364)
+DLGLOBAL NOTICE LLME(ffffffff/e1c5d364){UNASSIGNED} LLGM Assign pre
(0xe1c5d364 => 0xe1c5d364)
+DLGLOBAL NOTICE LLME(e1c5d364/e1c5d364){ASSIGNED} LLGM Assign post (0xe1c5d364
=> 0xe1c5d364)
DLGLOBAL INFO Rx from upper layers: LLGMM-RESET.request
DLGLOBAL INFO LLME(e1c5d364/e1c5d364){ASSIGNED} LLGMM-RESET.request
DLGLOBAL INFO Rx from upper layers: LL-ESTABLISH.request
diff --git a/tests/sndcp/sndcp_prim_test.err b/tests/sndcp/sndcp_prim_test.err
index d61a18a..d858a49 100644
--- a/tests/sndcp/sndcp_prim_test.err
+++ b/tests/sndcp/sndcp_prim_test.err
@@ -1,5 +1,5 @@
DLGLOBAL INFO Rx from SNDCP SM sublayer: SNSM-ACTIVATE.indication
-DLGLOBAL INFO SNSM-ACTIVATE.ind (TLLI=e1c5d364, SAPI=3, NSAPI=5)
+DLGLOBAL INFO SNSM-ACTIVATE.ind (TLLI=0xe1c5d364, SAPI=3, NSAPI=5)
DLGLOBAL INFO Rx from lower layers: LL-XID.indication
DLGLOBAL DEBUG SNE(e1c5d364,SNDCP3,5) LL-XID.ind: Found SNE SAPI=3
DLGLOBAL DEBUG SNME(e1c5d364) LL-XID.cnf requested comp_fields:
@@ -112,7 +112,7 @@
DLGLOBAL DEBUG SNME(e1c5d364) No SNDCP Entities left activate, freeing SNME
DLGLOBAL DEBUG SNME(e1c5d364) free()
DLGLOBAL INFO Rx from SNDCP SM sublayer: SNSM-ACTIVATE.indication
-DLGLOBAL INFO SNSM-ACTIVATE.ind (TLLI=e1c5d364, SAPI=3, NSAPI=5)
+DLGLOBAL INFO SNSM-ACTIVATE.ind (TLLI=0xe1c5d364, SAPI=3, NSAPI=5)
DLGLOBAL INFO Rx from lower layers: LL-XID.confirm
DLGLOBAL DEBUG SNE(e1c5d364,SNDCP3,5) LL-XID.cnf: Found SNE SAPI=3
DLGLOBAL INFO Rx from upper layers: SN-XID.request
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34027
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I8d31ed7cf89555a1ec3cbd91a77cc00cc42b546f
Gerrit-Change-Number: 34027
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
