<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12221">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use explicit parameter for sgsn_auth_init()<br><br>This is necessary to properly test ACLs in follow-up patches.<br><br>Change-Id: Ibeba371234680f33ad35afbfffce9dca185228c1<br>---<br>M include/osmocom/sgsn/gprs_sgsn.h<br>M src/gprs/sgsn_auth.c<br>M src/gprs/sgsn_main.c<br>M tests/sgsn/sgsn_test.c<br>4 files changed, 7 insertions(+), 4 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/21/12221/1</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 cf78766..e82bf70 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>@@ -459,7 +459,7 @@</span><br><span> struct sgsn_instance;</span><br><span> extern const struct value_string *sgsn_auth_state_names;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void sgsn_auth_init(void);</span><br><span style="color: hsl(120, 100%, 40%);">+void sgsn_auth_init(struct sgsn_instance *sgsn);</span><br><span> struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, struct sgsn_config *cfg);</span><br><span> int sgsn_acl_add(const char *imsi, struct sgsn_config *cfg);</span><br><span> int sgsn_acl_del(const char *imsi, struct sgsn_config *cfg);</span><br><span>diff --git a/src/gprs/sgsn_auth.c b/src/gprs/sgsn_auth.c</span><br><span>index e3d9127..3cf700a 100644</span><br><span>--- a/src/gprs/sgsn_auth.c</span><br><span>+++ b/src/gprs/sgsn_auth.c</span><br><span>@@ -38,7 +38,7 @@</span><br><span> </span><br><span> const struct value_string *sgsn_auth_state_names = auth_state_names;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void sgsn_auth_init(void)</span><br><span style="color: hsl(120, 100%, 40%);">+void sgsn_auth_init(struct sgsn_instance *sgsn)</span><br><span> {</span><br><span>   INIT_LLIST_HEAD(&sgsn->cfg.imsi_acl);</span><br><span> }</span><br><span>diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c</span><br><span>index 1c76d6f..798e507 100644</span><br><span>--- a/src/gprs/sgsn_main.c</span><br><span>+++ b/src/gprs/sgsn_main.c</span><br><span>@@ -432,7 +432,7 @@</span><br><span>         bssgp_vty_init();</span><br><span>    gprs_llc_vty_init();</span><br><span>         gprs_sndcp_vty_init();</span><br><span style="color: hsl(0, 100%, 40%);">-  sgsn_auth_init();</span><br><span style="color: hsl(120, 100%, 40%);">+     sgsn_auth_init(sgsn);</span><br><span>        sgsn_cdr_init(sgsn);</span><br><span>         /* FIXME: register signal handler for SS_L_NS */</span><br><span> </span><br><span>diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c</span><br><span>index 111515e..4c0dc00 100644</span><br><span>--- a/tests/sgsn/sgsn_test.c</span><br><span>+++ b/tests/sgsn/sgsn_test.c</span><br><span>@@ -1632,6 +1632,7 @@</span><br><span> </span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_instance *sgsn;</span><br><span>  void *osmo_sgsn_ctx;</span><br><span>         void *msgb_ctx;</span><br><span> </span><br><span>@@ -1639,9 +1640,11 @@</span><br><span>         osmo_init_logging2(osmo_sgsn_ctx, &info);</span><br><span>        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 style="color: hsl(120, 100%, 40%);">+    sgsn = sgsn_instance_alloc(osmo_sgsn_ctx);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        sgsn_inst_init(sgsn);</span><br><span>        sgsn_rate_ctr_init();</span><br><span style="color: hsl(0, 100%, 40%);">-   sgsn_auth_init();</span><br><span style="color: hsl(120, 100%, 40%);">+     sgsn_auth_init(sgsn);</span><br><span>        gprs_subscr_init(sgsn);</span><br><span> </span><br><span>  test_llme();</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12221">change 12221</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/12221"/><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: Ibeba371234680f33ad35afbfffce9dca185228c1 </div>
<div style="display:none"> Gerrit-Change-Number: 12221 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>