<p>keith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/17941">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add default APN for each EUA Type<br><br>MS may request an unknown APN. In this case we will use<br>the APN configured in the vty as default-apn but if<br>the type support does not match the request we will fail.<br><br>The commit adds two more vty commands to configure a default<br>vpn for v6 and for v4v6<br><br>Change-Id: I03fcf8a1532bd9988ea99a6afd3dc325174ce9d6<br>Fixes: OS#4511<br>---<br>M ggsn/ggsn.c<br>M ggsn/ggsn.h<br>M ggsn/ggsn_vty.c<br>3 files changed, 80 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/41/17941/1</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 159362f..816a496 100644</span><br><span>--- a/ggsn/ggsn.c</span><br><span>+++ b/ggsn/ggsn.c</span><br><span>@@ -452,10 +452,22 @@</span><br><span> /* ignore if the APN has not been started */</span><br><span> if (apn && !apn->started)</span><br><span> apn = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* then try default (if any) */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!apn)</span><br><span style="color: hsl(0, 100%, 40%);">- apn = ggsn->cfg.default_apn;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!apn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (pdp->eua.v[1]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case PDP_EUA_TYPE_v6:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ggsn->cfg.default_apnv6)</span><br><span style="color: hsl(120, 100%, 40%);">+ apn = ggsn->cfg.default_apnv6;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case PDP_EUA_TYPE_v4v6:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ggsn->cfg.default_apnv4v6)</span><br><span style="color: hsl(120, 100%, 40%);">+ apn = ggsn->cfg.default_apnv4v6;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ apn = ggsn->cfg.default_apn;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> /* ignore if the APN has not been started */</span><br><span> if (apn && !apn->started)</span><br><span> apn = NULL;</span><br><span>diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h</span><br><span>index 82984a0..887c743 100644</span><br><span>--- a/ggsn/ggsn.h</span><br><span>+++ b/ggsn/ggsn.h</span><br><span>@@ -115,8 +115,10 @@</span><br><span> char *name;</span><br><span> /* Description string */</span><br><span> char *description;</span><br><span style="color: hsl(0, 100%, 40%);">- /* an APN that shall be used as default for any non-matching APN */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* APNs that shall be used as default for any non-matching APN */</span><br><span> struct apn_ctx *default_apn;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct apn_ctx *default_apnv6;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct apn_ctx *default_apnv4v6;</span><br><span> /* ADdress to which we listen for GTP */</span><br><span> struct in46_addr listen_addr;</span><br><span> /* Local GTP-C address advertised in GTP */</span><br><span>diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c</span><br><span>index cb92a8a..9e643f0 100644</span><br><span>--- a/ggsn/ggsn_vty.c</span><br><span>+++ b/ggsn/ggsn_vty.c</span><br><span>@@ -296,6 +296,60 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_ggsn_default_apnv6, cfg_ggsn_default_apnv6_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "default-apnv6 NAME",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set a default-APN to be used if no other APN v6 matches\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "APN Name\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct apn_ctx *apn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ apn = ggsn_find_apn(ggsn, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!apn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% No APN of name '%s' found%s", argv[0], VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ggsn->cfg.default_apnv6 = apn;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_ggsn_no_default_apnv6, cfg_ggsn_no_default_apnv6_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no default-apnv6",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR "Remove default-APN to be used if no other APN matches\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ ggsn->cfg.default_apnv6 = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_ggsn_default_apnv4v6, cfg_ggsn_default_apnv4v6_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "default-apnv4v6 NAME",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set a default-APN to be used if no other APN v4v6 matches\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "APN Name\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct apn_ctx *apn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ apn = ggsn_find_apn(ggsn, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!apn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% No APN of name '%s' found%s", argv[0], VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ggsn->cfg.default_apnv4v6 = apn;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_ggsn_no_default_apnv4v6, cfg_ggsn_no_default_apnv4v6_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no default-apnv4v6",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR "Remove default-APN to be used if no other APN v4v6 matches\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ ggsn->cfg.default_apn = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(cfg_ggsn_shutdown, cfg_ggsn_shutdown_cmd,</span><br><span> "shutdown ggsn",</span><br><span> "Put the GGSN in administrative shut-down\n" GGSN_STR)</span><br><span>@@ -792,6 +846,10 @@</span><br><span> config_write_apn(vty, apn);</span><br><span> if (ggsn->cfg.default_apn)</span><br><span> vty_out(vty, " default-apn %s%s", ggsn->cfg.default_apn->cfg.name, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ggsn->cfg.default_apnv6)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " default-apnv6 %s%s", ggsn->cfg.default_apnv6->cfg.name, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ggsn->cfg.default_apnv4v6)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " default-apnv4v6 %s%s", ggsn->cfg.default_apnv4v6->cfg.name, VTY_NEWLINE);</span><br><span> if (ggsn->cfg.echo_interval)</span><br><span> vty_out(vty, " echo-interval %u%s", ggsn->cfg.echo_interval, VTY_NEWLINE);</span><br><span> /* must be last */</span><br><span>@@ -1097,6 +1155,10 @@</span><br><span> install_element(GGSN_NODE, &cfg_ggsn_no_apn_cmd);</span><br><span> install_element(GGSN_NODE, &cfg_ggsn_default_apn_cmd);</span><br><span> install_element(GGSN_NODE, &cfg_ggsn_no_default_apn_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(GGSN_NODE, &cfg_ggsn_default_apnv6_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(GGSN_NODE, &cfg_ggsn_no_default_apnv6_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(GGSN_NODE, &cfg_ggsn_default_apnv4v6_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(GGSN_NODE, &cfg_ggsn_no_default_apnv4v6_cmd);</span><br><span> install_element(GGSN_NODE, &cfg_ggsn_show_sgsn_cmd);</span><br><span> install_element(GGSN_NODE, &cfg_ggsn_echo_interval_cmd);</span><br><span> install_element(GGSN_NODE, &cfg_ggsn_no_echo_interval_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/17941">change 17941</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-ggsn/+/17941"/><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-Change-Id: I03fcf8a1532bd9988ea99a6afd3dc325174ce9d6 </div>
<div style="display:none"> Gerrit-Change-Number: 17941 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>