<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/14014">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmux: Use LOGPCONN in several log calls<br><br>Change-Id: Ieb2c4b53db2df44e0dfbedb7de76d8cf6c83da91<br>---<br>M src/libosmo-mgcp/mgcp_osmux.c<br>1 file changed, 30 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/14/14014/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>index 9c3844f..149f27b 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>@@ -324,23 +324,23 @@</span><br><span> switch(conn->osmux.state) {</span><br><span> case OSMUX_STATE_ACTIVATING:</span><br><span> if (osmux_enable_conn(endp, conn, &conn->end.addr, htons(endp->cfg->osmux_port)) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Could not enable osmux for conn:%s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_conn_dump(conn->conn));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Could not enable osmux for conn:%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_conn_dump(conn->conn));</span><br><span> return -1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Osmux CID %u for %s:%u is now enabled\n",</span><br><span style="color: hsl(0, 100%, 40%);">- conn->osmux.cid, inet_ntoa(conn->end.addr),</span><br><span style="color: hsl(0, 100%, 40%);">- endp->cfg->osmux_port);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Osmux CID %u for %s:%u is now enabled\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->osmux.cid, inet_ntoa(conn->end.addr),</span><br><span style="color: hsl(120, 100%, 40%);">+ endp->cfg->osmux_port);</span><br><span> return 0;</span><br><span> case OSMUX_STATE_ENABLED:</span><br><span> return 0;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Osmux %s in conn %s without full negotiation, state %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- sending ? "sent" : "received",</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_conn_dump(conn->conn), conn->osmux.state);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Osmux %s in conn %s without full negotiation, state %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ sending ? "sent" : "received",</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_conn_dump(conn->conn), conn->osmux.state);</span><br><span> return -1;</span><br><span> }</span><br><span> }</span><br><span>@@ -562,19 +562,22 @@</span><br><span> </span><br><span> /* Check if osmux is enabled for the specified connection */</span><br><span> if (conn->osmux.state != OSMUX_STATE_ACTIVATING) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_ERROR, "conn:%s didn't negotiate Osmux, state %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_conn_dump(conn->conn), conn->osmux.state);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "conn:%s didn't negotiate Osmux, state %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_conn_dump(conn->conn), conn->osmux.state);</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span> conn->osmux.in = osmux_handle_lookup(endp->cfg, addr, port);</span><br><span> if (!conn->osmux.in) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_ERROR, "Cannot allocate input osmux handle for conn:%s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_conn_dump(conn->conn));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Cannot allocate input osmux handle for conn:%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_conn_dump(conn->conn));</span><br><span> return -1;</span><br><span> }</span><br><span> if (osmux_xfrm_input_open_circuit(conn->osmux.in, conn->osmux.cid, osmux_dummy) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_ERROR, "Cannot open osmux circuit %u for conn:%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Cannot open osmux circuit %u for conn:%s\n",</span><br><span> conn->osmux.cid, mgcp_conn_dump(conn->conn));</span><br><span> return -1;</span><br><span> }</span><br><span>@@ -611,8 +614,9 @@</span><br><span> if (conn->osmux.state != OSMUX_STATE_ENABLED)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_INFO, "Releasing connection %s using Osmux CID %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- conn->conn->id, conn->osmux.cid);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCONN(conn->conn, DLMGCP, LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Releasing connection %s using Osmux CID %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->conn->id, conn->osmux.cid);</span><br><span> </span><br><span> /* We are closing, we don't need pending RTP packets to be transmitted */</span><br><span> osmux_xfrm_output_set_tx_cb(&conn->osmux.out, NULL, NULL);</span><br><span>@@ -642,16 +646,17 @@</span><br><span> int conn_osmux_allocate_cid(struct mgcp_conn_rtp *conn, int osmux_cid)</span><br><span> {</span><br><span> if (osmux_cid != -1 && osmux_cid_pool_allocated((uint8_t) osmux_cid)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_INFO, "Conn %s: Osmux CID %d already allocated!\n",</span><br><span style="color: hsl(0, 100%, 40%);">- conn->conn->id, osmux_cid);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCONN(conn->conn, DLMGCP, LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Osmux CID %d already allocated!\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_cid);</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span> if (osmux_cid == -1) {</span><br><span> osmux_cid = osmux_cid_pool_get_next();</span><br><span> if (osmux_cid == -1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_INFO, "Conn %s: no available Osmux CID to allocate!\n",</span><br><span style="color: hsl(0, 100%, 40%);">- conn->conn->id);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCONN(conn->conn, DLMGCP, LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no available Osmux CID to allocate!\n");</span><br><span> return -1;</span><br><span> }</span><br><span> } else</span><br><span>@@ -690,9 +695,9 @@</span><br><span> if (endp_osmux_state_check(endp, conn, true) < 0)</span><br><span> return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- "sending OSMUX dummy load to %s CID %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- inet_ntoa(conn->end.addr), conn->osmux.cid);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCONN(conn->conn, DLMGCP, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ "sending OSMUX dummy load to %s CID %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntoa(conn->end.addr), conn->osmux.cid);</span><br><span> </span><br><span> return mgcp_udp_send(osmux_fd.fd, &conn->end.addr,</span><br><span> htons(endp->cfg->osmux_port), buf, sizeof(buf));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14014">change 14014</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/14014"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ieb2c4b53db2df44e0dfbedb7de76d8cf6c83da91 </div>
<div style="display:none"> Gerrit-Change-Number: 14014 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>