<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14265">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ggsn: Drop unused param force in apn_stop()<br><br>Change-Id: I920679c7062d480c1cfaa3d89c90a0ed4a2ef58b<br>---<br>M ggsn/ggsn.c<br>M ggsn/ggsn.h<br>M ggsn/ggsn_vty.c<br>3 files changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c</span><br><span>index bd8647f..6306924 100644</span><br><span>--- a/ggsn/ggsn.c</span><br><span>+++ b/ggsn/ggsn.c</span><br><span>@@ -111,9 +111,9 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int apn_stop(struct apn_ctx *apn, bool force)</span><br><span style="color: hsl(120, 100%, 40%);">+int apn_stop(struct apn_ctx *apn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPAPN(LOGL_NOTICE, apn, "%sStopping\n", force ? "FORCED " : "");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPAPN(LOGL_NOTICE, apn, "Stopping\n");</span><br><span> /* check if pools have any active PDP contexts and bail out */</span><br><span> pool_close_all_pdp(apn->v4.pool);</span><br><span> pool_close_all_pdp(apn->v6.pool);</span><br><span>@@ -223,7 +223,7 @@</span><br><span> LOGPAPN(LOGL_INFO, apn, "Opening Kernel GTP device %s\n", apn->tun.cfg.dev_name);</span><br><span> if (apn->cfg.apn_type_mask & (APN_TYPE_IPv6|APN_TYPE_IPv4v6)) {</span><br><span> LOGPAPN(LOGL_ERROR, apn, "Kernel GTP currently supports only IPv4\n");</span><br><span style="color: hsl(0, 100%, 40%);">- apn_stop(apn, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ apn_stop(apn);</span><br><span> return -1;</span><br><span> }</span><br><span> if (gsn == NULL) {</span><br><span>@@ -257,7 +257,7 @@</span><br><span> apn->v4.cfg.ifconfig_prefix.prefixlen)) {</span><br><span> LOGPAPN(LOGL_ERROR, apn, "Failed to set tun IPv4 address %s: %s\n",</span><br><span> in46p_ntoa(&apn->v4.cfg.ifconfig_prefix), strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- apn_stop(apn, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ apn_stop(apn);</span><br><span> return -1;</span><br><span> }</span><br><span> }</span><br><span>@@ -270,7 +270,7 @@</span><br><span> LOGPAPN(LOGL_ERROR, apn, "Failed to set tun IPv6 address %s: %s. "</span><br><span> "Ensure you have ipv6 support and not used the disable_ipv6 sysctl?\n",</span><br><span> in46p_ntoa(&apn->v6.cfg.ifconfig_prefix), strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- apn_stop(apn, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ apn_stop(apn);</span><br><span> return -1;</span><br><span> }</span><br><span> }</span><br><span>@@ -283,7 +283,7 @@</span><br><span> LOGPAPN(LOGL_ERROR, apn, "Failed to set tun IPv6 link-local address %s: %s. "</span><br><span> "Ensure you have ipv6 support and not used the disable_ipv6 sysctl?\n",</span><br><span> in46p_ntoa(&apn->v6.cfg.ll_prefix), strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- apn_stop(apn, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ apn_stop(apn);</span><br><span> return -1;</span><br><span> }</span><br><span> apn->v6_lladdr = apn->v6.cfg.ll_prefix.addr.v6;</span><br><span>@@ -301,7 +301,7 @@</span><br><span> if (rc < 1) {</span><br><span> LOGPAPN(LOGL_ERROR, apn, "Cannot obtain IPv6 link-local address of interface: %s\n",</span><br><span> rc ? strerror(errno) : "tun interface has no link-local IP assigned");</span><br><span style="color: hsl(0, 100%, 40%);">- apn_stop(apn, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ apn_stop(apn);</span><br><span> return -1;</span><br><span> }</span><br><span> apn->v6_lladdr = ipv6_tun_linklocal_ip.addr.v6;</span><br><span>@@ -318,7 +318,7 @@</span><br><span> blacklist, blacklist_size)) {</span><br><span> LOGPAPN(LOGL_ERROR, apn, "Failed to create IPv4 pool\n");</span><br><span> talloc_free(blacklist);</span><br><span style="color: hsl(0, 100%, 40%);">- apn_stop(apn, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ apn_stop(apn);</span><br><span> return -1;</span><br><span> }</span><br><span> talloc_free(blacklist);</span><br><span>@@ -335,7 +335,7 @@</span><br><span> blacklist, blacklist_size)) {</span><br><span> LOGPAPN(LOGL_ERROR, apn, "Failed to create IPv6 pool\n");</span><br><span> talloc_free(blacklist);</span><br><span style="color: hsl(0, 100%, 40%);">- apn_stop(apn, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ apn_stop(apn);</span><br><span> return -1;</span><br><span> }</span><br><span> talloc_free(blacklist);</span><br><span>@@ -1046,7 +1046,7 @@</span><br><span> </span><br><span> /* iterate over all APNs and stop them */</span><br><span> llist_for_each_entry(apn, &ggsn->apn_list, list)</span><br><span style="color: hsl(0, 100%, 40%);">- apn_stop(apn, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ apn_stop(apn);</span><br><span> </span><br><span> osmo_timer_del(&ggsn->gtp_timer);</span><br><span> </span><br><span>diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h</span><br><span>index e252548..09cd0f6 100644</span><br><span>--- a/ggsn/ggsn.h</span><br><span>+++ b/ggsn/ggsn.h</span><br><span>@@ -140,4 +140,4 @@</span><br><span> extern int ggsn_start(struct ggsn_ctx *ggsn);</span><br><span> extern int ggsn_stop(struct ggsn_ctx *ggsn);</span><br><span> extern int apn_start(struct apn_ctx *apn);</span><br><span style="color: hsl(0, 100%, 40%);">-extern int apn_stop(struct apn_ctx *apn, bool force);</span><br><span style="color: hsl(120, 100%, 40%);">+extern int apn_stop(struct apn_ctx *apn);</span><br><span>diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c</span><br><span>index c6dc0d9..3f012d2 100644</span><br><span>--- a/ggsn/ggsn_vty.c</span><br><span>+++ b/ggsn/ggsn_vty.c</span><br><span>@@ -604,7 +604,7 @@</span><br><span> struct apn_ctx *apn = (struct apn_ctx *) vty->index;</span><br><span> </span><br><span> if (!apn->cfg.shutdown) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (apn_stop(apn, false)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (apn_stop(apn)) {</span><br><span> vty_out(vty, "%% Failed to Stop APN%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14265">change 14265</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/14265"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ggsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I920679c7062d480c1cfaa3d89c90a0ed4a2ef58b </div>
<div style="display:none"> Gerrit-Change-Number: 14265 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>