<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10248">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">USSD: Further unification of log output; Use LOGPSS when possible<br><br>Change-Id: I2c508fe70337d24c4a8b48e0393ad3c979eea0e7<br>---<br>M src/hlr_ussd.c<br>1 file changed, 13 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/48/10248/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c</span><br><span>index fdbde9d..8710061 100644</span><br><span>--- a/src/hlr_ussd.c</span><br><span>+++ b/src/hlr_ussd.c</span><br><span>@@ -301,7 +301,7 @@</span><br><span> {</span><br><span> uint8_t comp_type = gsup->ss_info[0];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_INFO, "%s: SS CompType=%s, OpCode=%s\n", gsup->imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPSS(ss, LOGL_INFO, "SS CompType=%s, OpCode=%s\n",</span><br><span> gsm0480_comp_type_name(comp_type), gsm0480_op_code_name(req->opcode));</span><br><span> /* FIXME */</span><br><span> return 0;</span><br><span>@@ -314,13 +314,13 @@</span><br><span> struct msgb *msg_out;</span><br><span> bool is_euse_originated = conn_is_euse(conn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_INFO, "%s: USSD CompType=%s, OpCode=%s '%s'\n", gsup->imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPSS(ss, LOGL_INFO, "USSD CompType=%s, OpCode=%s '%s'\n",</span><br><span> gsm0480_comp_type_name(comp_type), gsm0480_op_code_name(req->opcode),</span><br><span> req->ussd_text);</span><br><span> </span><br><span> </span><br><span> if (!ss->euse) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_NOTICE, "%s: USSD for unknown code '%s'\n", gsup->imsi, req->ussd_text);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPSS(ss, LOGL_NOTICE, "USSD for unknown code '%s'\n", req->ussd_text);</span><br><span> ss_tx_error(ss, req->invoke_id, GSM0480_ERR_CODE_SS_NOT_AVAILABLE);</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -339,7 +339,7 @@</span><br><span> osmo_strlcpy(addr+5, ss->euse->name, sizeof(addr)-5);</span><br><span> conn = gsup_route_find(conn->server, (uint8_t *)addr, strlen(addr)+1);</span><br><span> if (!conn) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "Cannot find conn for EUSE %s\n", addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPSS(ss, LOGL_ERROR, "Cannot find conn for EUSE %s\n", addr);</span><br><span> ss_tx_error(ss, req->invoke_id, GSM0480_ERR_CODE_SYSTEM_FAILURE);</span><br><span> } else {</span><br><span> msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP USSD FW");</span><br><span>@@ -361,13 +361,13 @@</span><br><span> struct ss_session *ss;</span><br><span> struct ss_request req = {0};</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_INFO, "%s: Process SS (0x%08x, %s)\n", gsup->imsi, gsup->session_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_INFO, "%s/0x%08x: Process SS (%s)\n", gsup->imsi, gsup->session_id,</span><br><span> osmo_gsup_session_state_name(gsup->session_state));</span><br><span> </span><br><span> /* decode and find out what kind of SS message it is */</span><br><span> if (gsup->ss_info && gsup->ss_info_len) {</span><br><span> if (gsm0480_parse_facility_ie(gsup->ss_info, gsup->ss_info_len, &req)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "%s: Unable to parse SS request for 0x%08x: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "%s/0x%082x: Unable to parse SS request: %s\n",</span><br><span> gsup->imsi, gsup->session_id,</span><br><span> osmo_hexdump(gsup->ss_info, gsup->ss_info_len));</span><br><span> /* FIXME: Send a Reject component? */</span><br><span>@@ -379,13 +379,13 @@</span><br><span> case OSMO_GSUP_SESSION_STATE_BEGIN:</span><br><span> /* Check for overlapping Session ID usage */</span><br><span> if (ss_session_find(hlr, gsup->imsi, gsup->session_id)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "%s/0x%08x: BEGIN with non-uinque session ID!\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "%s/0x%08x: BEGIN with non-unique session ID!\n",</span><br><span> gsup->imsi, gsup->session_id);</span><br><span> goto out_err;</span><br><span> }</span><br><span> ss = ss_session_alloc(hlr, gsup->imsi, gsup->session_id);</span><br><span> if (!ss) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "%s: Unable to allocate SS session for 0x%08x\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "%s/0x%08x: Unable to allocate SS session\n",</span><br><span> gsup->imsi, gsup->session_id);</span><br><span> goto out_err;</span><br><span> }</span><br><span>@@ -407,7 +407,7 @@</span><br><span> case OSMO_GSUP_SESSION_STATE_CONTINUE:</span><br><span> ss = ss_session_find(hlr, gsup->imsi, gsup->session_id);</span><br><span> if (!ss) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "%s: CONTINUE for unknwon SS session 0x%08x\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "%s/0x%08x: CONTINUE for unknown SS session\n",</span><br><span> gsup->imsi, gsup->session_id);</span><br><span> goto out_err;</span><br><span> }</span><br><span>@@ -422,7 +422,7 @@</span><br><span> case OSMO_GSUP_SESSION_STATE_END:</span><br><span> ss = ss_session_find(hlr, gsup->imsi, gsup->session_id);</span><br><span> if (!ss) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "%s: END for unknwon SS session 0x%08x\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "%s/0x%08x: END for unknown SS session\n",</span><br><span> gsup->imsi, gsup->session_id);</span><br><span> goto out_err;</span><br><span> }</span><br><span>@@ -436,7 +436,8 @@</span><br><span> ss_session_free(ss);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "%s: Unknown SS State %d\n", gsup->imsi, gsup->session_state);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "%s/0x%08x: Unknown SS State %d\n", gsup->imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup->session_id, gsup->session_state);</span><br><span> goto out_err;</span><br><span> }</span><br><span> </span><br><span>@@ -448,7 +449,7 @@</span><br><span> </span><br><span> int rx_proc_ss_error(struct osmo_gsup_conn *conn, const struct osmo_gsup_message *gsup)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_NOTICE, "%s: Process SS ERROR (0x%08x, %s)\n", gsup->imsi, gsup->session_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_NOTICE, "%s/0x%08x: Process SS ERROR (%s)\n", gsup->imsi, gsup->session_id,</span><br><span> osmo_gsup_session_state_name(gsup->session_state));</span><br><span> return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10248">change 10248</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/10248"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I2c508fe70337d24c4a8b48e0393ad3c979eea0e7 </div>
<div style="display:none"> Gerrit-Change-Number: 10248 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>