cellular-infrastructure
/
osmo-ggsn
mirror of https://gerrit.osmocom.org/osmo-ggsn
9
0
Fork 0
Code Issues Releases Wiki Activity

ggsn: Drop unused param force in apn_stop() 

Change-Id: I920679c7062d480c1cfaa3d89c90a0ed4a2ef58b
This commit is contained in:
Pau Espin 2019-05-29 19:08:26 +02:00
parent fb62504160
commit 72ab4bc547
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ggsn/ggsn.c
View File

@ -111,9 +111,9 @@ static void pool_close_all_pdp(struct ippool_t *pool)
} }
} }
int apn_stop(struct apn_ctx *apn, bool force) int apn_stop(struct apn_ctx *apn)
{ {
LOGPAPN(LOGL_NOTICE, apn, "%sStopping\n", force ? "FORCED " : ""); LOGPAPN(LOGL_NOTICE, apn, "Stopping\n");
/* check if pools have any active PDP contexts and bail out */ /* check if pools have any active PDP contexts and bail out */
pool_close_all_pdp(apn->v4.pool); pool_close_all_pdp(apn->v4.pool);
pool_close_all_pdp(apn->v6.pool); pool_close_all_pdp(apn->v6.pool);
@ -223,7 +223,7 @@ int apn_start(struct apn_ctx *apn)
LOGPAPN(LOGL_INFO, apn, "Opening Kernel GTP device %s\n", apn->tun.cfg.dev_name); LOGPAPN(LOGL_INFO, apn, "Opening Kernel GTP device %s\n", apn->tun.cfg.dev_name);
if (apn->cfg.apn_type_mask & (APN_TYPE_IPv6|APN_TYPE_IPv4v6)) { if (apn->cfg.apn_type_mask & (APN_TYPE_IPv6|APN_TYPE_IPv4v6)) {
LOGPAPN(LOGL_ERROR, apn, "Kernel GTP currently supports only IPv4\n"); LOGPAPN(LOGL_ERROR, apn, "Kernel GTP currently supports only IPv4\n");
apn_stop(apn, false); apn_stop(apn);
return -1; return -1;
} }
if (gsn == NULL) { if (gsn == NULL) {
@ -257,7 +257,7 @@ int apn_start(struct apn_ctx *apn)
apn->v4.cfg.ifconfig_prefix.prefixlen)) { apn->v4.cfg.ifconfig_prefix.prefixlen)) {
LOGPAPN(LOGL_ERROR, apn, "Failed to set tun IPv4 address %s: %s\n", LOGPAPN(LOGL_ERROR, apn, "Failed to set tun IPv4 address %s: %s\n",
in46p_ntoa(&apn->v4.cfg.ifconfig_prefix), strerror(errno)); in46p_ntoa(&apn->v4.cfg.ifconfig_prefix), strerror(errno));
apn_stop(apn, false); apn_stop(apn);
return -1; return -1;
} }
} }
@ -270,7 +270,7 @@ int apn_start(struct apn_ctx *apn)
LOGPAPN(LOGL_ERROR, apn, "Failed to set tun IPv6 address %s: %s. " LOGPAPN(LOGL_ERROR, apn, "Failed to set tun IPv6 address %s: %s. "
"Ensure you have ipv6 support and not used the disable_ipv6 sysctl?\n", "Ensure you have ipv6 support and not used the disable_ipv6 sysctl?\n",
in46p_ntoa(&apn->v6.cfg.ifconfig_prefix), strerror(errno)); in46p_ntoa(&apn->v6.cfg.ifconfig_prefix), strerror(errno));
apn_stop(apn, false); apn_stop(apn);
return -1; return -1;
} }
} }
@ -283,7 +283,7 @@ int apn_start(struct apn_ctx *apn)
LOGPAPN(LOGL_ERROR, apn, "Failed to set tun IPv6 link-local address %s: %s. " LOGPAPN(LOGL_ERROR, apn, "Failed to set tun IPv6 link-local address %s: %s. "
"Ensure you have ipv6 support and not used the disable_ipv6 sysctl?\n", "Ensure you have ipv6 support and not used the disable_ipv6 sysctl?\n",
in46p_ntoa(&apn->v6.cfg.ll_prefix), strerror(errno)); in46p_ntoa(&apn->v6.cfg.ll_prefix), strerror(errno));
apn_stop(apn, false); apn_stop(apn);
return -1; return -1;
} }
apn->v6_lladdr = apn->v6.cfg.ll_prefix.addr.v6; apn->v6_lladdr = apn->v6.cfg.ll_prefix.addr.v6;
@ -301,7 +301,7 @@ int apn_start(struct apn_ctx *apn)
if (rc < 1) { if (rc < 1) {
LOGPAPN(LOGL_ERROR, apn, "Cannot obtain IPv6 link-local address of interface: %s\n", LOGPAPN(LOGL_ERROR, apn, "Cannot obtain IPv6 link-local address of interface: %s\n",
rc ? strerror(errno) : "tun interface has no link-local IP assigned"); rc ? strerror(errno) : "tun interface has no link-local IP assigned");
apn_stop(apn, false); apn_stop(apn);
return -1; return -1;
} }
apn->v6_lladdr = ipv6_tun_linklocal_ip.addr.v6; apn->v6_lladdr = ipv6_tun_linklocal_ip.addr.v6;
@ -318,7 +318,7 @@ int apn_start(struct apn_ctx *apn)
blacklist, blacklist_size)) { blacklist, blacklist_size)) {
LOGPAPN(LOGL_ERROR, apn, "Failed to create IPv4 pool\n"); LOGPAPN(LOGL_ERROR, apn, "Failed to create IPv4 pool\n");
talloc_free(blacklist); talloc_free(blacklist);
apn_stop(apn, false); apn_stop(apn);
return -1; return -1;
} }
talloc_free(blacklist); talloc_free(blacklist);
@ -335,7 +335,7 @@ int apn_start(struct apn_ctx *apn)
blacklist, blacklist_size)) { blacklist, blacklist_size)) {
LOGPAPN(LOGL_ERROR, apn, "Failed to create IPv6 pool\n"); LOGPAPN(LOGL_ERROR, apn, "Failed to create IPv6 pool\n");
talloc_free(blacklist); talloc_free(blacklist);
apn_stop(apn, false); apn_stop(apn);
return -1; return -1;
} }
talloc_free(blacklist); talloc_free(blacklist);
@ -1046,7 +1046,7 @@ int ggsn_stop(struct ggsn_ctx *ggsn)
/* iterate over all APNs and stop them */ /* iterate over all APNs and stop them */
llist_for_each_entry(apn, &ggsn->apn_list, list) llist_for_each_entry(apn, &ggsn->apn_list, list)
apn_stop(apn, true); apn_stop(apn);
osmo_timer_del(&ggsn->gtp_timer); osmo_timer_del(&ggsn->gtp_timer);

2
ggsn/ggsn.h
View File

@ -140,4 +140,4 @@ extern void *tall_ggsn_ctx;
extern int ggsn_start(struct ggsn_ctx *ggsn); extern int ggsn_start(struct ggsn_ctx *ggsn);
extern int ggsn_stop(struct ggsn_ctx *ggsn); extern int ggsn_stop(struct ggsn_ctx *ggsn);
extern int apn_start(struct apn_ctx *apn); extern int apn_start(struct apn_ctx *apn);
extern int apn_stop(struct apn_ctx *apn, bool force); extern int apn_stop(struct apn_ctx *apn);

2
ggsn/ggsn_vty.c
View File

@ -604,7 +604,7 @@ DEFUN(cfg_apn_shutdown, cfg_apn_shutdown_cmd,
struct apn_ctx *apn = (struct apn_ctx *) vty->index; struct apn_ctx *apn = (struct apn_ctx *) vty->index;
if (!apn->cfg.shutdown) { if (!apn->cfg.shutdown) {
if (apn_stop(apn, false)) { if (apn_stop(apn)) {
vty_out(vty, "%% Failed to Stop APN%s", VTY_NEWLINE); vty_out(vty, "%% Failed to Stop APN%s", VTY_NEWLINE);
return CMD_WARNING; return CMD_WARNING;
} }