<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use osmocom logging in non-main files<br><br>Change-Id: I649b17803aeffd20354aa76dde61094959f08e43<br>---<br>M include/osmocom/hnodeb/hnodeb.h<br>M src/osmo-hnodeb/debug.c<br>M src/osmo-hnodeb/hnb.c<br>M src/osmo-hnodeb/hnbap.c<br>M src/osmo-hnodeb/nas.c<br>M src/osmo-hnodeb/ranap.c<br>M src/osmo-hnodeb/rua.c<br>7 files changed, 64 insertions(+), 58 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h</span><br><span>index fb0c0fb..9da6044 100644</span><br><span>--- a/include/osmocom/hnodeb/hnodeb.h</span><br><span>+++ b/include/osmocom/hnodeb/hnodeb.h</span><br><span>@@ -31,6 +31,7 @@</span><br><span> DHNBAP,</span><br><span> DRUA,</span><br><span> DRANAP,</span><br><span style="color: hsl(120, 100%, 40%);">+ DNAS,</span><br><span> };</span><br><span> extern const struct log_info hnb_log_info;</span><br><span> </span><br><span>diff --git a/src/osmo-hnodeb/debug.c b/src/osmo-hnodeb/debug.c</span><br><span>index 69c369e..f50d8b0 100644</span><br><span>--- a/src/osmo-hnodeb/debug.c</span><br><span>+++ b/src/osmo-hnodeb/debug.c</span><br><span>@@ -23,25 +23,30 @@</span><br><span> </span><br><span> static const struct log_info_cat log_cat[] = {</span><br><span> [DMAIN] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "DMAIN", .loglevel = LOGL_INFO, .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DMAIN", .loglevel = LOGL_NOTICE, .enabled = 1,</span><br><span> .color = "",</span><br><span> .description = "Main program",</span><br><span> },</span><br><span> [DHNBAP] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "DHNBAP", .loglevel = LOGL_DEBUG, .enabled = 1,</span><br><span style="color: hsl(0, 100%, 40%);">- .color = "",</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DHNBAP", .loglevel = LOGL_NOTICE, .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;33m",</span><br><span> .description = "Home Node B Application Part",</span><br><span> },</span><br><span> [DRANAP] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "RANAP", .loglevel = LOGL_DEBUG, .enabled = 1,</span><br><span style="color: hsl(0, 100%, 40%);">- .color = "",</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "RANAP", .loglevel = LOGL_NOTICE, .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;34m",</span><br><span> .description = "RAN Application Part",</span><br><span> },</span><br><span> [DRUA] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "RUA", .loglevel = LOGL_DEBUG, .enabled = 1,</span><br><span style="color: hsl(0, 100%, 40%);">- .color = "",</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "RUA", .loglevel = LOGL_NOTICE, .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;35m",</span><br><span> .description = "RANAP User Adaptation",</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DNAS] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "NAS", .loglevel = LOGL_NOTICE, .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;32m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "Non-Access Stratum",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> const struct log_info hnb_log_info = {</span><br><span>diff --git a/src/osmo-hnodeb/hnb.c b/src/osmo-hnodeb/hnb.c</span><br><span>index 145c021..9a86019 100644</span><br><span>--- a/src/osmo-hnodeb/hnb.c</span><br><span>+++ b/src/osmo-hnodeb/hnb.c</span><br><span>@@ -89,11 +89,11 @@</span><br><span> </span><br><span> switch (sinfo.sinfo_ppid) {</span><br><span> case IUH_PPI_HNBAP:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("HNBAP message received\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHNBAP, LOGL_INFO, "HNBAP message received\n");</span><br><span> rc = hnb_hnbap_rx(hnb, msg);</span><br><span> break;</span><br><span> case IUH_PPI_RUA:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA message received\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_INFO, "RUA message received\n");</span><br><span> rc = hnb_rua_rx(hnb, msg);</span><br><span> break;</span><br><span> case IUH_PPI_SABP:</span><br><span>@@ -123,7 +123,7 @@</span><br><span> };</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("Sending: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg)));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_DEBUG, "Sending: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg)));</span><br><span> rc = sctp_send(fd->fd, msgb_data(msg), msgb_length(msg),</span><br><span> &sinfo, 0);</span><br><span> /* we don't need to msgb_free(), write_queue does this for us */</span><br><span>diff --git a/src/osmo-hnodeb/hnbap.c b/src/osmo-hnodeb/hnbap.c</span><br><span>index 7cd9cd6..eaa51a4 100644</span><br><span>--- a/src/osmo-hnodeb/hnbap.c</span><br><span>+++ b/src/osmo-hnodeb/hnbap.c</span><br><span>@@ -43,7 +43,7 @@</span><br><span> }</span><br><span> </span><br><span> hnb->rnc_id = accept.rnc_id;</span><br><span style="color: hsl(0, 100%, 40%);">- printf("HNB Register accept with RNC ID %u\n", hnb->rnc_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHNBAP, LOGL_INFO, "HNB Register accept with RNC ID %u\n", hnb->rnc_id);</span><br><span> </span><br><span> hnbap_free_hnbregisteraccepties(&accept);</span><br><span> return 0;</span><br><span>@@ -62,7 +62,7 @@</span><br><span> }</span><br><span> </span><br><span> if (accept.uE_Identity.present != HNBAP_UE_Identity_PR_iMSI) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Wrong type in UE register accept\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHNBAP, LOGL_ERROR, "Wrong type in UE register accept\n");</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>@@ -70,7 +70,7 @@</span><br><span> </span><br><span> ranap_bcd_decode(imsi, sizeof(imsi), accept.uE_Identity.choice.iMSI.buf,</span><br><span> accept.uE_Identity.choice.iMSI.size);</span><br><span style="color: hsl(0, 100%, 40%);">- printf("UE Register accept for IMSI %s, context %u\n", imsi, ctx_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHNBAP, LOGL_INFO, "UE Register accept for IMSI %s, context %u\n", imsi, ctx_id);</span><br><span> </span><br><span> hnb->ctx_id = ctx_id;</span><br><span> hnbap_free_ueregisteraccepties(&accept);</span><br><span>@@ -93,7 +93,7 @@</span><br><span> }</span><br><span> </span><br><span> if (pdu->present != HNBAP_HNBAP_PDU_PR_successfulOutcome) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Unexpected HNBAP message received\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHNBAP, LOGL_ERROR, "Unexpected HNBAP message received\n");</span><br><span> }</span><br><span> </span><br><span> switch (pdu->choice.successfulOutcome.procedureCode) {</span><br><span>@@ -183,7 +183,7 @@</span><br><span> memset(&request_out, 0, sizeof(request_out));</span><br><span> rc = hnbap_encode_hnbregisterrequesties(&request_out, &request);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Could not encode HNB register request IEs\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHNBAP, LOGL_ERROR, "Could not encode HNB register request IEs\n");</span><br><span> }</span><br><span> </span><br><span> msg = hnbap_generate_initiating_message(HNBAP_ProcedureCode_id_HNBRegister,</span><br><span>@@ -212,7 +212,7 @@</span><br><span> memset(&request_out, 0, sizeof(request_out));</span><br><span> rc = hnbap_encode_hnbde_registeries(&request_out, &request);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Could not encode HNB deregister request IEs\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHNBAP, LOGL_ERROR, "Could not encode HNB deregister request IEs\n");</span><br><span> }</span><br><span> </span><br><span> msg = hnbap_generate_initiating_message(HNBAP_ProcedureCode_id_HNBDe_Register,</span><br><span>diff --git a/src/osmo-hnodeb/nas.c b/src/osmo-hnodeb/nas.c</span><br><span>index 163f458..293c46e 100644</span><br><span>--- a/src/osmo-hnodeb/nas.c</span><br><span>+++ b/src/osmo-hnodeb/nas.c</span><br><span>@@ -87,7 +87,7 @@</span><br><span> parse_res = tlv_parse(&tp, &gsm48_mm_att_tlvdef, &gh->data[0], len, 0, 0);</span><br><span> if (parse_res <= 0) {</span><br><span> uint8_t msg_type = gsm48_hdr_msg_type(gh);</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Error parsing MM message 0x%hhx: %d\n", msg_type, parse_res);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_ERROR, "Error parsing MM message 0x%hhx: %d\n", msg_type, parse_res);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -96,14 +96,14 @@</span><br><span> </span><br><span> int hnb_nas_rx_lu_accept(struct gsm48_hdr *gh, int len, int *sent_tmsi)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- printf(" :D Location Update Accept :D\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_INFO, " :D Location Update Accept :D\n");</span><br><span> struct gsm48_loc_area_id *lai;</span><br><span> </span><br><span> lai = (struct gsm48_loc_area_id *)&gh->data[0];</span><br><span> </span><br><span> struct osmo_location_area_id laid;</span><br><span> gsm48_decode_lai2(lai, &laid);</span><br><span style="color: hsl(0, 100%, 40%);">- printf("LU: mcc %s mnc %s lac %hd\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_INFO, "LU: mcc %s mnc %s lac %hd\n",</span><br><span> osmo_mcc_name(laid.plmn.mcc), osmo_mnc_name(laid.plmn.mnc, laid.plmn.mnc_3_digits),</span><br><span> laid.lac);</span><br><span> </span><br><span>@@ -113,7 +113,7 @@</span><br><span> len -= (const char *)&gh->data[0] - (const char *)gh;</span><br><span> parse_res = tlv_parse(&tp, &gsm48_mm_att_tlvdef, &gh->data[0], len, 0, 0);</span><br><span> if (parse_res <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Error parsing Location Update Accept message: %d\n", parse_res);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_ERROR, "Error parsing Location Update Accept message: %d\n", parse_res);</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>@@ -128,7 +128,7 @@</span><br><span> </span><br><span> void hnb_nas_rx_mm_info(struct gsm48_hdr *gh, int len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- printf(" :) MM Info :)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_INFO, " :) MM Info :)\n");</span><br><span> struct tlv_parsed *tp = parse_mm(gh, len);</span><br><span> if (!tp)</span><br><span> return;</span><br><span>@@ -138,7 +138,7 @@</span><br><span> gsm_7bit_decode_n(name, 127,</span><br><span> TLVP_VAL(tp, GSM48_IE_NAME_SHORT)+1,</span><br><span> (TLVP_LEN(tp, GSM48_IE_NAME_SHORT)-1)*8/7);</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Info: Short Network Name: %s\n", name);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_INFO, "Info: Short Network Name: %s\n", name);</span><br><span> }</span><br><span> </span><br><span> if (TLVP_PRESENT(tp, GSM48_IE_NAME_LONG)) {</span><br><span>@@ -146,7 +146,7 @@</span><br><span> gsm_7bit_decode_n(name, 127,</span><br><span> TLVP_VAL(tp, GSM48_IE_NAME_LONG)+1,</span><br><span> (TLVP_LEN(tp, GSM48_IE_NAME_LONG)-1)*8/7);</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Info: Long Network Name: %s\n", name);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_INFO, "Info: Long Network Name: %s\n", name);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -158,11 +158,11 @@</span><br><span> len -= (const char *)&gh->data[0] - (const char *)gh;</span><br><span> </span><br><span> if (len < sizeof(*ar)) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("GSM48 Auth Req does not fit.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_ERROR, "GSM48 Auth Req does not fit.\n");</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf(" :) Authentication Request :)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_INFO, " :) Authentication Request :)\n");</span><br><span> </span><br><span> ar = (struct gsm48_auth_req*) &gh->data[0];</span><br><span> int seq = ar->key_seq;</span><br><span>@@ -183,9 +183,9 @@</span><br><span> memset(&vec, 0, sizeof(vec));</span><br><span> osmo_auth_gen_vec(&vec, &auth, ar->rand);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("seq %d rand %s",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_DEBUG, "seq %d rand %s",</span><br><span> seq, osmo_hexdump(ar->rand, sizeof(ar->rand)));</span><br><span style="color: hsl(0, 100%, 40%);">- printf(" --> sres %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_DEBUG, " --> sres %s\n",</span><br><span> osmo_hexdump(vec.sres, 4));</span><br><span> </span><br><span> return hnb_tx_dt(hnb, gen_nas_auth_resp(vec.sres));</span><br><span>@@ -197,7 +197,7 @@</span><br><span> </span><br><span> chan = hnb->cs.chan;</span><br><span> if (!chan) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("hnb_nas_rx_mm(): No CS channel established yet.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_ERROR, "hnb_nas_rx_mm(): No CS channel established yet.\n");</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>@@ -219,7 +219,7 @@</span><br><span> return 0;</span><br><span> </span><br><span> case GSM48_MT_MM_LOC_UPD_REJECT:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Received Location Update Reject\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_INFO, "Received Location Update Reject\n");</span><br><span> return 0;</span><br><span> </span><br><span> case GSM48_MT_MM_INFO:</span><br><span>@@ -231,7 +231,7 @@</span><br><span> return hnb_nas_rx_auth_req(hnb, gh, len);</span><br><span> </span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("04.08 message type not handled by hnb-test: 0x%x\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_INFO, "04.08 message type not handled by hnb-test: 0x%x\n",</span><br><span> msg_type);</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -241,14 +241,14 @@</span><br><span> void hnb_nas_rx_dtap(struct hnb *hnb, void *data, int len)</span><br><span> {</span><br><span> int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- printf("got %d bytes: %s\n", len, osmo_hexdump(data, len));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_INFO, "got %d bytes: %s\n", len, osmo_hexdump(data, len));</span><br><span> </span><br><span> // nas_pdu == '05 08 12' ==> IMEI Identity request</span><br><span> // '05 04 0d' ==> LU reject</span><br><span> </span><br><span> struct gsm48_hdr *gh = data;</span><br><span> if (len < sizeof(*gh)) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("hnb_nas_rx_dtap(): NAS PDU is too short: %d. Ignoring.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_ERROR, "hnb_nas_rx_dtap(): NAS PDU is too short: %d. Ignoring.\n",</span><br><span> len);</span><br><span> return;</span><br><span> }</span><br><span>@@ -258,10 +258,10 @@</span><br><span> case GSM48_PDISC_MM:</span><br><span> rc = hnb_nas_rx_mm(hnb, gh, len);</span><br><span> if (rc != 0)</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Error receiving MM message: %d\n", rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_ERROR, "Error receiving MM message: %d\n", rc);</span><br><span> return;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("04.08 discriminator not handled by hnb-test: %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAS, LOGL_NOTICE, "04.08 discriminator not handled by hnb-test: %d\n",</span><br><span> pdisc);</span><br><span> return;</span><br><span> }</span><br><span>diff --git a/src/osmo-hnodeb/ranap.c b/src/osmo-hnodeb/ranap.c</span><br><span>index 8f1b9c0..fae87b7 100644</span><br><span>--- a/src/osmo-hnodeb/ranap.c</span><br><span>+++ b/src/osmo-hnodeb/ranap.c</span><br><span>@@ -35,7 +35,7 @@</span><br><span> }</span><br><span> </span><br><span> #define PP(octet_string_t) \</span><br><span style="color: hsl(0, 100%, 40%);">- printf(#octet_string_t " = %s\n",\</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRANAP, LOGL_INFO, #octet_string_t " = %s\n",\</span><br><span> printstr(&octet_string_t))</span><br><span> </span><br><span> void hnb_rua_dt_handle_ranap(struct hnb *hnb,</span><br><span>@@ -46,12 +46,12 @@</span><br><span> RANAP_PermittedIntegrityProtectionAlgorithms_t *algs;</span><br><span> RANAP_IntegrityProtectionAlgorithm_t *first_alg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("rx ranap_msg->procedureCode %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRANAP, LOGL_INFO, "rx ranap_msg->procedureCode %d\n",</span><br><span> ranap_msg->procedureCode);</span><br><span> </span><br><span> switch (ranap_msg->procedureCode) {</span><br><span> case RANAP_ProcedureCode_id_DirectTransfer:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("rx DirectTransfer: presence = %hx\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRANAP, LOGL_INFO, "rx DirectTransfer: presence = %hx\n",</span><br><span> ranap_msg->msg.directTransferIEs.presenceMask);</span><br><span> PP(ranap_msg->msg.directTransferIEs.nas_pdu);</span><br><span> </span><br><span>@@ -62,14 +62,14 @@</span><br><span> return;</span><br><span> </span><br><span> case RANAP_ProcedureCode_id_SecurityModeControl:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("rx SecurityModeControl: presence = %hx\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRANAP, LOGL_INFO, "rx SecurityModeControl: presence = %hx\n",</span><br><span> ranap_msg->msg.securityModeCommandIEs.presenceMask);</span><br><span> </span><br><span> /* Just pick the first available IP alg, don't care about</span><br><span> * encryption (yet?) */</span><br><span> algs = &ranap_msg->msg.securityModeCommandIEs.integrityProtectionInformation.permittedAlgorithms;</span><br><span> if (algs->list.count < 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Security Mode Command: No permitted algorithms.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRANAP, LOGL_INFO, "Security Mode Command: No permitted algorithms.\n");</span><br><span> return;</span><br><span> }</span><br><span> first_alg = *algs->list.array;</span><br><span>@@ -88,7 +88,7 @@</span><br><span> {</span><br><span> char imsi[16];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("rx ranap_msg->procedureCode %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRANAP, LOGL_INFO, "rx ranap_msg->procedureCode %d\n",</span><br><span> ranap_msg->procedureCode);</span><br><span> </span><br><span> switch (ranap_msg->procedureCode) {</span><br><span>@@ -99,7 +99,7 @@</span><br><span> ranap_msg->msg.pagingIEs.permanentNAS_UE_ID.choice.iMSI.size);</span><br><span> } else imsi[0] = '\0';</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("rx Paging: presence=%hx domain=%ld IMSI=%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRANAP, LOGL_INFO, "rx Paging: presence=%hx domain=%ld IMSI=%s\n",</span><br><span> ranap_msg->msg.pagingIEs.presenceMask,</span><br><span> ranap_msg->msg.pagingIEs.cN_DomainIndicator,</span><br><span> imsi</span><br><span>@@ -158,7 +158,7 @@</span><br><span> </span><br><span> void hnb_rx_secmode_cmd(struct hnb *hnb, long ip_alg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- printf(" :) Security Mode Command :)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRANAP, LOGL_INFO, " :) Security Mode Command :)\n");</span><br><span> /* not caring about encryption yet, just pass 0 for No Encryption. */</span><br><span> hnb_tx_dt(hnb, ranap_new_msg_sec_mod_compl(ip_alg, 0));</span><br><span> }</span><br><span>@@ -170,6 +170,6 @@</span><br><span> </span><br><span> void hnb_rx_paging(struct hnb *hnb, const char *imsi)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- printf(" :) Paging Request for %s :)\n", imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRANAP, LOGL_INFO, " :) Paging Request for %s :)\n", imsi);</span><br><span> /* TODO reply */</span><br><span> }</span><br><span>diff --git a/src/osmo-hnodeb/rua.c b/src/osmo-hnodeb/rua.c</span><br><span>index d7352b6..0dd8c3a 100644</span><br><span>--- a/src/osmo-hnodeb/rua.c</span><br><span>+++ b/src/osmo-hnodeb/rua.c</span><br><span>@@ -36,7 +36,7 @@</span><br><span> </span><br><span> chan = hnb->cs.chan;</span><br><span> if (!chan) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("hnb_nas_tx_tmsi_realloc_compl(): No CS channel established yet.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_INFO, "hnb_nas_tx_tmsi_realloc_compl(): No CS channel established yet.\n");</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>@@ -52,7 +52,7 @@</span><br><span> </span><br><span> rc = rua_decode_directtransferies(&ies, in);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("failed to decode RUA DT IEs\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_INFO, "failed to decode RUA DT IEs\n");</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>@@ -69,7 +69,7 @@</span><br><span> </span><br><span> rc = rua_decode_connectionlesstransferies(&ies, in);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("failed to decode RUA CL IEs\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_INFO, "failed to decode RUA CL IEs\n");</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>@@ -94,45 +94,45 @@</span><br><span> </span><br><span> switch (pdu->present) {</span><br><span> case RUA_RUA_PDU_PR_successfulOutcome:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA_RUA_PDU_PR_successfulOutcome\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_INFO, "RUA_RUA_PDU_PR_successfulOutcome\n");</span><br><span> break;</span><br><span> case RUA_RUA_PDU_PR_initiatingMessage:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA_RUA_PDU_PR_initiatingMessage\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_INFO, "RUA_RUA_PDU_PR_initiatingMessage\n");</span><br><span> break;</span><br><span> case RUA_RUA_PDU_PR_NOTHING:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA_RUA_PDU_PR_NOTHING\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_INFO, "RUA_RUA_PDU_PR_NOTHING\n");</span><br><span> break;</span><br><span> case RUA_RUA_PDU_PR_unsuccessfulOutcome:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA_RUA_PDU_PR_unsuccessfulOutcome\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_INFO, "RUA_RUA_PDU_PR_unsuccessfulOutcome\n");</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Unexpected RUA message received\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_INFO, "Unexpected RUA message received\n");</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span> switch (pdu->choice.successfulOutcome.procedureCode) {</span><br><span> case RUA_ProcedureCode_id_ConnectionlessTransfer:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA rx Connectionless Transfer\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_INFO, "RUA rx Connectionless Transfer\n");</span><br><span> hnb_rua_cl_handle(hnb, &pdu->choice.successfulOutcome.value);</span><br><span> break;</span><br><span> case RUA_ProcedureCode_id_Connect:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA rx Connect\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_INFO, "RUA rx Connect\n");</span><br><span> break;</span><br><span> case RUA_ProcedureCode_id_DirectTransfer:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA rx DirectTransfer\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_INFO, "RUA rx DirectTransfer\n");</span><br><span> hnb_rua_dt_handle(hnb, &pdu->choice.successfulOutcome.value);</span><br><span> break;</span><br><span> case RUA_ProcedureCode_id_Disconnect:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA rx Disconnect\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_INFO, "RUA rx Disconnect\n");</span><br><span> break;</span><br><span> case RUA_ProcedureCode_id_ErrorIndication:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA rx ErrorIndication\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_INFO, "RUA rx ErrorIndication\n");</span><br><span> break;</span><br><span> case RUA_ProcedureCode_id_privateMessage:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA rx privateMessage\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_INFO, "RUA rx privateMessage\n");</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA rx unknown message\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRUA, LOGL_INFO, "RUA rx unknown message\n");</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017">change 26017</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-hnodeb/+/26017"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hnodeb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I649b17803aeffd20354aa76dde61094959f08e43 </div>
<div style="display:none"> Gerrit-Change-Number: 26017 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>