<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11528">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Update wrong references to bsc in sgsn code<br><br>Change-Id: I93f0dc721c2eff8a87fb9248882f24768f708713<br>---<br>M src/gprs/gb_proxy.c<br>M src/gprs/gb_proxy_main.c<br>M src/gprs/gb_proxy_patch.c<br>M src/gprs/gb_proxy_peer.c<br>M src/gprs/gprs_gmm.c<br>M src/gprs/gprs_sgsn.c<br>M src/gprs/gprs_subscriber.c<br>M src/gprs/gsup_client.c<br>M src/gprs/gtphub_main.c<br>M src/gprs/gtphub_vty.c<br>M src/gprs/sgsn_ares.c<br>M src/gprs/sgsn_main.c<br>M src/gprs/sgsn_vty.c<br>M tests/gbproxy/gbproxy_test.c<br>M tests/sgsn/sgsn_test.c<br>M tests/vty_test_runner.py<br>16 files changed, 80 insertions(+), 80 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/28/11528/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c</span><br><span>index 8bb6789..fe6a6c6 100644</span><br><span>--- a/src/gprs/gb_proxy.c</span><br><span>+++ b/src/gprs/gb_proxy.c</span><br><span>@@ -50,7 +50,7 @@</span><br><span> #include <osmocom/gsm/protocol/gsm_04_08_gprs.h></span><br><span> #include <osmocom/sgsn/gprs_utils.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-extern void *tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+extern void *tall_sgsn_ctx;</span><br><span> </span><br><span> static const struct rate_ctr_desc global_ctr_description[] = {</span><br><span> { "inv-bvci", "Invalid BVC Identifier " },</span><br><span>@@ -1447,7 +1447,7 @@</span><br><span> struct timespec tp;</span><br><span> </span><br><span> INIT_LLIST_HEAD(&cfg->bts_peers);</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->ctrg = rate_ctr_group_alloc(tall_bsc_ctx, &global_ctrg_desc, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->ctrg = rate_ctr_group_alloc(tall_sgsn_ctx, &global_ctrg_desc, 0);</span><br><span> if (!cfg->ctrg) {</span><br><span> LOGP(DGPRS, LOGL_ERROR, "Cannot allocate global counter group!\n");</span><br><span> return -1;</span><br><span>diff --git a/src/gprs/gb_proxy_main.c b/src/gprs/gb_proxy_main.c</span><br><span>index 97e6342..19fbbba 100644</span><br><span>--- a/src/gprs/gb_proxy_main.c</span><br><span>+++ b/src/gprs/gb_proxy_main.c</span><br><span>@@ -62,7 +62,7 @@</span><br><span> #define _GNU_SOURCE</span><br><span> #include <getopt.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void *tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+void *tall_sgsn_ctx;</span><br><span> </span><br><span> const char *openbsc_copyright =</span><br><span> "Copyright (C) 2010 Harald Welte and On-Waves\r\n"</span><br><span>@@ -116,7 +116,7 @@</span><br><span> * and then return to the caller, who will abort the process */</span><br><span> case SIGUSR1:</span><br><span> talloc_report(tall_vty_ctx, stderr);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_report_full(tall_bsc_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_report_full(tall_sgsn_ctx, stderr);</span><br><span> break;</span><br><span> case SIGUSR2:</span><br><span> talloc_report_full(tall_vty_ctx, stderr);</span><br><span>@@ -269,9 +269,9 @@</span><br><span> int rc;</span><br><span> struct ctrl_handle *ctrl;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- tall_bsc_ctx = talloc_named_const(NULL, 0, "nsip_proxy");</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_talloc_ctx_init(tall_bsc_ctx, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_info.tall_ctx = tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+ tall_sgsn_ctx = talloc_named_const(NULL, 0, "nsip_proxy");</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_talloc_ctx_init(tall_sgsn_ctx, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_info.tall_ctx = tall_sgsn_ctx;</span><br><span> </span><br><span> signal(SIGINT, &signal_handler);</span><br><span> signal(SIGTERM, &signal_handler);</span><br><span>@@ -280,7 +280,7 @@</span><br><span> signal(SIGUSR2, &signal_handler);</span><br><span> osmo_init_ignore_signals();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_init_logging2(tall_bsc_ctx, &gprs_log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_init_logging2(tall_sgsn_ctx, &gprs_log_info);</span><br><span> </span><br><span> vty_info.copyright = openbsc_copyright;</span><br><span> vty_init(&vty_info);</span><br><span>@@ -306,16 +306,16 @@</span><br><span> config_file = CONFIG_FILE_DEFAULT;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_init(tall_bsc_ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_stats_init(tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_init(tall_sgsn_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stats_init(tall_sgsn_ctx);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bssgp_nsi = gprs_ns_instantiate(&proxy_ns_cb, tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ bssgp_nsi = gprs_ns_instantiate(&proxy_ns_cb, tall_sgsn_ctx);</span><br><span> if (!bssgp_nsi) {</span><br><span> LOGP(DGPRS, LOGL_ERROR, "Unable to instantiate NS\n");</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gbcfg = talloc_zero(tall_bsc_ctx, struct gbproxy_config);</span><br><span style="color: hsl(120, 100%, 40%);">+ gbcfg = talloc_zero(tall_sgsn_ctx, struct gbproxy_config);</span><br><span> if (!gbcfg) {</span><br><span> LOGP(DGPRS, LOGL_FATAL, "Unable to allocate config\n");</span><br><span> exit(1);</span><br><span>@@ -334,7 +334,7 @@</span><br><span> }</span><br><span> </span><br><span> /* start telnet after reading config for vty_get_bind_addr() */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = telnet_init_dynif(tall_bsc_ctx, NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = telnet_init_dynif(tall_sgsn_ctx, NULL,</span><br><span> vty_get_bind_addr(), OSMO_VTY_PORT_GBPROXY);</span><br><span> if (rc < 0)</span><br><span> exit(1);</span><br><span>diff --git a/src/gprs/gb_proxy_patch.c b/src/gprs/gb_proxy_patch.c</span><br><span>index 9cca9a8..251bb67 100644</span><br><span>--- a/src/gprs/gb_proxy_patch.c</span><br><span>+++ b/src/gprs/gb_proxy_patch.c</span><br><span>@@ -29,7 +29,7 @@</span><br><span> #include <osmocom/core/rate_ctr.h></span><br><span> #include <osmocom/gsm/apn.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-extern void *tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+extern void *tall_sgsn_ctx;</span><br><span> </span><br><span> /* patch RA identifier in place */</span><br><span> static void gbproxy_patch_raid(struct gsm48_ra_id *raid_enc, struct gbproxy_peer *peer,</span><br><span>@@ -420,7 +420,7 @@</span><br><span> </span><br><span> if (rc == 0) {</span><br><span> match->enable = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- match->re_str = talloc_strdup(tall_bsc_ctx, filter);</span><br><span style="color: hsl(120, 100%, 40%);">+ match->re_str = talloc_strdup(tall_sgsn_ctx, filter);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gprs/gb_proxy_peer.c b/src/gprs/gb_proxy_peer.c</span><br><span>index a862a83..48482b6 100644</span><br><span>--- a/src/gprs/gb_proxy_peer.c</span><br><span>+++ b/src/gprs/gb_proxy_peer.c</span><br><span>@@ -32,7 +32,7 @@</span><br><span> </span><br><span> #include <string.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-extern void *tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+extern void *tall_sgsn_ctx;</span><br><span> </span><br><span> static const struct rate_ctr_desc peer_ctr_description[] = {</span><br><span> { "blocked", "BVC Block " },</span><br><span>@@ -185,7 +185,7 @@</span><br><span> {</span><br><span> struct gbproxy_peer *peer;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- peer = talloc_zero(tall_bsc_ctx, struct gbproxy_peer);</span><br><span style="color: hsl(120, 100%, 40%);">+ peer = talloc_zero(tall_sgsn_ctx, struct gbproxy_peer);</span><br><span> if (!peer)</span><br><span> return NULL;</span><br><span> </span><br><span>diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c</span><br><span>index a0221ea..cc6ea4a 100644</span><br><span>--- a/src/gprs/gprs_gmm.c</span><br><span>+++ b/src/gprs/gprs_gmm.c</span><br><span>@@ -68,7 +68,7 @@</span><br><span> #define PTMSI_ALLOC</span><br><span> </span><br><span> extern struct sgsn_instance *sgsn;</span><br><span style="color: hsl(0, 100%, 40%);">-extern void *tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+extern void *tall_sgsn_ctx;</span><br><span> </span><br><span> static const struct tlv_definition gsm48_gmm_att_tlvdef = {</span><br><span> .def = {</span><br><span>@@ -2623,7 +2623,7 @@</span><br><span> goto no_context;</span><br><span> </span><br><span> /* schedule a dynamic look-up */</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx->ggsn_lookup = talloc_zero(tall_bsc_ctx, struct sgsn_ggsn_lookup);</span><br><span style="color: hsl(120, 100%, 40%);">+ mmctx->ggsn_lookup = talloc_zero(tall_sgsn_ctx, struct sgsn_ggsn_lookup);</span><br><span> if (!mmctx->ggsn_lookup)</span><br><span> goto no_context;</span><br><span> </span><br><span>diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c</span><br><span>index efbae22..bac7325 100644</span><br><span>--- a/src/gprs/gprs_sgsn.c</span><br><span>+++ b/src/gprs/gprs_sgsn.c</span><br><span>@@ -56,7 +56,7 @@</span><br><span> #define GPRS_LLME_CHECK_TICK 30</span><br><span> </span><br><span> extern struct sgsn_instance *sgsn;</span><br><span style="color: hsl(0, 100%, 40%);">-extern void *tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+extern void *tall_sgsn_ctx;</span><br><span> </span><br><span> LLIST_HEAD(sgsn_mm_ctxts);</span><br><span> LLIST_HEAD(sgsn_ggsn_ctxts);</span><br><span>@@ -135,7 +135,7 @@</span><br><span> };</span><br><span> </span><br><span> void sgsn_rate_ctr_init() {</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn->rate_ctrs = rate_ctr_group_alloc(tall_bsc_ctx, &sgsn_ctrg_desc, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn->rate_ctrs = rate_ctr_group_alloc(tall_sgsn_ctx, &sgsn_ctrg_desc, 0);</span><br><span> OSMO_ASSERT(sgsn->rate_ctrs);</span><br><span> }</span><br><span> </span><br><span>@@ -223,7 +223,7 @@</span><br><span> {</span><br><span> struct sgsn_mm_ctx *ctx;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ctx = talloc_zero(tall_bsc_ctx, struct sgsn_mm_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx = talloc_zero(tall_sgsn_ctx, struct sgsn_mm_ctx);</span><br><span> if (!ctx)</span><br><span> return NULL;</span><br><span> </span><br><span>@@ -257,7 +257,7 @@</span><br><span> struct sgsn_mm_ctx *ctx;</span><br><span> struct ranap_ue_conn_ctx *ue_ctx = uectx;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ctx = talloc_zero(tall_bsc_ctx, struct sgsn_mm_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx = talloc_zero(tall_sgsn_ctx, struct sgsn_mm_ctx);</span><br><span> if (!ctx)</span><br><span> return NULL;</span><br><span> </span><br><span>@@ -403,7 +403,7 @@</span><br><span> if (pdp)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- pdp = talloc_zero(tall_bsc_ctx, struct sgsn_pdp_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp = talloc_zero(tall_sgsn_ctx, struct sgsn_pdp_ctx);</span><br><span> if (!pdp)</span><br><span> return NULL;</span><br><span> </span><br><span>@@ -512,7 +512,7 @@</span><br><span> {</span><br><span> struct sgsn_ggsn_ctx *ggc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ggc = talloc_zero(tall_bsc_ctx, struct sgsn_ggsn_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ ggc = talloc_zero(tall_sgsn_ctx, struct sgsn_ggsn_ctx);</span><br><span> if (!ggc)</span><br><span> return NULL;</span><br><span> </span><br><span>@@ -575,7 +575,7 @@</span><br><span> {</span><br><span> struct apn_ctx *actx;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- actx = talloc_zero(tall_bsc_ctx, struct apn_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ actx = talloc_zero(tall_sgsn_ctx, struct apn_ctx);</span><br><span> if (!actx)</span><br><span> return NULL;</span><br><span> actx->name = talloc_strdup(actx, ap_name);</span><br><span>diff --git a/src/gprs/gprs_subscriber.c b/src/gprs/gprs_subscriber.c</span><br><span>index dfd697b..6c4f81f 100644</span><br><span>--- a/src/gprs/gprs_subscriber.c</span><br><span>+++ b/src/gprs/gprs_subscriber.c</span><br><span>@@ -47,7 +47,7 @@</span><br><span> (gsup)->imsi, \</span><br><span> ## args)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-extern void *tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+extern void *tall_sgsn_ctx;</span><br><span> </span><br><span> LLIST_HEAD(_gprs_subscribers);</span><br><span> struct llist_head * const gprs_subscribers = &_gprs_subscribers;</span><br><span>@@ -141,7 +141,7 @@</span><br><span> static struct gprs_subscr *gprs_subscr_alloc(void)</span><br><span> {</span><br><span> struct gprs_subscr *gsub;</span><br><span style="color: hsl(0, 100%, 40%);">- gsub = talloc_zero(tall_bsc_ctx, struct gprs_subscr);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsub = talloc_zero(tall_sgsn_ctx, struct gprs_subscr);</span><br><span> if (!gsub)</span><br><span> return NULL;</span><br><span> llist_add_tail(&gsub->entry, gprs_subscribers);</span><br><span>diff --git a/src/gprs/gsup_client.c b/src/gprs/gsup_client.c</span><br><span>index 95c4988..37bebd9 100644</span><br><span>--- a/src/gprs/gsup_client.c</span><br><span>+++ b/src/gprs/gsup_client.c</span><br><span>@@ -33,7 +33,7 @@</span><br><span> #include <errno.h></span><br><span> #include <string.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-extern void *tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+extern void *tall_sgsn_ctx;</span><br><span> </span><br><span> static void start_test_procedure(struct gsup_client *gsupc);</span><br><span> </span><br><span>@@ -274,7 +274,7 @@</span><br><span> struct gsup_client *gsupc;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gsupc = talloc_zero(tall_bsc_ctx, struct gsup_client);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsupc = talloc_zero(tall_sgsn_ctx, struct gsup_client);</span><br><span> OSMO_ASSERT(gsupc);</span><br><span> </span><br><span> /* struct ipaccess_unit has a non-const unit_name, so let's copy to be</span><br><span>diff --git a/src/gprs/gtphub_main.c b/src/gprs/gtphub_main.c</span><br><span>index f824016..0369ed7 100644</span><br><span>--- a/src/gprs/gtphub_main.c</span><br><span>+++ b/src/gprs/gtphub_main.c</span><br><span>@@ -51,7 +51,7 @@</span><br><span> #endif</span><br><span> </span><br><span> extern void *osmo_gtphub_ctx;</span><br><span style="color: hsl(0, 100%, 40%);">-void *tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+void *tall_sgsn_ctx;</span><br><span> </span><br><span> const char *gtphub_copyright =</span><br><span> "Copyright (C) 2015 sysmocom s.f.m.c GmbH <info@sysmocom.de>\r\n"</span><br><span>diff --git a/src/gprs/gtphub_vty.c b/src/gprs/gtphub_vty.c</span><br><span>index ec35e4d..abc08fd 100644</span><br><span>--- a/src/gprs/gtphub_vty.c</span><br><span>+++ b/src/gprs/gtphub_vty.c</span><br><span>@@ -37,7 +37,7 @@</span><br><span> * globals. */</span><br><span> #include <osmocom/sgsn/sgsn.h></span><br><span> extern struct sgsn_instance *sgsn;</span><br><span style="color: hsl(0, 100%, 40%);">-extern void *tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+extern void *tall_sgsn_ctx;</span><br><span> </span><br><span> static struct gtphub *g_hub = 0;</span><br><span> static struct gtphub_cfg *g_cfg = 0;</span><br><span>@@ -270,7 +270,7 @@</span><br><span> "grx-dns-add A.B.C.D",</span><br><span> "Add DNS server\nIPv4 address\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct ares_addr_node *node = talloc_zero(tall_bsc_ctx, struct ares_addr_node);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ares_addr_node *node = talloc_zero(tall_sgsn_ctx, struct ares_addr_node);</span><br><span> node->family = AF_INET;</span><br><span> inet_aton(argv[0], &node->addr.addr4);</span><br><span> </span><br><span>diff --git a/src/gprs/sgsn_ares.c b/src/gprs/sgsn_ares.c</span><br><span>index 17567c4..ba168d6 100644</span><br><span>--- a/src/gprs/sgsn_ares.c</span><br><span>+++ b/src/gprs/sgsn_ares.c</span><br><span>@@ -24,7 +24,7 @@</span><br><span> </span><br><span> #include <netdb.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-extern void *tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+extern void *tall_sgsn_ctx;</span><br><span> </span><br><span> struct cares_event_fd {</span><br><span> struct llist_head head;</span><br><span>@@ -110,7 +110,7 @@</span><br><span> }</span><br><span> </span><br><span> LOGP(DGPRS, LOGL_DEBUG, "Registering C-ares fd (%d)\n", fd);</span><br><span style="color: hsl(0, 100%, 40%);">- ufd = talloc_zero(tall_bsc_ctx, struct cares_event_fd);</span><br><span style="color: hsl(120, 100%, 40%);">+ ufd = talloc_zero(tall_sgsn_ctx, struct cares_event_fd);</span><br><span> ufd->fd.fd = fd;</span><br><span> ufd->fd.cb = ares_osmo_fd_cb;</span><br><span> ufd->fd.data = data;</span><br><span>@@ -137,7 +137,7 @@</span><br><span> {</span><br><span> struct cares_cb_data *cb_data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cb_data = talloc_zero(tall_bsc_ctx, struct cares_cb_data);</span><br><span style="color: hsl(120, 100%, 40%);">+ cb_data = talloc_zero(tall_sgsn_ctx, struct cares_cb_data);</span><br><span> cb_data->cb = cb;</span><br><span> cb_data->data = data;</span><br><span> ares_gethostbyname(sgsn->ares_channel, name, AF_INET, ares_cb, cb_data);</span><br><span>diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c</span><br><span>index 11ed5d3..a17d925 100644</span><br><span>--- a/src/gprs/sgsn_main.c</span><br><span>+++ b/src/gprs/sgsn_main.c</span><br><span>@@ -76,7 +76,7 @@</span><br><span> #define _GNU_SOURCE</span><br><span> #include <getopt.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void *tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+void *tall_sgsn_ctx;</span><br><span> struct ctrl_handle *g_ctrlh;</span><br><span> </span><br><span> struct gprs_ns_inst *sgsn_nsi;</span><br><span>@@ -165,7 +165,7 @@</span><br><span> * and then return to the caller, who will abort the process */</span><br><span> case SIGUSR1:</span><br><span> talloc_report(tall_vty_ctx, stderr);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_report_full(tall_bsc_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_report_full(tall_sgsn_ctx, stderr);</span><br><span> break;</span><br><span> case SIGUSR2:</span><br><span> talloc_report_full(tall_vty_ctx, stderr);</span><br><span>@@ -375,9 +375,9 @@</span><br><span> #endif</span><br><span> </span><br><span> srand(time(NULL));</span><br><span style="color: hsl(0, 100%, 40%);">- tall_bsc_ctx = talloc_named_const(NULL, 0, "osmo_sgsn");</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_talloc_ctx_init(tall_bsc_ctx, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_info.tall_ctx = tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+ tall_sgsn_ctx = talloc_named_const(NULL, 0, "osmo_sgsn");</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_talloc_ctx_init(tall_sgsn_ctx, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_info.tall_ctx = tall_sgsn_ctx;</span><br><span> </span><br><span> signal(SIGINT, &signal_handler);</span><br><span> signal(SIGTERM, &signal_handler);</span><br><span>@@ -386,8 +386,8 @@</span><br><span> signal(SIGUSR2, &signal_handler);</span><br><span> </span><br><span> osmo_init_ignore_signals();</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_init_logging2(tall_bsc_ctx, &gprs_log_info);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_stats_init(tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_init_logging2(tall_sgsn_ctx, &gprs_log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stats_init(tall_sgsn_ctx);</span><br><span> </span><br><span> vty_info.copyright = openbsc_copyright;</span><br><span> vty_init(&vty_info);</span><br><span>@@ -395,11 +395,11 @@</span><br><span> osmo_talloc_vty_add_cmds();</span><br><span> osmo_stats_vty_add_cmds(&gprs_log_info);</span><br><span> sgsn_vty_init(&sgsn_inst.cfg);</span><br><span style="color: hsl(0, 100%, 40%);">- ctrl_vty_init(tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ ctrl_vty_init(tall_sgsn_ctx);</span><br><span> </span><br><span> #if BUILD_IU</span><br><span> osmo_ss7_init();</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_ss7_vty_init_asp(tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ss7_vty_init_asp(tall_sgsn_ctx);</span><br><span> osmo_sccp_vty_init();</span><br><span> #endif</span><br><span> </span><br><span>@@ -420,12 +420,12 @@</span><br><span> sgsn_inst.config_file = CONFIG_FILE_DEFAULT;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_init(tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_init(tall_sgsn_ctx);</span><br><span> </span><br><span> gprs_ns_set_log_ss(DNS);</span><br><span> bssgp_set_log_ss(DBSSGP);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_nsi = gprs_ns_instantiate(&sgsn_ns_cb, tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_nsi = gprs_ns_instantiate(&sgsn_ns_cb, tall_sgsn_ctx);</span><br><span> if (!sgsn_nsi) {</span><br><span> LOGP(DGPRS, LOGL_ERROR, "Unable to instantiate NS\n");</span><br><span> exit(1);</span><br><span>@@ -451,7 +451,7 @@</span><br><span> }</span><br><span> </span><br><span> /* start telnet after reading config for vty_get_bind_addr() */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = telnet_init_dynif(tall_bsc_ctx, NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = telnet_init_dynif(tall_sgsn_ctx, NULL,</span><br><span> vty_get_bind_addr(), OSMO_VTY_PORT_SGSN);</span><br><span> if (rc < 0)</span><br><span> exit(1);</span><br><span>@@ -507,7 +507,7 @@</span><br><span> </span><br><span> #if BUILD_IU</span><br><span> /* Note that these are mostly defaults and can be overriden from the VTY */</span><br><span style="color: hsl(0, 100%, 40%);">- sccp = osmo_sccp_simple_client(tall_bsc_ctx, "OsmoSGSN",</span><br><span style="color: hsl(120, 100%, 40%);">+ sccp = osmo_sccp_simple_client(tall_sgsn_ctx, "OsmoSGSN",</span><br><span> (23 << 3) + 4,</span><br><span> OSMO_SS7_ASP_PROT_M3UA,</span><br><span> 0, NULL,</span><br><span>@@ -517,7 +517,7 @@</span><br><span> return 8;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ranap_iu_init(tall_bsc_ctx, DRANAP, "OsmoSGSN-IuPS", sccp, gsm0408_gprs_rcvmsg_iu, sgsn_ranap_iu_event);</span><br><span style="color: hsl(120, 100%, 40%);">+ ranap_iu_init(tall_sgsn_ctx, DRANAP, "OsmoSGSN-IuPS", sccp, gsm0408_gprs_rcvmsg_iu, sgsn_ranap_iu_event);</span><br><span> #endif</span><br><span> </span><br><span> if (daemonize) {</span><br><span>diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c</span><br><span>index 87c6884..72a310b 100644</span><br><span>--- a/src/gprs/sgsn_vty.c</span><br><span>+++ b/src/gprs/sgsn_vty.c</span><br><span>@@ -56,7 +56,7 @@</span><br><span> #include <osmocom/ranap/iu_client.h></span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-extern void *tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+extern void *tall_sgsn_ctx;</span><br><span> </span><br><span> static struct sgsn_config *g_cfg = NULL;</span><br><span> </span><br><span>@@ -416,7 +416,7 @@</span><br><span> "Use the specified IP address for DNS-resolving the AP names to GGSN IP addresses\n"</span><br><span> "IPv4 address\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct ares_addr_node *node = talloc_zero(tall_bsc_ctx, struct ares_addr_node);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ares_addr_node *node = talloc_zero(tall_sgsn_ctx, struct ares_addr_node);</span><br><span> node->family = AF_INET;</span><br><span> inet_aton(argv[0], &node->addr.addr4);</span><br><span> </span><br><span>diff --git a/tests/gbproxy/gbproxy_test.c b/tests/gbproxy/gbproxy_test.c</span><br><span>index a183320..55776be 100644</span><br><span>--- a/tests/gbproxy/gbproxy_test.c</span><br><span>+++ b/tests/gbproxy/gbproxy_test.c</span><br><span>@@ -47,7 +47,7 @@</span><br><span> </span><br><span> #define MATCH_ANY (-1)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void *tall_bsc_ctx = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+void *tall_sgsn_ctx = NULL;</span><br><span> </span><br><span> struct gbproxy_config gbcfg = {0};</span><br><span> </span><br><span>@@ -1329,7 +1329,7 @@</span><br><span> </span><br><span> static void test_gbproxy()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);</span><br><span> struct sockaddr_in bss_peer[4] = {{0},};</span><br><span> struct sockaddr_in sgsn_peer= {0};</span><br><span> </span><br><span>@@ -1497,7 +1497,7 @@</span><br><span> </span><br><span> static void test_gbproxy_ident_changes()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);</span><br><span> struct sockaddr_in bss_peer[1] = {{0},};</span><br><span> struct sockaddr_in sgsn_peer= {0};</span><br><span> uint16_t nsei[2] = {0x1000, 0x2000};</span><br><span>@@ -1629,7 +1629,7 @@</span><br><span> </span><br><span> static void test_gbproxy_ra_patching()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);</span><br><span> struct sockaddr_in bss_peer[1] = {{0},};</span><br><span> struct sockaddr_in sgsn_peer= {0};</span><br><span> struct gprs_ra_id rai_bss =</span><br><span>@@ -1657,7 +1657,7 @@</span><br><span> gbcfg.nsi = bssgp_nsi;</span><br><span> gbcfg.nsip_sgsn_nsei = SGSN_NSEI;</span><br><span> gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 };</span><br><span style="color: hsl(0, 100%, 40%);">- gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100);</span><br><span style="color: hsl(120, 100%, 40%);">+ gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100);</span><br><span> gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar");</span><br><span> gbcfg.patch_ptmsi = 0;</span><br><span> </span><br><span>@@ -1971,7 +1971,7 @@</span><br><span> </span><br><span> static void test_gbproxy_ptmsi_assignment()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);</span><br><span> struct sockaddr_in bss_peer[1] = {{0},};</span><br><span> struct sockaddr_in sgsn_peer= {0};</span><br><span> struct gprs_ra_id rai_bss =</span><br><span>@@ -2000,7 +2000,7 @@</span><br><span> gbcfg.nsi = bssgp_nsi;</span><br><span> gbcfg.nsip_sgsn_nsei = SGSN_NSEI;</span><br><span> gbcfg.core_plmn = (struct osmo_plmn_id){};</span><br><span style="color: hsl(0, 100%, 40%);">- gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100);</span><br><span style="color: hsl(120, 100%, 40%);">+ gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100);</span><br><span> gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar");</span><br><span> gbcfg.patch_ptmsi = 0;</span><br><span> </span><br><span>@@ -2187,7 +2187,7 @@</span><br><span> </span><br><span> static void test_gbproxy_ptmsi_patching()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);</span><br><span> struct sockaddr_in bss_peer[1] = {{0},};</span><br><span> struct sockaddr_in sgsn_peer= {0};</span><br><span> struct gprs_ra_id rai_bss =</span><br><span>@@ -2236,7 +2236,7 @@</span><br><span> gbcfg.nsi = bssgp_nsi;</span><br><span> gbcfg.nsip_sgsn_nsei = SGSN_NSEI;</span><br><span> gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 };</span><br><span style="color: hsl(0, 100%, 40%);">- gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100);</span><br><span style="color: hsl(120, 100%, 40%);">+ gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100);</span><br><span> gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar");</span><br><span> gbcfg.patch_ptmsi = 1;</span><br><span> </span><br><span>@@ -2526,7 +2526,7 @@</span><br><span> </span><br><span> static void test_gbproxy_ptmsi_patching_bad_cases()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);</span><br><span> struct sockaddr_in bss_peer[1] = {{0},};</span><br><span> struct sockaddr_in sgsn_peer= {0};</span><br><span> struct gprs_ra_id rai_bss =</span><br><span>@@ -2557,7 +2557,7 @@</span><br><span> gbcfg.nsi = bssgp_nsi;</span><br><span> gbcfg.nsip_sgsn_nsei = SGSN_NSEI;</span><br><span> gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 };</span><br><span style="color: hsl(0, 100%, 40%);">- gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100);</span><br><span style="color: hsl(120, 100%, 40%);">+ gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100);</span><br><span> gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar");</span><br><span> gbcfg.patch_ptmsi = 1;</span><br><span> </span><br><span>@@ -2708,7 +2708,7 @@</span><br><span> </span><br><span> static void test_gbproxy_imsi_acquisition()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);</span><br><span> struct sockaddr_in bss_peer[1] = {{0},};</span><br><span> struct sockaddr_in sgsn_peer= {0};</span><br><span> struct gprs_ra_id rai_bss =</span><br><span>@@ -2743,7 +2743,7 @@</span><br><span> gbcfg.nsi = bssgp_nsi;</span><br><span> gbcfg.nsip_sgsn_nsei = SGSN_NSEI;</span><br><span> gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 };</span><br><span style="color: hsl(0, 100%, 40%);">- gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100);</span><br><span style="color: hsl(120, 100%, 40%);">+ gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100);</span><br><span> gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar");</span><br><span> gbcfg.patch_ptmsi = 1;</span><br><span> gbcfg.acquire_imsi = 1;</span><br><span>@@ -3021,7 +3021,7 @@</span><br><span> </span><br><span> static void test_gbproxy_secondary_sgsn()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);</span><br><span> struct sockaddr_in bss_peer[1] = {{0},};</span><br><span> struct sockaddr_in sgsn_peer[2]= {{0},};</span><br><span> struct gprs_ra_id rai_bss =</span><br><span>@@ -3071,7 +3071,7 @@</span><br><span> gbcfg.nsi = bssgp_nsi;</span><br><span> gbcfg.nsip_sgsn_nsei = SGSN_NSEI;</span><br><span> gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 };</span><br><span style="color: hsl(0, 100%, 40%);">- gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100);</span><br><span style="color: hsl(120, 100%, 40%);">+ gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100);</span><br><span> gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar");</span><br><span> gbcfg.patch_ptmsi = 1;</span><br><span> gbcfg.acquire_imsi = 1;</span><br><span>@@ -3525,7 +3525,7 @@</span><br><span> </span><br><span> static void test_gbproxy_keep_info()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);</span><br><span> struct sockaddr_in bss_peer[1] = {{0},};</span><br><span> struct sockaddr_in sgsn_peer= {0};</span><br><span> struct gprs_ra_id rai_bss =</span><br><span>@@ -4833,7 +4833,7 @@</span><br><span> </span><br><span> static void test_gbproxy_stored_messages()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);</span><br><span> struct sockaddr_in bss_peer[1] = {{0},};</span><br><span> struct sockaddr_in sgsn_peer= {0};</span><br><span> struct gprs_ra_id rai_bss =</span><br><span>@@ -4857,7 +4857,7 @@</span><br><span> gbcfg.nsi = bssgp_nsi;</span><br><span> gbcfg.nsip_sgsn_nsei = SGSN_NSEI;</span><br><span> gbcfg.core_plmn = (struct osmo_plmn_id){};</span><br><span style="color: hsl(0, 100%, 40%);">- gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100);</span><br><span style="color: hsl(120, 100%, 40%);">+ gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100);</span><br><span> gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar");</span><br><span> gbcfg.patch_ptmsi = 0;</span><br><span> gbcfg.acquire_imsi = 1;</span><br><span>@@ -5030,10 +5030,10 @@</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span> talloc_enable_leak_report();</span><br><span style="color: hsl(0, 100%, 40%);">- tall_bsc_ctx = talloc_named_const(NULL, 0, "gbproxy_test");</span><br><span style="color: hsl(0, 100%, 40%);">- void *log_ctx = talloc_named_const(tall_bsc_ctx, 0, "log");</span><br><span style="color: hsl(120, 100%, 40%);">+ tall_sgsn_ctx = talloc_named_const(NULL, 0, "gbproxy_test");</span><br><span style="color: hsl(120, 100%, 40%);">+ void *log_ctx = talloc_named_const(tall_sgsn_ctx, 0, "log");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msgb_talloc_ctx_init(tall_bsc_ctx, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_talloc_ctx_init(tall_sgsn_ctx, 0);</span><br><span> </span><br><span> osmo_init_logging2(log_ctx, &info);</span><br><span> log_set_use_color(osmo_stderr_target, 0);</span><br><span>@@ -5044,7 +5044,7 @@</span><br><span> log_set_log_level(osmo_stderr_target, LOGL_DEBUG);</span><br><span> log_set_all_filter(osmo_stderr_target, 1);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_init(tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_init(tall_sgsn_ctx);</span><br><span> </span><br><span> setlinebuf(stdout);</span><br><span> </span><br><span>@@ -5070,8 +5070,8 @@</span><br><span> </span><br><span> talloc_free(log_ctx);</span><br><span> /* expecting root and msgb ctx, empty */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(talloc_total_blocks(tall_bsc_ctx) == 2);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(talloc_total_blocks(tall_sgsn_ctx) == 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(tall_sgsn_ctx);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c</span><br><span>index 3e86266..214d07b 100644</span><br><span>--- a/tests/sgsn/sgsn_test.c</span><br><span>+++ b/tests/sgsn/sgsn_test.c</span><br><span>@@ -40,7 +40,7 @@</span><br><span> </span><br><span> #include <stdio.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void *tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+void *tall_sgsn_ctx;</span><br><span> static struct sgsn_instance sgsn_inst = {</span><br><span> .config_file = "osmo_sgsn.cfg",</span><br><span> .cfg = {</span><br><span>@@ -1637,7 +1637,7 @@</span><br><span> </span><br><span> osmo_sgsn_ctx = talloc_named_const(NULL, 0, "osmo_sgsn");</span><br><span> osmo_init_logging2(osmo_sgsn_ctx, &info);</span><br><span style="color: hsl(0, 100%, 40%);">- tall_bsc_ctx = talloc_named_const(osmo_sgsn_ctx, 0, "bsc");</span><br><span style="color: hsl(120, 100%, 40%);">+ tall_sgsn_ctx = talloc_named_const(osmo_sgsn_ctx, 0, "sgsn");</span><br><span> msgb_ctx = msgb_talloc_ctx_init(osmo_sgsn_ctx, 0);</span><br><span> </span><br><span> sgsn_rate_ctr_init();</span><br><span>@@ -1661,7 +1661,7 @@</span><br><span> </span><br><span> talloc_report_full(osmo_sgsn_ctx, stderr);</span><br><span> OSMO_ASSERT(talloc_total_blocks(msgb_ctx) == 1);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(talloc_total_blocks(tall_bsc_ctx) == 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(talloc_total_blocks(tall_sgsn_ctx) == 2);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py</span><br><span>index afe1cfd..73dd399 100755</span><br><span>--- a/tests/vty_test_runner.py</span><br><span>+++ b/tests/vty_test_runner.py</span><br><span>@@ -75,7 +75,7 @@</span><br><span> "doc/examples/osmo-gbproxy/osmo-gbproxy.cfg"]</span><br><span> </span><br><span> def vty_app(self):</span><br><span style="color: hsl(0, 100%, 40%);">- return (4246, "./src/gprs/osmo-gbproxy", "OsmoGbProxy", "bsc")</span><br><span style="color: hsl(120, 100%, 40%);">+ return (4246, "./src/gprs/osmo-gbproxy", "OsmoGbProxy", "gbproxy")</span><br><span> </span><br><span> def testVtyTree(self):</span><br><span> self.vty.enable()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11528">change 11528</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/11528"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I93f0dc721c2eff8a87fb9248882f24768f708713 </div>
<div style="display:none"> Gerrit-Change-Number: 11528 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>