<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/15072">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Cosmetic: Logging and Comments, spelling and clarity changes<br><br>Also removes a comment in sdp_create_file() about the<br>IP address in o= and c= having to be the same.<br>It is completely legal in SDP and often normal for the<br>originator and the connection information IP to be different.<br><br>Change-Id: I057573467c335fc27ead391c0bb4c775f2f6ba0a<br>---<br>M src/call.c<br>M src/mncc.c<br>M src/sdp.c<br>M src/sip.c<br>M src/vty.c<br>5 files changed, 21 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/call.c b/src/call.c</span><br><span>index 67207e5..9f593ea 100644</span><br><span>--- a/src/call.c</span><br><span>+++ b/src/call.c</span><br><span>@@ -169,6 +169,6 @@</span><br><span> mncc = (struct mncc_call_leg *) leg;</span><br><span> return get_value_string(mncc_state_vals, mncc->state);</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- return "unknown call type";</span><br><span style="color: hsl(120, 100%, 40%);">+ return "Unknown call type";</span><br><span> }</span><br><span> }</span><br><span>diff --git a/src/mncc.c b/src/mncc.c</span><br><span>index 8f512d9..a60b104 100644</span><br><span>--- a/src/mncc.c</span><br><span>+++ b/src/mncc.c</span><br><span>@@ -50,7 +50,7 @@</span><br><span> struct mncc_call_leg *leg = data;</span><br><span> struct call_leg *other_leg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMNCC, LOGL_ERROR, "cmd(0x%x) never arrived for leg(%u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMNCC, LOGL_ERROR, "command(0x%x) never arrived for leg(%u)\n",</span><br><span> leg->rsp_wanted, leg->callref);</span><br><span> </span><br><span> other_leg = call_leg_other(&leg->base);</span><br><span>@@ -72,7 +72,7 @@</span><br><span> static void stop_cmd_timer(struct mncc_call_leg *leg, uint32_t got_res)</span><br><span> {</span><br><span> if (leg->rsp_wanted != got_res) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMNCC, LOGL_ERROR, "Wanted rsp(%s) but got(%s) for leg(%u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMNCC, LOGL_ERROR, "Wanted response(%s) but got(%s) for leg(%u)\n",</span><br><span> osmo_mncc_name(leg->rsp_wanted), osmo_mncc_name(got_res), leg->callref);</span><br><span> return;</span><br><span> }</span><br><span>@@ -141,7 +141,7 @@</span><br><span> rc = write(conn->fd.fd, mncc, sizeof(*mncc));</span><br><span> LOGP(DMNCC, LOGL_DEBUG, "MNCC sent message type: %s\n", osmo_mncc_name(mncc->msg_type));</span><br><span> if (rc != sizeof(*mncc)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMNCC, LOGL_ERROR, "Failed to send message call(%u)\n", callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u)\n", callref);</span><br><span> close_connection(conn);</span><br><span> }</span><br><span> }</span><br><span>@@ -164,12 +164,12 @@</span><br><span> </span><br><span> rc = write(conn->fd.fd, &mncc, sizeof(mncc));</span><br><span> if (rc != sizeof(mncc)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMNCC, LOGL_ERROR, "Failed to send message call(%u)\n", callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u)\n", callref);</span><br><span> close_connection(conn);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Send a MNCC_RTP_CONNET to the MSC for the given call legs */</span><br><span style="color: hsl(120, 100%, 40%);">+/* Send a MNCC_RTP_CONNECT to the MSC for the given call legs */</span><br><span> static bool send_rtp_connect(struct mncc_call_leg *leg, struct call_leg *other)</span><br><span> {</span><br><span> struct gsm_mncc_rtp mncc = { 0, };</span><br><span>@@ -194,7 +194,7 @@</span><br><span> LOGP(DMNCC, LOGL_DEBUG, "SEND rtp_connect: IP=(%s) PORT=(%u)\n", ip_addr, mncc.port);</span><br><span> rc = write(leg->conn->fd.fd, &mncc, sizeof(mncc));</span><br><span> if (rc != sizeof(mncc)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMNCC, LOGL_ERROR, "Failed to send message leg(%u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u)\n",</span><br><span> leg->callref);</span><br><span> close_connection(leg->conn);</span><br><span> return false;</span><br><span>@@ -206,7 +206,7 @@</span><br><span> </span><br><span> struct mncc_call_leg *leg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMNCC, LOGL_DEBUG, "UPDATE RTP with LEG Type (%u)\n", _leg->type);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMNCC, LOGL_DEBUG, "UPDATE RTP for LEG Type (%u)\n", _leg->type);</span><br><span> </span><br><span> if (_leg->type == CALL_TYPE_MNCC) {</span><br><span> leg = (struct mncc_call_leg *) _leg;</span><br><span>@@ -251,7 +251,7 @@</span><br><span> mncc_fill_header(&out_mncc, MNCC_ALERT_REQ, leg->callref);</span><br><span> /* GSM 04.08 10.5.4.21 */</span><br><span> out_mncc.fields |= MNCC_F_PROGRESS;</span><br><span style="color: hsl(0, 100%, 40%);">- out_mncc.progress.coding = GSM48_CAUSE_CODING_GSM; /* Standard defined for the GSMßPLMNS */</span><br><span style="color: hsl(120, 100%, 40%);">+ out_mncc.progress.coding = GSM48_CAUSE_CODING_GSM; /* Standard defined for the GSM PLMNS */</span><br><span> out_mncc.progress.location = GSM48_CAUSE_LOC_PRN_S_LU; /* Private network serving the local user */</span><br><span> out_mncc.progress.descr = GSM48_PROGR_IN_BAND_AVAIL; /* In-band information or appropriate pattern now available */</span><br><span> </span><br><span>@@ -277,7 +277,7 @@</span><br><span> /* drop it directly, if not connected */</span><br><span> if (leg->conn->state != MNCC_READY) {</span><br><span> LOGP(DMNCC, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- "MNCC not connected releasing leg leg(%u)\n", leg->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ "MNCC not connected releasing leg(%u)\n", leg->callref);</span><br><span> return mncc_leg_release(leg);</span><br><span> }</span><br><span> </span><br><span>@@ -422,7 +422,7 @@</span><br><span> struct in_addr net = { .s_addr = leg->base.ip };</span><br><span> inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr));</span><br><span> LOGP(DMNCC, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- "RTP cnt leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "RTP continue leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n",</span><br><span> leg->callref, ip_addr, leg->base.port,</span><br><span> leg->base.payload_type, leg->base.payload_msg_type);</span><br><span> stop_cmd_timer(leg, MNCC_RTP_CREATE);</span><br><span>@@ -658,7 +658,7 @@</span><br><span> return;</span><br><span> </span><br><span> LOGP(DMNCC, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- "leg(%u) confirmend. creating RTP socket.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "leg(%u) confirmed. creating RTP socket.\n",</span><br><span> leg->callref);</span><br><span> </span><br><span> start_cmd_timer(leg, MNCC_RTP_CREATE);</span><br><span>@@ -700,7 +700,7 @@</span><br><span> return;</span><br><span> </span><br><span> LOGP(DMNCC, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- "leg(%u) is req hold.\n", leg->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ "leg(%u) is requesting hold.\n", leg->callref);</span><br><span> other_leg = call_leg_other(&leg->base);</span><br><span> other_leg->hold_call(other_leg);</span><br><span> mncc_send(leg->conn, MNCC_HOLD_CNF, leg->callref);</span><br><span>@@ -718,7 +718,7 @@</span><br><span> return;</span><br><span> </span><br><span> LOGP(DMNCC, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- "leg(%u) is req unhold.\n", leg->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ "leg(%u) is requesting unhold.\n", leg->callref);</span><br><span> other_leg = call_leg_other(&leg->base);</span><br><span> other_leg->retrieve_call(other_leg);</span><br><span> mncc_send(leg->conn, MNCC_RETRIEVE_CNF, leg->callref);</span><br><span>diff --git a/src/sdp.c b/src/sdp.c</span><br><span>index 56a41f7..46330cd 100644</span><br><span>--- a/src/sdp.c</span><br><span>+++ b/src/sdp.c</span><br><span>@@ -243,7 +243,7 @@</span><br><span> "%s"</span><br><span> "a=rtpmap:%d %s/8000\r\n"</span><br><span> "%s",</span><br><span style="color: hsl(0, 100%, 40%);">- ip_addr, ip_addr, /* never use diff. addr! */</span><br><span style="color: hsl(120, 100%, 40%);">+ ip_addr, ip_addr,</span><br><span> other->port, other->payload_type,</span><br><span> fmtp_str ? fmtp_str : "",</span><br><span> other->payload_type,</span><br><span>diff --git a/src/sip.c b/src/sip.c</span><br><span>index 350eb0b..327e90f 100644</span><br><span>--- a/src/sip.c</span><br><span>+++ b/src/sip.c</span><br><span>@@ -150,7 +150,7 @@</span><br><span> * not this place. It starts with the TCH/F vs. TCH/H selection based</span><br><span> * on the offered codecs, and then RTP_CREATE should have it. So both</span><br><span> * are GSM related... and do not belong here. Just pick the first codec</span><br><span style="color: hsl(0, 100%, 40%);">- * so the IP addresss port and payload type is set.</span><br><span style="color: hsl(120, 100%, 40%);">+ * so the IP address, port and payload type is set.</span><br><span> */</span><br><span> if (!sdp_extract_sdp(leg, sip, true)) {</span><br><span> LOGP(DSIP, LOGL_ERROR, "leg(%p) no audio, releasing\n", leg);</span><br><span>@@ -395,7 +395,7 @@</span><br><span> struct sip_call_leg *leg;</span><br><span> struct call_leg *other;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_ERROR, "Canceled on leg(%p)\n", hmagic);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_ERROR, "Cancelled on leg(%p)\n", hmagic);</span><br><span> </span><br><span> leg = (struct sip_call_leg *) hmagic;</span><br><span> other = call_leg_other(&leg->base);</span><br><span>@@ -453,12 +453,12 @@</span><br><span> </span><br><span> switch (leg->state) {</span><br><span> case SIP_CC_INITIAL:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_NOTICE, "Canceling leg(%p) in int state\n", leg);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_NOTICE, "Cancelling leg(%p) in initial state\n", leg);</span><br><span> nua_handle_destroy(leg->nua_handle);</span><br><span> call_leg_release(&leg->base);</span><br><span> break;</span><br><span> case SIP_CC_DLG_CNFD:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_NOTICE, "Canceling leg(%p) in cnfd state\n", leg);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_NOTICE, "Cancelling leg(%p) in confirmed state\n", leg);</span><br><span> if (leg->dir == SIP_DIR_MT)</span><br><span> nua_cancel(leg->nua_handle, TAG_END());</span><br><span> else {</span><br><span>@@ -471,7 +471,7 @@</span><br><span> break;</span><br><span> case SIP_CC_CONNECTED:</span><br><span> case SIP_CC_HOLD:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_NOTICE, "Ending leg(%p) in con\n", leg);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_NOTICE, "Ending leg(%p) in connected state.\n", leg);</span><br><span> nua_bye(leg->nua_handle, TAG_END());</span><br><span> break;</span><br><span> }</span><br><span>diff --git a/src/vty.c b/src/vty.c</span><br><span>index c11a976..ea76d46 100644</span><br><span>--- a/src/vty.c</span><br><span>+++ b/src/vty.c</span><br><span>@@ -129,7 +129,7 @@</span><br><span> </span><br><span> DEFUN(cfg_sip_remote_addr, cfg_sip_remote_addr_cmd,</span><br><span> "remote ADDR <1-65534>",</span><br><span style="color: hsl(0, 100%, 40%);">- "Remore information\nSIP hostname\nport\n")</span><br><span style="color: hsl(120, 100%, 40%);">+ "Remote information\nSIP hostname\nport\n")</span><br><span> {</span><br><span> talloc_free((char *) g_app.sip.remote_addr);</span><br><span> g_app.sip.remote_addr = talloc_strdup(tall_mncc_ctx, argv[0]);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/15072">change 15072</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-sip-connector/+/15072"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sip-connector </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I057573467c335fc27ead391c0bb4c775f2f6ba0a </div>
<div style="display:none"> Gerrit-Change-Number: 15072 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>