<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12583">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;">trxcon/l1ctl_link.c: refactor l1ctl_link_init()<br><br>The main changes are:<br><br> - return pointer to the allocated l1ctl_link or NULL,<br> - accept the talloc context as 'tall_ctx' argument.<br><br>Change-Id: I7fe1bc306494ac692c182dcfd2a2d9412929194b<br>---<br>M src/host/trxcon/l1ctl_link.c<br>M src/host/trxcon/l1ctl_link.h<br>M src/host/trxcon/trxcon.c<br>3 files changed, 20 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c</span><br><span>index 1350c3c..b7ea262 100644</span><br><span>--- a/src/host/trxcon/l1ctl_link.c</span><br><span>+++ b/src/host/trxcon/l1ctl_link.c</span><br><span>@@ -229,59 +229,57 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int l1ctl_link_init(struct l1ctl_link **l1l, const char *sock_path)</span><br><span style="color: hsl(120, 100%, 40%);">+struct l1ctl_link *l1ctl_link_init(void *tall_ctx, const char *sock_path)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct l1ctl_link *l1l_new;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct l1ctl_link *l1l;</span><br><span> struct osmo_fd *bfd;</span><br><span> int rc;</span><br><span> </span><br><span> LOGP(DL1C, LOGL_NOTICE, "Init L1CTL link (%s)\n", sock_path);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- l1l_new = talloc_zero(tall_trx_ctx, struct l1ctl_link);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!l1l_new) {</span><br><span style="color: hsl(120, 100%, 40%);">+ l1l = talloc_zero(tall_ctx, struct l1ctl_link);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!l1l) {</span><br><span> LOGP(DL1C, LOGL_ERROR, "Failed to allocate memory\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -ENOMEM;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> }</span><br><span> </span><br><span> /* Allocate a new dedicated state machine */</span><br><span style="color: hsl(0, 100%, 40%);">- l1l_new->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l_new,</span><br><span style="color: hsl(120, 100%, 40%);">+ l1l->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l,</span><br><span> NULL, LOGL_DEBUG, "l1ctl_link");</span><br><span style="color: hsl(0, 100%, 40%);">- if (l1l_new->fsm == NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (l1l->fsm == NULL) {</span><br><span> LOGP(DTRX, LOGL_ERROR, "Failed to allocate an instance "</span><br><span> "of FSM '%s'\n", l1ctl_fsm.name);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(l1l_new);</span><br><span style="color: hsl(0, 100%, 40%);">- return -ENOMEM;</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(l1l);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> }</span><br><span> </span><br><span> /* Create a socket and bind handlers */</span><br><span style="color: hsl(0, 100%, 40%);">- bfd = &l1l_new->listen_bfd;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd = &l1l->listen_bfd;</span><br><span> rc = osmo_sock_unix_init_ofd(bfd, SOCK_STREAM, 0, sock_path,</span><br><span> OSMO_SOCK_F_BIND);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DL1C, LOGL_ERROR, "Could not create UNIX socket: %s\n",</span><br><span> strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_free(l1l_new->fsm);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(l1l_new);</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_free(l1l->fsm);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(l1l);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> }</span><br><span> </span><br><span> /* Bind shutdown handler */</span><br><span style="color: hsl(0, 100%, 40%);">- l1l_new->shutdown_cb = l1ctl_shutdown_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1l->shutdown_cb = l1ctl_shutdown_cb;</span><br><span> </span><br><span> /* Bind connection handler */</span><br><span> bfd->cb = l1ctl_link_accept;</span><br><span> bfd->when = BSC_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->data = l1l_new;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->data = l1l;</span><br><span> </span><br><span> /**</span><br><span> * To be able to accept first connection and</span><br><span> * drop others, it should be set to -1</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- l1l_new->wq.bfd.fd = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1l->wq.bfd.fd = -1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- *l1l = l1l_new;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return l1l;</span><br><span> }</span><br><span> </span><br><span> void l1ctl_link_shutdown(struct l1ctl_link *l1l)</span><br><span>diff --git a/src/host/trxcon/l1ctl_link.h b/src/host/trxcon/l1ctl_link.h</span><br><span>index 01103dc..da64419 100644</span><br><span>--- a/src/host/trxcon/l1ctl_link.h</span><br><span>+++ b/src/host/trxcon/l1ctl_link.h</span><br><span>@@ -41,7 +41,7 @@</span><br><span> void (*shutdown_cb)(struct l1ctl_link *l1l);</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int l1ctl_link_init(struct l1ctl_link **l1l, const char *sock_path);</span><br><span style="color: hsl(120, 100%, 40%);">+struct l1ctl_link *l1ctl_link_init(void *tall_ctx, const char *sock_path);</span><br><span> void l1ctl_link_shutdown(struct l1ctl_link *l1l);</span><br><span> </span><br><span> int l1ctl_link_send(struct l1ctl_link *l1l, struct msgb *msg);</span><br><span>diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c</span><br><span>index 501d0c7..777138f 100644</span><br><span>--- a/src/host/trxcon/trxcon.c</span><br><span>+++ b/src/host/trxcon/trxcon.c</span><br><span>@@ -279,8 +279,8 @@</span><br><span> NULL, LOGL_DEBUG, "main");</span><br><span> </span><br><span> /* Init L1CTL server */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = l1ctl_link_init(&app_data.l1l, app_data.bind_socket);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc)</span><br><span style="color: hsl(120, 100%, 40%);">+ app_data.l1l = l1ctl_link_init(tall_trx_ctx, app_data.bind_socket);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (app_data.l1l == NULL)</span><br><span> goto exit;</span><br><span> </span><br><span> /* Init transceiver interface */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12583">change 12583</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/12583"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7fe1bc306494ac692c182dcfd2a2d9412929194b </div>
<div style="display:none"> Gerrit-Change-Number: 12583 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>