<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19163">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_conn: move struct mgcp_conn mgcp_conn.h<br><br>The struct mgcp_conn is currently defined in mgcp_internal.h, however it<br>makes more sense to put the struct in mgcp_conn.h<br><br>Change-Id: Ibe9a356300ddb9567432fe48e37c956b7125c79c<br>Related: OS#2659<br>---<br>M include/osmocom/mgcp/mgcp_conn.h<br>M include/osmocom/mgcp/mgcp_internal.h<br>2 files changed, 41 insertions(+), 42 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/63/19163/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h</span><br><span>index f4e89f2..ff5a779 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_conn.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_conn.h</span><br><span>@@ -33,6 +33,47 @@</span><br><span> (conn)->id, \</span><br><span> ## args)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Connection type, specifies which member of the union "u" in mgcp_conn</span><br><span style="color: hsl(120, 100%, 40%);">+ * contains a useful connection description (currently only RTP) */</span><br><span style="color: hsl(120, 100%, 40%);">+enum mgcp_conn_type {</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CONN_TYPE_RTP,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! MGCP connection (untyped) */</span><br><span style="color: hsl(120, 100%, 40%);">+struct mgcp_conn {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! list head */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head entry;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Backpointer to the endpoint where the conn belongs to */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_endpoint *endp;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! type of the connection (union) */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum mgcp_conn_type type;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! mode of the connection */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum mgcp_connection_mode mode;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! copy of the mode to restore the original setting (VTY) */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum mgcp_connection_mode mode_orig;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! connection id to identify the connection */</span><br><span style="color: hsl(120, 100%, 40%);">+ char id[MGCP_CONN_ID_MAXLEN];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! human readable name (vty, logging) */</span><br><span style="color: hsl(120, 100%, 40%);">+ char name[256];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! activity tracker (for cleaning up inactive connections) */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_timer_list watchdog;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! union with connection description */</span><br><span style="color: hsl(120, 100%, 40%);">+ union {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_conn_rtp rtp;</span><br><span style="color: hsl(120, 100%, 40%);">+ } u;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! pointer to optional private data */</span><br><span style="color: hsl(120, 100%, 40%);">+ void *priv;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* RTP connection related counters */</span><br><span> enum {</span><br><span> IN_STREAM_ERR_TSTMP_CTR,</span><br><span>diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>index e415bbc..a9d5ea4 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_internal.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>@@ -153,7 +153,6 @@</span><br><span> };</span><br><span> </span><br><span> #include <osmocom/mgcp/osmux.h></span><br><span style="color: hsl(0, 100%, 40%);">-struct mgcp_conn;</span><br><span> </span><br><span> /* MGCP connection (RTP) */</span><br><span> struct mgcp_conn_rtp {</span><br><span>@@ -196,47 +195,6 @@</span><br><span> struct rate_ctr_group *rate_ctr_group;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Connection type, specifies which member of the union "u" in mgcp_conn</span><br><span style="color: hsl(0, 100%, 40%);">- * contains a useful connection description (currently only RTP) */</span><br><span style="color: hsl(0, 100%, 40%);">-enum mgcp_conn_type {</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_CONN_TYPE_RTP,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*! MGCP connection (untyped) */</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgcp_conn {</span><br><span style="color: hsl(0, 100%, 40%);">- /*! list head */</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head entry;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /*! Backpointer to the endpoint where the conn belongs to */</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_endpoint *endp;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /*! type of the connection (union) */</span><br><span style="color: hsl(0, 100%, 40%);">- enum mgcp_conn_type type;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /*! mode of the connection */</span><br><span style="color: hsl(0, 100%, 40%);">- enum mgcp_connection_mode mode;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /*! copy of the mode to restore the original setting (VTY) */</span><br><span style="color: hsl(0, 100%, 40%);">- enum mgcp_connection_mode mode_orig;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /*! connection id to identify the connection */</span><br><span style="color: hsl(0, 100%, 40%);">- char id[MGCP_CONN_ID_MAXLEN];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /*! human readable name (vty, logging) */</span><br><span style="color: hsl(0, 100%, 40%);">- char name[256];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /*! activity tracker (for cleaning up inactive connections) */</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_timer_list watchdog;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /*! union with connection description */</span><br><span style="color: hsl(0, 100%, 40%);">- union {</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_conn_rtp rtp;</span><br><span style="color: hsl(0, 100%, 40%);">- } u;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /*! pointer to optional private data */</span><br><span style="color: hsl(0, 100%, 40%);">- void *priv;</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #include <osmocom/mgcp/mgcp_conn.h></span><br><span> </span><br><span> struct mgcp_endpoint_type;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19163">change 19163</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/+/19163"/><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: Ibe9a356300ddb9567432fe48e37c956b7125c79c </div>
<div style="display:none"> Gerrit-Change-Number: 19163 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>