<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12578">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">SMS: remove code duplication in transaction init<br><br>Move code which allocates transaction for SMS and initializes<br>corresponding FSM into separate function (shared by MT and MO code<br>paths) to avoid code duplication and simplify further modifications.<br><br>Change-Id: I3563e11bebb58e656592df2ff7db96f41deaf735<br>---<br>M src/libmsc/gsm_04_11.c<br>1 file changed, 28 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12578/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c</span><br><span>index 8ef26a7..4dc07bd 100644</span><br><span>--- a/src/libmsc/gsm_04_11.c</span><br><span>+++ b/src/libmsc/gsm_04_11.c</span><br><span>@@ -1007,6 +1007,27 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static struct gsm_trans *gsm411_trans_init(struct gsm_network *net, struct vlr_subscr *vsub, struct ran_conn *conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tid)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Allocate a new transaction */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_trans *trans = trans_alloc(net, vsub, GSM48_PDISC_SMS, tid, new_callref++);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trans) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSMS, LOGL_ERROR, "No memory for transaction\n");</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%);">+ /* Init both SMC and SMR state machines */</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm411_smc_init(&trans->sms.smc_inst, 0, 1, gsm411_mn_recv, gsm411_mm_send);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm411_smr_init(&trans->sms.smr_inst, 0, 1, gsm411_rl_recv, gsm411_mn_send);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Associate transaction with connection */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn)</span><br><span style="color: hsl(120, 100%, 40%);">+ trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return trans;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct gsm_trans *gsm411_alloc_mt_trans(struct gsm_network *net,</span><br><span> struct vlr_subscr *vsub)</span><br><span> {</span><br><span>@@ -1023,24 +1044,15 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Allocate a new transaction */</span><br><span style="color: hsl(0, 100%, 40%);">- trans = trans_alloc(net, vsub, GSM48_PDISC_SMS, tid, new_callref++);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!trans) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLSMS, LOGL_ERROR, "No memory for trans\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Init both SMC and SMR state machines */</span><br><span style="color: hsl(0, 100%, 40%);">- gsm411_smc_init(&trans->sms.smc_inst, 0, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- gsm411_mn_recv, gsm411_mm_send);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm411_smr_init(&trans->sms.smr_inst, 0, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- gsm411_rl_recv, gsm411_mn_send);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Attempt to find an existing connection */</span><br><span> conn = connection_for_subscr(vsub);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Allocate a new transaction */</span><br><span style="color: hsl(120, 100%, 40%);">+ trans = gsm411_trans_init(net, vsub, conn, tid);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trans)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (conn) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Associate transaction with connection */</span><br><span style="color: hsl(0, 100%, 40%);">- trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS);</span><br><span> /* Generate unique RP Message Reference */</span><br><span> trans->sms.sm_rp_mr = conn->next_rp_ref++;</span><br><span> }</span><br><span>@@ -1192,21 +1204,12 @@</span><br><span> }</span><br><span> </span><br><span> if (!trans) {</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DLSMS, " -> (new transaction)\n");</span><br><span style="color: hsl(0, 100%, 40%);">- trans = trans_alloc(conn->network, conn->vsub,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_SMS,</span><br><span style="color: hsl(0, 100%, 40%);">- transaction_id, new_callref++);</span><br><span style="color: hsl(120, 100%, 40%);">+ trans = gsm411_trans_init(conn->network, conn->vsub, conn, transaction_id);</span><br><span> if (!trans) {</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DLSMS, " -> No memory for trans\n");</span><br><span> /* FIXME: send some error message */</span><br><span> return -ENOMEM;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- gsm411_smc_init(&trans->sms.smc_inst, 0, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- gsm411_mn_recv, gsm411_mm_send);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm411_smr_init(&trans->sms.smr_inst, 0, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- gsm411_rl_recv, gsm411_mn_send);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS);</span><br><span> trans->dlci = OMSC_LINKID_CB(msg); /* DLCI as received from BSC */</span><br><span> </span><br><span> new_trans = 1;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12578">change 12578</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/12578"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I3563e11bebb58e656592df2ff7db96f41deaf735 </div>
<div style="display:none"> Gerrit-Change-Number: 12578 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>