<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19946">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_client: Deprecate unused IPv4-only API<br><br>The API and related implementation fields are not used internally nor<br>externally, and only support IPv4. Let's simply deprecate the API and<br>drop all the uneeded implementation.<br><br>Change-Id: I905d4c4efabb6b4a4bc5c02e956808777243cadc<br>---<br>M include/osmocom/mgcp_client/mgcp_client.h<br>M include/osmocom/mgcp_client/mgcp_client_internal.h<br>M src/libosmo-mgcp-client/mgcp_client.c<br>3 files changed, 4 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h</span><br><span>index b5a3529..02996a7 100644</span><br><span>--- a/include/osmocom/mgcp_client/mgcp_client.h</span><br><span>+++ b/include/osmocom/mgcp_client/mgcp_client.h</span><br><span>@@ -133,7 +133,7 @@</span><br><span> </span><br><span> const char *mgcp_client_remote_addr_str(struct mgcp_client *mgcp);</span><br><span> uint16_t mgcp_client_remote_port(struct mgcp_client *mgcp);</span><br><span style="color: hsl(0, 100%, 40%);">-uint32_t mgcp_client_remote_addr_n(struct mgcp_client *mgcp);</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t mgcp_client_remote_addr_n(struct mgcp_client *mgcp) OSMO_DEPRECATED("deprecated, returns 0");</span><br><span> </span><br><span> const char *mgcp_client_endpoint_domain(const struct mgcp_client *mgcp);</span><br><span> const char *mgcp_client_rtpbridge_wildcard(const struct mgcp_client *mgcp);</span><br><span>diff --git a/include/osmocom/mgcp_client/mgcp_client_internal.h b/include/osmocom/mgcp_client/mgcp_client_internal.h</span><br><span>index 690a4af..b4b3b02 100644</span><br><span>--- a/include/osmocom/mgcp_client/mgcp_client_internal.h</span><br><span>+++ b/include/osmocom/mgcp_client/mgcp_client_internal.h</span><br><span>@@ -6,7 +6,6 @@</span><br><span> </span><br><span> struct mgcp_client {</span><br><span> struct mgcp_client_conf actual;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t remote_addr;</span><br><span> struct osmo_wqueue wq;</span><br><span> mgcp_trans_id_t next_trans_id;</span><br><span> struct llist_head responses_pending;</span><br><span>diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>index 72068b4..5972803 100644</span><br><span>--- a/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>+++ b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>@@ -823,7 +823,6 @@</span><br><span> * \returns 0 on success, -EINVAL on error. */</span><br><span> int mgcp_client_connect(struct mgcp_client *mgcp)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct sockaddr_in addr;</span><br><span> struct osmo_wqueue *wq;</span><br><span> int rc;</span><br><span> </span><br><span>@@ -843,9 +842,6 @@</span><br><span> goto error_close_fd;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- inet_aton(mgcp->actual.remote_addr, &addr.sin_addr);</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp->remote_addr = htonl(addr.sin_addr.s_addr);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> osmo_wqueue_init(wq, 1024);</span><br><span> wq->bfd.when = OSMO_FD_READ;</span><br><span> wq->bfd.data = mgcp;</span><br><span>@@ -877,12 +873,13 @@</span><br><span> return mgcp->actual.remote_port;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Get the IP-Aaddress of the associated MGW as its numeric representation.</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Get the IP-Address of the associated MGW as its numeric representation.</span><br><span style="color: hsl(120, 100%, 40%);">+ * DEPRECATED, DON'T USE.</span><br><span> * \param[in] mgcp MGCP client descriptor.</span><br><span> * \returns IP-Address as 32 bit integer (network byte order) */</span><br><span> uint32_t mgcp_client_remote_addr_n(struct mgcp_client *mgcp)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return mgcp->remote_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /* To compose endpoint names, usually for CRCX, use this as domain name.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19946">change 19946</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/+/19946"/><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: I905d4c4efabb6b4a4bc5c02e956808777243cadc </div>
<div style="display:none"> Gerrit-Change-Number: 19946 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Assignee: 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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>