<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11349">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">server_conn_fsm_alloc(): add explicit talloc context argument<br><br>The rspro_server_conn might be a static member of a different struct<br>and hence not suitable as a talloc context.<br><br>Change-Id: I9fd78d558f791d452f2a5279f1af13fd596c1cd6<br>---<br>M src/client.h<br>M src/remsim_client_fsm.c<br>2 files changed, 4 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/49/11349/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/client.h b/src/client.h</span><br><span>index 7a3c476..d85e647 100644</span><br><span>--- a/src/client.h</span><br><span>+++ b/src/client.h</span><br><span>@@ -37,6 +37,7 @@</span><br><span>  uint16_t server_port;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int server_conn_fsm_alloc(void *ctx, struct rspro_server_conn *srvc);</span><br><span> extern struct osmo_fsm remsim_client_server_fsm;</span><br><span> </span><br><span> /* main.c */</span><br><span>diff --git a/src/remsim_client_fsm.c b/src/remsim_client_fsm.c</span><br><span>index 84f9f4f..8711934 100644</span><br><span>--- a/src/remsim_client_fsm.c</span><br><span>+++ b/src/remsim_client_fsm.c</span><br><span>@@ -302,7 +302,7 @@</span><br><span>        struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv;</span><br><span>   int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     srvc->conn = ipa_client_conn_create(srvc, NULL, 0, srvc->server_host, srvc->server_port,</span><br><span style="color: hsl(120, 100%, 40%);">+     srvc->conn = ipa_client_conn_create(fi, NULL, 0, srvc->server_host, srvc->server_port,</span><br><span>                                              srvc_updown_cb, srvc_read_cb, NULL, srvc);</span><br><span>   if (!srvc->conn) {</span><br><span>                fprintf(stderr, "Unable to create socket: %s\n", strerror(errno));</span><br><span>@@ -450,11 +450,11 @@</span><br><span>         .event_names = server_conn_fsm_event_names,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int server_conn_fsm_alloc(struct rspro_server_conn *srvc)</span><br><span style="color: hsl(120, 100%, 40%);">+int server_conn_fsm_alloc(void *ctx, struct rspro_server_conn *srvc)</span><br><span> {</span><br><span>    struct osmo_fsm_inst *fi;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   fi = osmo_fsm_inst_alloc(&remsim_client_server_fsm, srvc, srvc, LOGL_DEBUG, "server");</span><br><span style="color: hsl(120, 100%, 40%);">+  fi = osmo_fsm_inst_alloc(&remsim_client_server_fsm, ctx, srvc, LOGL_DEBUG, "server");</span><br><span>  if (!fi)</span><br><span>             return -1;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11349">change 11349</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/11349"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I9fd78d558f791d452f2a5279f1af13fd596c1cd6 </div>
<div style="display:none"> Gerrit-Change-Number: 11349 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>