<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22490">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NACC: delay CTRL conn socket init until it's needed<br><br>This way, we don't open a socket and do the IPA handshake in the event<br>the request is already cached.<br><br>Related: SYS#4909<br>Change-Id: Ib1ea85e1196c8b9dc40c8837ab5d4a54f2a1f2d4<br>---<br>M src/nacc_fsm.c<br>1 file changed, 11 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c</span><br><span>index b8350a6..5e8d51b 100644</span><br><span>--- a/src/nacc_fsm.c</span><br><span>+++ b/src/nacc_fsm.c</span><br><span>@@ -279,7 +279,7 @@</span><br><span> struct gprs_rlcmac_bts *bts = ctx->ms->bts;</span><br><span> struct gprs_pcu *pcu = bts->pcu;</span><br><span> const struct osmo_cell_global_id_ps *cgi_ps;</span><br><span style="color: hsl(0, 100%, 40%);">- struct ctrl_cmd *cmd;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ctrl_cmd *cmd = NULL;</span><br><span> int rc;</span><br><span> </span><br><span> /* First try to find the value in the cache */</span><br><span>@@ -295,6 +295,16 @@</span><br><span> LOGPFSML(fi, LOGL_DEBUG, "No CGI-PS found in cache, resolving " NEIGH_CACHE_ENTRY_KEY_FMT "...\n",</span><br><span> NEIGH_CACHE_ENTRY_KEY_ARGS(&ctx->neigh_key));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_sock_init2_ofd(&ctx->neigh_ctrl_conn->write_queue.bfd,</span><br><span style="color: hsl(120, 100%, 40%);">+ AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP,</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL, 0, pcu->vty.neigh_ctrl_addr, pcu->vty.neigh_ctrl_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCK_F_CONNECT);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(fi, LOGL_ERROR, "Can't connect to CTRL @ %s:%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu->vty.neigh_ctrl_addr, pcu->vty.neigh_ctrl_port);</span><br><span style="color: hsl(120, 100%, 40%);">+ goto err_term;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> cmd = ctrl_cmd_create(ctx, CTRL_TYPE_GET);</span><br><span> if (!cmd) {</span><br><span> LOGPFSML(fi, LOGL_ERROR, "CTRL msg creation failed\n");</span><br><span>@@ -603,11 +613,8 @@</span><br><span> </span><br><span> struct nacc_fsm_ctx *nacc_fsm_alloc(struct GprsMs* ms)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts = ms->bts;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_pcu *pcu = bts->pcu;</span><br><span> struct nacc_fsm_ctx *ctx = talloc_zero(ms, struct nacc_fsm_ctx);</span><br><span> char buf[64];</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span> </span><br><span> talloc_set_destructor(ctx, nacc_fsm_ctx_talloc_destructor);</span><br><span> </span><br><span>@@ -628,16 +635,6 @@</span><br><span> ctx->neigh_ctrl_conn->write_queue.bfd.fd = -1;</span><br><span> llist_add(&ctx->neigh_ctrl_conn->list_entry, &ctx->neigh_ctrl->ccon_list);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_sock_init2_ofd(&ctx->neigh_ctrl_conn->write_queue.bfd,</span><br><span style="color: hsl(0, 100%, 40%);">- AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP,</span><br><span style="color: hsl(0, 100%, 40%);">- NULL, 0, pcu->vty.neigh_ctrl_addr, pcu->vty.neigh_ctrl_port,</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_SOCK_F_CONNECT);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNACC, LOGL_ERROR, "Can't connect to CTRL @ %s:%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- pcu->vty.neigh_ctrl_addr, pcu->vty.neigh_ctrl_port);</span><br><span style="color: hsl(0, 100%, 40%);">- goto free_ret;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return ctx;</span><br><span> free_ret:</span><br><span> talloc_free(ctx);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22490">change 22490</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/osmo-pcu/+/22490"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib1ea85e1196c8b9dc40c8837ab5d4a54f2a1f2d4 </div>
<div style="display:none"> Gerrit-Change-Number: 22490 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>