<p>Stefan Sperling <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12242">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Max: Looks good to me, but someone else must approve
  Pau Espin Pedrol: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">remove pointless declaration of struct gsm_network<br><br>We were passing a NULL pointer of type struct gsm_network * to<br>ctrl_interface_setup_dynip(). Remove the pointless declaration<br>of this struct. Also, replace the sgsn_controlif_setup() helper<br>function with a direct call to ctrl_interface_setup_dynip().<br>The helper fnuction was just a thin wrapper around the latter.<br><br>Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759<br>Related: OS#3356<br>---<br>M include/osmocom/sgsn/gprs_sgsn.h<br>M src/gprs/sgsn_ctrl.c<br>M src/gprs/sgsn_main.c<br>3 files changed, 2 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>index b6afe69..a0a056f 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>@@ -404,9 +404,6 @@</span><br><span> /*</span><br><span>  * ctrl interface related work</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-struct gsm_network;</span><br><span style="color: hsl(0, 100%, 40%);">-struct ctrl_handle *sgsn_controlif_setup(struct gsm_network *,</span><br><span style="color: hsl(0, 100%, 40%);">-                                    const char *bind_addr, uint16_t port);</span><br><span> int sgsn_ctrl_cmds_install(void);</span><br><span> </span><br><span> /*</span><br><span>diff --git a/src/gprs/sgsn_ctrl.c b/src/gprs/sgsn_ctrl.c</span><br><span>index dc5ae79..ad91d25 100644</span><br><span>--- a/src/gprs/sgsn_ctrl.c</span><br><span>+++ b/src/gprs/sgsn_ctrl.c</span><br><span>@@ -60,9 +60,3 @@</span><br><span>      rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_subscriber_list);</span><br><span>    return rc;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct ctrl_handle *sgsn_controlif_setup(struct gsm_network *net,</span><br><span style="color: hsl(0, 100%, 40%);">-                                         const char *bind_addr, uint16_t port)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return ctrl_interface_setup_dynip(net, bind_addr, port, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c</span><br><span>index 798e507..f12270d 100644</span><br><span>--- a/src/gprs/sgsn_main.c</span><br><span>+++ b/src/gprs/sgsn_main.c</span><br><span>@@ -450,8 +450,8 @@</span><br><span> </span><br><span>       /* start control interface after reading config for</span><br><span>   * ctrl_vty_get_bind_addr() */</span><br><span style="color: hsl(0, 100%, 40%);">-  g_ctrlh = sgsn_controlif_setup(NULL, ctrl_vty_get_bind_addr(),</span><br><span style="color: hsl(0, 100%, 40%);">-                              OSMO_CTRL_PORT_SGSN);</span><br><span style="color: hsl(120, 100%, 40%);">+     g_ctrlh = ctrl_interface_setup_dynip(NULL, ctrl_vty_get_bind_addr(),</span><br><span style="color: hsl(120, 100%, 40%);">+                              OSMO_CTRL_PORT_SGSN, NULL);</span><br><span>      if (!g_ctrlh) {</span><br><span>              LOGP(DGPRS, LOGL_ERROR, "Failed to create CTRL interface.\n");</span><br><span>             exit(1);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12242">change 12242</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/12242"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759 </div>
<div style="display:none"> Gerrit-Change-Number: 12242 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <stsp@stsp.name> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <stsp@stsp.name> </div>