osmocom
/
libosmo-gprs
mirror of https://gerrit.osmocom.org/libosmo-gprs
11
0
Fork 0
Code Releases Wiki Activity

llc,sndcp: Add missing hex prefix to log line printing TLLI 

Change-Id: I8d31ed7cf89555a1ec3cbd91a77cc00cc42b546f
This commit is contained in:
Pau Espin 2023-07-31 17:40:39 +02:00
parent 200725e609
commit a1f0842b38
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/llc/llc_llgmm.c
View File

@ -166,7 +166,7 @@ static int llc_prim_handle_llgmm_assign_req(struct osmo_gprs_llc_prim *llc_prim)
goto ret_free; 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) { if (old_tlli == TLLI_UNASSIGNED && new_tlli != TLLI_UNASSIGNED) {
/* TLLI Assignment 8.3.1 */ /* TLLI Assignment 8.3.1 */
@ -221,7 +221,7 @@ static int llc_prim_handle_llgmm_assign_req(struct osmo_gprs_llc_prim *llc_prim)
free = true; 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) if (free)
gprs_llc_llme_free(llme); gprs_llc_llme_free(llme);

24
src/sndcp/sndcp_prim.c
View File

@ -335,7 +335,7 @@ static int gprs_sndcp_prim_handle_sndcp_sn_data_req(struct osmo_gprs_sndcp_prim
sndcp_prim->sn.data_req.nsapi); sndcp_prim->sn.data_req.nsapi);
if (!sne) { if (!sne) {
LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity " 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.tlli, sndcp_prim->sn.sapi,
sndcp_prim->sn.data_req.nsapi); sndcp_prim->sn.data_req.nsapi);
rc = -EIO; rc = -EIO;
@ -360,7 +360,7 @@ static int gprs_sndcp_prim_handle_sndcp_sn_unitdata_req(struct osmo_gprs_sndcp_p
sndcp_prim->sn.unitdata_req.nsapi); sndcp_prim->sn.unitdata_req.nsapi);
if (!sne) { if (!sne) {
LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity " 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.tlli, sndcp_prim->sn.sapi,
sndcp_prim->sn.unitdata_req.nsapi); sndcp_prim->sn.unitdata_req.nsapi);
rc = -EIO; rc = -EIO;
@ -383,7 +383,7 @@ static int gprs_sndcp_prim_handle_sndcp_sn_xid_req(struct osmo_gprs_sndcp_prim *
sndcp_prim->sn.xid_req.nsapi); sndcp_prim->sn.xid_req.nsapi);
if (!sne) { if (!sne) {
LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity " 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.tlli, sndcp_prim->sn.sapi,
sndcp_prim->sn.xid_req.nsapi); sndcp_prim->sn.xid_req.nsapi);
rc = -EIO; rc = -EIO;
@ -405,7 +405,7 @@ static int gprs_sndcp_prim_handle_sndcp_sn_xid_rsp(struct osmo_gprs_sndcp_prim *
sndcp_prim->sn.xid_rsp.nsapi); sndcp_prim->sn.xid_rsp.nsapi);
if (!sne) { if (!sne) {
LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity " 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.tlli, sndcp_prim->sn.sapi,
sndcp_prim->sn.xid_rsp.nsapi); sndcp_prim->sn.xid_rsp.nsapi);
rc = -EIO; rc = -EIO;
@ -476,7 +476,7 @@ static int gprs_sndcp_prim_handle_llc_ll_unitdata_ind(struct osmo_gprs_llc_prim
sne = gprs_sndcp_sne_by_dlci_nsapi(llc_prim->ll.tlli, llc_prim->ll.sapi, sch->nsapi); sne = gprs_sndcp_sne_by_dlci_nsapi(llc_prim->ll.tlli, llc_prim->ll.sapi, sch->nsapi);
if (!sne) { if (!sne) {
LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity " 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); llc_prim->ll.tlli, llc_prim->ll.sapi, sch->nsapi);
return -EIO; return -EIO;
} }
@ -493,7 +493,7 @@ static int gprs_sndcp_prim_handle_llc_ll_establish_cnf(struct osmo_gprs_llc_prim
sne = gprs_sndcp_sne_by_dlci(llc_prim->ll.tlli, llc_prim->ll.sapi); sne = gprs_sndcp_sne_by_dlci(llc_prim->ll.tlli, llc_prim->ll.sapi);
if (!sne) { if (!sne) {
LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity " 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); llc_prim->ll.tlli, llc_prim->ll.sapi);
return -EIO; return -EIO;
} }
@ -510,7 +510,7 @@ static int gprs_sndcp_prim_handle_llc_ll_xid_ind(struct osmo_gprs_llc_prim *llc_
snme = gprs_sndcp_snme_find_by_tlli(llc_prim->ll.tlli); snme = gprs_sndcp_snme_find_by_tlli(llc_prim->ll.tlli);
if (!snme) { if (!snme) {
LOGSNDCP(LOGL_ERROR, "SNDCP-LL-XID.ind: Message for non-existing SNDCP Entity " 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); llc_prim->ll.tlli, llc_prim->ll.sapi);
return -EIO; return -EIO;
} }
@ -529,7 +529,7 @@ static int gprs_sndcp_prim_handle_llc_ll_xid_cnf(struct osmo_gprs_llc_prim *llc_
snme = gprs_sndcp_snme_find_by_tlli(llc_prim->ll.tlli); snme = gprs_sndcp_snme_find_by_tlli(llc_prim->ll.tlli);
if (!snme) { if (!snme) {
LOGSNDCP(LOGL_ERROR, "SNDCP-LL-XID.cnf: Message for non-existing SNDCP Entity " 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); llc_prim->ll.tlli, llc_prim->ll.sapi);
return -EIO; return -EIO;
} }
@ -546,7 +546,7 @@ static int gprs_sndcp_prim_handle_llc_ll_assign_ind(struct osmo_gprs_llc_prim *l
snme = gprs_sndcp_snme_find_by_tlli(llc_prim->ll.tlli); snme = gprs_sndcp_snme_find_by_tlli(llc_prim->ll.tlli);
if (!snme) { 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); llc_prim->ll.tlli);
return -EIO; return -EIO;
} }
@ -639,7 +639,7 @@ static int gprs_sndcp_prim_handle_sndcp_snsm_activate_ind(struct osmo_gprs_sndcp
struct gprs_sndcp_entity *sne; struct gprs_sndcp_entity *sne;
struct osmo_gprs_sm_qos_profile_decoded decoded; 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); tlli, sapi, nsapi);
snme = gprs_sndcp_snme_find_by_tlli(tlli); snme = gprs_sndcp_snme_find_by_tlli(tlli);
@ -709,14 +709,14 @@ static int gprs_sndcp_prim_handle_sndcp_snsm_deactivate_ind(struct osmo_gprs_snd
snme = gprs_sndcp_snme_find_by_tlli(tlli); snme = gprs_sndcp_snme_find_by_tlli(tlli);
if (!snme) { if (!snme) {
LOGSNDCP(LOGL_ERROR, "SNSM-DEACTIVATE.ind: Message for non-existing SNDCP Management Entity " 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; return -EIO;
} }
sne = gprs_sndcp_snme_get_sne(snme, nsapi); sne = gprs_sndcp_snme_get_sne(snme, nsapi);
if (!sne) { if (!sne) {
LOGSNDCP(LOGL_ERROR, "SNSM-DEACTIVATE.ind: Message for non-existing SNDCP Entity " 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; return -EIO;
} }

4
tests/llc/llc_prim_test.err
View File

@ -26,8 +26,8 @@ DLGLOBAL NOTICE LLME(ffffffff/e1c5d364){UNASSIGNED} LLC RX: unknown TLLI 0xe1c5d
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 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: LL-UNITDATA.request
DLGLOBAL INFO Rx from upper layers: LLGMM-ASSIGN.request DLGLOBAL INFO Rx from upper layers: LLGMM-ASSIGN.request
DLGLOBAL NOTICE LLME(ffffffff/e1c5d364){UNASSIGNED} LLGM Assign pre (e1c5d364 => e1c5d364) DLGLOBAL NOTICE LLME(ffffffff/e1c5d364){UNASSIGNED} LLGM Assign pre (0xe1c5d364 => 0xe1c5d364)
DLGLOBAL NOTICE LLME(e1c5d364/e1c5d364){ASSIGNED} LLGM Assign post (e1c5d364 => e1c5d364) DLGLOBAL NOTICE LLME(e1c5d364/e1c5d364){ASSIGNED} LLGM Assign post (0xe1c5d364 => 0xe1c5d364)
DLGLOBAL INFO Rx from upper layers: LLGMM-RESET.request DLGLOBAL INFO Rx from upper layers: LLGMM-RESET.request
DLGLOBAL INFO LLME(e1c5d364/e1c5d364){ASSIGNED} LLGMM-RESET.request DLGLOBAL INFO LLME(e1c5d364/e1c5d364){ASSIGNED} LLGMM-RESET.request
DLGLOBAL INFO Rx from upper layers: LL-ESTABLISH.request DLGLOBAL INFO Rx from upper layers: LL-ESTABLISH.request

4
tests/sndcp/sndcp_prim_test.err
View File

@ -1,5 +1,5 @@
DLGLOBAL INFO Rx from SNDCP SM sublayer: SNSM-ACTIVATE.indication 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 INFO Rx from lower layers: LL-XID.indication
DLGLOBAL DEBUG SNE(e1c5d364,SNDCP3,5) LL-XID.ind: Found SNE SAPI=3 DLGLOBAL DEBUG SNE(e1c5d364,SNDCP3,5) LL-XID.ind: Found SNE SAPI=3
DLGLOBAL DEBUG SNME(e1c5d364) LL-XID.cnf requested comp_fields: DLGLOBAL DEBUG SNME(e1c5d364) LL-XID.cnf requested comp_fields:
@ -112,7 +112,7 @@ DLGLOBAL DEBUG SNE(e1c5d364,SNDCP3,5) free()
DLGLOBAL DEBUG SNME(e1c5d364) No SNDCP Entities left activate, freeing SNME DLGLOBAL DEBUG SNME(e1c5d364) No SNDCP Entities left activate, freeing SNME
DLGLOBAL DEBUG SNME(e1c5d364) free() DLGLOBAL DEBUG SNME(e1c5d364) free()
DLGLOBAL INFO Rx from SNDCP SM sublayer: SNSM-ACTIVATE.indication 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 INFO Rx from lower layers: LL-XID.confirm
DLGLOBAL DEBUG SNE(e1c5d364,SNDCP3,5) LL-XID.cnf: Found SNE SAPI=3 DLGLOBAL DEBUG SNE(e1c5d364,SNDCP3,5) LL-XID.cnf: Found SNE SAPI=3
DLGLOBAL INFO Rx from upper layers: SN-XID.request DLGLOBAL INFO Rx from upper layers: SN-XID.request