<p>dexter <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/18755">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">endp: add typeset for e1-endpoints<br><br>Add an endpoint typeset for E1 support, also lets add dummy callbacks<br>for the cleanup and rtp dispatch functionality.<br><br>Related: OS#2547<br>Change-Id: I68b719a906e8f7251f0ca8c74ceec73bc40376f7<br>---<br>M include/osmocom/mgcp/mgcp_endp.h<br>M include/osmocom/mgcp/mgcp_internal.h<br>M src/libosmo-mgcp/mgcp_endp.c<br>M src/libosmo-mgcp/mgcp_network.c<br>4 files changed, 41 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h</span><br><span>index 8fb8d2c..0f9110c 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_endp.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_endp.h</span><br><span>@@ -60,6 +60,7 @@</span><br><span> /*! MGCP endpoint typeset */</span><br><span> struct mgcp_endpoint_typeset {</span><br><span> struct mgcp_endpoint_type rtp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_endpoint_type e1;</span><br><span> };</span><br><span> </span><br><span> /*! static MGCP endpoint typeset (pre-initalized, read-only) */</span><br><span>diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>index f143988..e415bbc 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_internal.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>@@ -262,6 +262,9 @@</span><br><span> int mgcp_dispatch_rtp_bridge_cb(int proto, struct sockaddr_in *addr, char *buf,</span><br><span> unsigned int buf_size, struct mgcp_conn *conn);</span><br><span> void mgcp_cleanup_rtp_bridge_cb(struct mgcp_endpoint *endp, struct mgcp_conn *conn);</span><br><span style="color: hsl(120, 100%, 40%);">+int mgcp_dispatch_e1_bridge_cb(int proto, struct sockaddr_in *addr, char *buf,</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int buf_size, struct mgcp_conn *conn);</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_cleanup_e1_bridge_cb(struct mgcp_endpoint *endp, struct mgcp_conn *conn);</span><br><span> int mgcp_bind_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port,</span><br><span> struct mgcp_conn_rtp *conn);</span><br><span> void mgcp_free_rtp_port(struct mgcp_rtp_end *end);</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c</span><br><span>index db8898b..94d4083 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_endp.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_endp.c</span><br><span>@@ -28,9 +28,17 @@</span><br><span> /* Endpoint typeset definition */</span><br><span> const struct mgcp_endpoint_typeset ep_typeset = {</span><br><span> /* Specify endpoint properties for RTP endpoint */</span><br><span style="color: hsl(0, 100%, 40%);">- .rtp.max_conns = 2,</span><br><span style="color: hsl(0, 100%, 40%);">- .rtp.dispatch_rtp_cb = mgcp_dispatch_rtp_bridge_cb,</span><br><span style="color: hsl(0, 100%, 40%);">- .rtp.cleanup_cb = mgcp_cleanup_rtp_bridge_cb</span><br><span style="color: hsl(120, 100%, 40%);">+ .rtp = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .max_conns = 2,</span><br><span style="color: hsl(120, 100%, 40%);">+ .dispatch_rtp_cb = mgcp_dispatch_rtp_bridge_cb,</span><br><span style="color: hsl(120, 100%, 40%);">+ .cleanup_cb = mgcp_cleanup_rtp_bridge_cb,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Specify endpoint properties for E1 endpoint */</span><br><span style="color: hsl(120, 100%, 40%);">+ .e1 = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .max_conns = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .dispatch_rtp_cb = mgcp_dispatch_e1_bridge_cb,</span><br><span style="color: hsl(120, 100%, 40%);">+ .cleanup_cb = mgcp_cleanup_e1_bridge_cb,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> /* Generate virtual endpoint name from given parameters */</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index 3d01918..a0714c1 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -1328,6 +1328,23 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! dispatch incoming RTP packet to E1 subslot, handle RTCP packets locally.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] proto protocol (MGCP_CONN_TYPE_RTP or MGCP_CONN_TYPE_RTCP).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] addr socket address where the RTP packet has been received from.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] buf buffer that hold the RTP payload.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] buf_size size data length of buf.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] conn originating connection.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success, -1 on ERROR. */</span><br><span style="color: hsl(120, 100%, 40%);">+int mgcp_dispatch_e1_bridge_cb(int proto, struct sockaddr_in *addr, char *buf,</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int buf_size, struct mgcp_conn *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: integrate E1 support from libsomoabis, also implement</span><br><span style="color: hsl(120, 100%, 40%);">+ * handling for RTCP packets, which can not converted to E1. */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCONN(conn, DRTP, LOGL_FATAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ "cannot dispatch! E1 support is not implemented yet!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! cleanup an endpoint when a connection on an RTP bridge endpoint is removed.</span><br><span> * \param[in] endp Endpoint on which the connection resides.</span><br><span> * \param[in] conn Connection that is about to be removed (ignored). */</span><br><span>@@ -1346,6 +1363,15 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! cleanup an endpoint when a connection on an E1 endpoint is removed.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] endp Endpoint on which the connection resides.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] conn Connection that is about to be removed (ignored). */</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_cleanup_e1_bridge_cb(struct mgcp_endpoint *endp, struct mgcp_conn *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCONN(conn, DRTP, LOGL_FATAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ "cannot dispatch! E1 support is not implemented yet!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Handle incoming RTP data from NET */</span><br><span> static int rtp_data_net(struct osmo_fd *fd, unsigned int what)</span><br><span> {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/18755">change 18755</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/+/18755"/><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: I68b719a906e8f7251f0ca8c74ceec73bc40376f7 </div>
<div style="display:none"> Gerrit-Change-Number: 18755 </div>
<div style="display:none"> Gerrit-PatchSet: 10 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>