<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/26686">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Define mgcp_rtp_end.output_enabled as bool<br><br>Change-Id: I55f7796ef774f86050041f2c5e3a2f8f7d1f56df<br>---<br>M include/osmocom/mgcp/mgcp_network.h<br>M src/libosmo-mgcp/mgcp_conn.c<br>M src/libosmo-mgcp/mgcp_msg.c<br>M tests/mgcp/mgcp_test.c<br>4 files changed, 6 insertions(+), 7 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/86/26686/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h</span><br><span>index b9cf5e3..e3fa3b1 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_network.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_network.h</span><br><span>@@ -110,8 +110,8 @@</span><br><span>   uint32_t packet_duration_ms;</span><br><span>         int maximum_packet_time; /* -1: not set */</span><br><span>   char *fmtp_extra;</span><br><span style="color: hsl(0, 100%, 40%);">-       /* are we transmitting packets (1) or dropping (0) outbound packets */</span><br><span style="color: hsl(0, 100%, 40%);">-  int output_enabled;</span><br><span style="color: hsl(120, 100%, 40%);">+   /* are we transmitting packets (true) or dropping (false) outbound packets */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool output_enabled;</span><br><span>         /* FIXME: This parameter can be set + printed, but is nowhere used! */</span><br><span>       int force_output_ptime;</span><br><span> </span><br><span>diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>index 5c3c60e..9c2fb0f 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_conn.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>@@ -108,7 +108,7 @@</span><br><span>       /* Set default values */</span><br><span>     end->frames_per_packet = 0;  /* unknown */</span><br><span>        end->packet_duration_ms = DEFAULT_RTP_AUDIO_PACKET_DURATION_MS;</span><br><span style="color: hsl(0, 100%, 40%);">-      end->output_enabled = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+   end->output_enabled = false;</span><br><span>      end->maximum_packet_time = -1;</span><br><span> </span><br><span>        conn_rtp->rate_ctr_group = rate_ctr_group_alloc(conn, &rate_ctr_group_desc, rate_ctr_index++);</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c</span><br><span>index f36fa71..4581b76 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_msg.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_msg.c</span><br><span>@@ -110,8 +110,7 @@</span><br><span> </span><br><span>     /* Special handling for RTP connections */</span><br><span>   if (conn->type == MGCP_CONN_TYPE_RTP) {</span><br><span style="color: hsl(0, 100%, 40%);">-              conn->u.rtp.end.output_enabled =</span><br><span style="color: hsl(0, 100%, 40%);">-                 conn->mode & MGCP_CONN_SEND_ONLY ? 1 : 0;</span><br><span style="color: hsl(120, 100%, 40%);">+          conn->u.rtp.end.output_enabled = !!(conn->mode & MGCP_CONN_SEND_ONLY);</span><br><span>     }</span><br><span> </span><br><span>        LOGPENDP(endp, DLMGCP, LOGL_DEBUG, "conn:%s\n", mgcp_conn_dump(conn));</span><br><span>@@ -121,7 +120,7 @@</span><br><span> </span><br><span>   /* Special handling für RTP connections */</span><br><span>  if (conn->type == MGCP_CONN_TYPE_RTP) {</span><br><span style="color: hsl(0, 100%, 40%);">-              LOGPCONN(conn, DLMGCP, LOGL_DEBUG, "output_enabled %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+           LOGPCONN(conn, DLMGCP, LOGL_DEBUG, "output_enabled %u\n",</span><br><span>                   conn->u.rtp.end.output_enabled);</span><br><span>         }</span><br><span> </span><br><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index a8aad14..9b4933c 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -868,7 +868,7 @@</span><br><span>                                     printf("Connection mode not set\n");</span><br><span> </span><br><span>                           OSMO_ASSERT(conn->end.output_enabled</span><br><span style="color: hsl(0, 100%, 40%);">-                                     == (conn->conn->mode & MGCP_CONN_SEND_ONLY ? 1 : 0));</span><br><span style="color: hsl(120, 100%, 40%);">+                                       == !!(conn->conn->mode & MGCP_CONN_SEND_ONLY));</span><br><span> </span><br><span>                            conn->conn->mode |= CONN_UNMODIFIED;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/26686">change 26686</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-mgw/+/26686"/><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-Change-Id: I55f7796ef774f86050041f2c5e3a2f8f7d1f56df </div>
<div style="display:none"> Gerrit-Change-Number: 26686 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>