<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/21571">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: move allocation of the SNS fsm into create_nse<br><br>The allocation of the SNS fsm can be done in create_nse<br>because the dialect is now known at that time.<br><br>Change-Id: I64e1f3dcc63d38e65bb486c9ac08d4032b7ad222<br>---<br>M src/gb/gprs_ns2.c<br>1 file changed, 13 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/21571/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index 920fa68..57590a5 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -677,6 +677,7 @@</span><br><span> enum gprs_ns2_ll linklayer, enum gprs_ns2_dialect dialect)</span><br><span> {</span><br><span> struct gprs_ns2_nse *nse;</span><br><span style="color: hsl(120, 100%, 40%);">+ char sns[16];</span><br><span> </span><br><span> nse = gprs_ns2_nse_by_nsei(nsi, nsei);</span><br><span> if (nse) {</span><br><span>@@ -688,6 +689,15 @@</span><br><span> if (!nse)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (dialect == NS2_DIALECT_SNS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(sns, sizeof(sns), "nse-%d-sns", nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->bss_sns_fi = ns2_sns_bss_fsm_alloc(nse, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nse->bss_sns_fi) {</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(nse);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</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%);">+</span><br><span> nse->dialect = dialect;</span><br><span> nse->ll = linklayer;</span><br><span> nse->nsei = nsei;</span><br><span>@@ -959,14 +969,11 @@</span><br><span> return -2;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- nsvc = gprs_ns2_ip_bind_connect(bind, nse, remote);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!nsvc)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nse->bss_sns_fi)</span><br><span> return -1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!nse->bss_sns_fi)</span><br><span style="color: hsl(0, 100%, 40%);">- nse->bss_sns_fi = ns2_sns_bss_fsm_alloc(nse, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!nse->bss_sns_fi)</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc = gprs_ns2_ip_bind_connect(bind, nse, remote);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nsvc)</span><br><span> return -1;</span><br><span> </span><br><span> return ns2_sns_bss_fsm_start(nse, nsvc, remote);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/21571">change 21571</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/libosmocore/+/21571"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I64e1f3dcc63d38e65bb486c9ac08d4032b7ad222 </div>
<div style="display:none"> Gerrit-Change-Number: 21571 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>