<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9934">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;">osmo-sgsn: ping GGSN periodically and check for restart counter<br><br>Before this commit, echo req/rsp logic was implemented in libgtp but<br>never used in osmo-sgsn.<br><br>This commit adds a timer which periodically sends a GTP ECHO Request to<br>every GGSN if there's at least one pdpd context associated with it. This<br>way by checking the restart counter in the ECHO Reply it can be known if<br>the GGSN was restarted. In this case, logic already present in osmo-sgsn<br>will terminate all pdp contexts associated with that GGSN.<br><br>Change-Id: I9d714726785407859f26bbef052cd0efc28e8dae<br>---<br>M include/osmocom/sgsn/gprs_sgsn.h<br>M include/osmocom/sgsn/sgsn.h<br>M src/gprs/gprs_sgsn.c<br>M src/gprs/sgsn_libgtp.c<br>M src/gprs/sgsn_vty.c<br>5 files changed, 58 insertions(+), 2 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 33b12dc..5f30889 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>@@ -353,6 +353,8 @@</span><br><span> int remote_restart_ctr;</span><br><span> struct gsn_t *gsn;</span><br><span> struct llist_head pdp_list; /* list of associated pdp ctx (struct sgsn_pdp_ctx*) */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_timer_list echo_timer;</span><br><span style="color: hsl(120, 100%, 40%);">+ int echo_interval;</span><br><span> };</span><br><span> struct sgsn_ggsn_ctx *sgsn_ggsn_ctx_alloc(uint32_t id);</span><br><span> void sgsn_ggsn_ctx_free(struct sgsn_ggsn_ctx *ggc);</span><br><span>@@ -360,6 +362,8 @@</span><br><span> struct sgsn_ggsn_ctx *sgsn_ggsn_ctx_by_addr(struct in_addr *addr);</span><br><span> struct sgsn_ggsn_ctx *sgsn_ggsn_ctx_find_alloc(uint32_t id);</span><br><span> int sgsn_ggsn_ctx_drop_all_pdp(struct sgsn_ggsn_ctx *ggsn);</span><br><span style="color: hsl(120, 100%, 40%);">+void sgsn_ggsn_ctx_add_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+void sgsn_ggsn_ctx_remove_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp);</span><br><span> </span><br><span> struct apn_ctx {</span><br><span> struct llist_head list;</span><br><span>diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h</span><br><span>index 829a8fc..dae9d12 100644</span><br><span>--- a/include/osmocom/sgsn/sgsn.h</span><br><span>+++ b/include/osmocom/sgsn/sgsn.h</span><br><span>@@ -171,6 +171,7 @@</span><br><span> struct tlv_parsed *tp);</span><br><span> int sgsn_delete_pdp_ctx(struct sgsn_pdp_ctx *pctx);</span><br><span> void sgsn_pdp_upd_gtp_u(struct sgsn_pdp_ctx *pdp, void *addr, size_t alen);</span><br><span style="color: hsl(120, 100%, 40%);">+void sgsn_ggsn_echo_req(struct sgsn_ggsn_ctx *ggc);</span><br><span> </span><br><span> /* gprs_sndcp.c */</span><br><span> </span><br><span>diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c</span><br><span>index a58e504..55ce096 100644</span><br><span>--- a/src/gprs/gprs_sgsn.c</span><br><span>+++ b/src/gprs/gprs_sgsn.c</span><br><span>@@ -411,7 +411,7 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> llist_add(&pdp->list, &mm->pdp_list);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add(&pdp->ggsn_list, &ggsn->pdp_list);</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_ggsn_ctx_add_pdp(pdp->ggsn, pdp);</span><br><span> llist_add(&pdp->g_list, &sgsn_pdp_ctxts);</span><br><span> </span><br><span> return pdp;</span><br><span>@@ -466,7 +466,7 @@</span><br><span> if (pdp->mm)</span><br><span> llist_del(&pdp->list);</span><br><span> if (pdp->ggsn)</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(&pdp->ggsn_list);</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_ggsn_ctx_remove_pdp(pdp->ggsn, pdp);</span><br><span> llist_del(&pdp->g_list);</span><br><span> </span><br><span> /* _if_ we still have a library handle, at least set it to NULL</span><br><span>@@ -487,6 +487,12 @@</span><br><span> }</span><br><span> </span><br><span> /* GGSN contexts */</span><br><span style="color: hsl(120, 100%, 40%);">+static void echo_timer_cb(void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_ggsn_ctx *ggc = (struct sgsn_ggsn_ctx *) data;</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_ggsn_echo_req(ggc);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&ggc->echo_timer, ggc->echo_interval, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> struct sgsn_ggsn_ctx *sgsn_ggsn_ctx_alloc(uint32_t id)</span><br><span> {</span><br><span>@@ -499,9 +505,11 @@</span><br><span> ggc->id = id;</span><br><span> ggc->gtp_version = 1;</span><br><span> ggc->remote_restart_ctr = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ ggc->echo_interval = -1;</span><br><span> /* if we are called from config file parse, this gsn doesn't exist yet */</span><br><span> ggc->gsn = sgsn->gsn;</span><br><span> INIT_LLIST_HEAD(&ggc->pdp_list);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_setup(&ggc->echo_timer, echo_timer_cb, ggc);</span><br><span> llist_add(&ggc->list, &sgsn_ggsn_ctxts);</span><br><span> </span><br><span> return ggc;</span><br><span>@@ -722,6 +730,19 @@</span><br><span> return num;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void sgsn_ggsn_ctx_add_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (llist_empty(&ggc->pdp_list) && ggc->echo_interval > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&ggc->echo_timer, ggc->echo_interval, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(&pdp->ggsn_list, &ggc->pdp_list);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+void sgsn_ggsn_ctx_remove_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&pdp->ggsn_list);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (llist_empty(&ggc->pdp_list) && osmo_timer_pending(&ggc->echo_timer))</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_del(&ggc->echo_timer);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void sgsn_update_subscriber_data(struct sgsn_mm_ctx *mmctx)</span><br><span> {</span><br><span> OSMO_ASSERT(mmctx != NULL);</span><br><span>diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c</span><br><span>index 2da8c4a..88cea5d 100644</span><br><span>--- a/src/gprs/sgsn_libgtp.c</span><br><span>+++ b/src/gprs/sgsn_libgtp.c</span><br><span>@@ -460,6 +460,11 @@</span><br><span> gtp_update_context(pdp->ggsn->gsn, pdp->lib, pdp, &pdp->lib->hisaddr0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void sgsn_ggsn_echo_req(struct sgsn_ggsn_ctx *ggc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp_echo_req(ggc->gsn, ggc->gtp_version, NULL, &ggc->remote_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #ifdef BUILD_IU</span><br><span> /* Callback for RAB assignment response */</span><br><span> int sgsn_ranap_rab_ass_resp(struct sgsn_mm_ctx *ctx, RANAP_RAB_SetupOrModifiedItemIEs_t *setup_ies)</span><br><span>diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c</span><br><span>index 07d4293..9f9332c 100644</span><br><span>--- a/src/gprs/sgsn_vty.c</span><br><span>+++ b/src/gprs/sgsn_vty.c</span><br><span>@@ -23,6 +23,7 @@</span><br><span> #include <netinet/in.h></span><br><span> #include <arpa/inet.h></span><br><span> #include <time.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <inttypes.h></span><br><span> </span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/core/utils.h></span><br><span>@@ -181,6 +182,9 @@</span><br><span> inet_ntoa(gctx->remote_addr), VTY_NEWLINE);</span><br><span> vty_out(vty, " ggsn %u gtp-version %u%s", gctx->id,</span><br><span> gctx->gtp_version, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gctx->echo_interval != -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " ggsn %u echo-interval %"PRId32"%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ gctx->id, gctx->echo_interval, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span> if (sgsn->cfg.dynamic_lookup)</span><br><span>@@ -356,6 +360,26 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Seee 3GPP TS 29.060 section 7.2.1 */</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_ggsn_echo_interval, cfg_ggsn_echo_interval_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "ggsn <0-255> echo-interval <1-36000>",</span><br><span style="color: hsl(120, 100%, 40%);">+ GGSN_STR "GGSN Number\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Send an echo request to this static GGSN every interval.\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Interval between echo requests in seconds.\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t id = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_ggsn_ctx *ggc = sgsn_ggsn_ctx_find_alloc(id);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ggc->echo_interval = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ggc->echo_interval < 60)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% 3GPP TS 29.060 section states inteval should " \</span><br><span style="color: hsl(120, 100%, 40%);">+ "not be lower than 60 seconds, use this value for " \</span><br><span style="color: hsl(120, 100%, 40%);">+ "testing purposes only!%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</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_dynamic_lookup, cfg_ggsn_dynamic_lookup_cmd,</span><br><span> "ggsn dynamic",</span><br><span> GGSN_STR</span><br><span>@@ -1277,6 +1301,7 @@</span><br><span> install_element(SGSN_NODE, &cfg_ggsn_remote_ip_cmd);</span><br><span> //install_element(SGSN_NODE, &cfg_ggsn_remote_port_cmd);</span><br><span> install_element(SGSN_NODE, &cfg_ggsn_gtp_version_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(SGSN_NODE, &cfg_ggsn_echo_interval_cmd);</span><br><span> install_element(SGSN_NODE, &cfg_imsi_acl_cmd);</span><br><span> install_element(SGSN_NODE, &cfg_auth_policy_cmd);</span><br><span> install_element(SGSN_NODE, &cfg_encrypt_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9934">change 9934</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/9934"/><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: I9d714726785407859f26bbef052cd0efc28e8dae </div>
<div style="display:none"> Gerrit-Change-Number: 9934 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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 </div>