<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11348">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">move ipa_client_conn_send_rspro() into remsim_client_fsm.c<br><br>Change-Id: I805e7dee0e3dd5a591d215ad340da356b19d03dd<br>---<br>M src/remsim_client.c<br>M src/remsim_client_fsm.c<br>M src/simtrace2-remsim_client.c<br>3 files changed, 15 insertions(+), 30 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/48/11348/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/remsim_client.c b/src/remsim_client.c</span><br><span>index 90e8de2..b60059d 100644</span><br><span>--- a/src/remsim_client.c</span><br><span>+++ b/src/remsim_client.c</span><br><span>@@ -16,21 +16,6 @@</span><br><span> #include "rspro_util.h"</span><br><span> #include "client.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void push_and_send(struct ipa_client_conn *ipa, struct msgb *msg_tx)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-        ipa_prepend_header_ext(msg_tx, IPAC_PROTO_EXT_RSPRO);</span><br><span style="color: hsl(0, 100%, 40%);">-   ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO);</span><br><span style="color: hsl(0, 100%, 40%);">-   ipa_client_conn_send(ipa, msg_tx);</span><br><span style="color: hsl(0, 100%, 40%);">-      /* msg_tx is now queued and will be freed. */</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%);">-void ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-  struct msgb *msg = rspro_enc_msg(rspro);</span><br><span style="color: hsl(0, 100%, 40%);">-        OSMO_ASSERT(msg);</span><br><span style="color: hsl(0, 100%, 40%);">-       push_and_send(ipa, msg);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static int bankd_handle_msg(struct bankd_client *bc, struct msgb *msg)</span><br><span> {</span><br><span>     RsproPDU_t *pdu = rspro_dec_msg(msg);</span><br><span>diff --git a/src/remsim_client_fsm.c b/src/remsim_client_fsm.c</span><br><span>index 0b514e6..84f9f4f 100644</span><br><span>--- a/src/remsim_client_fsm.c</span><br><span>+++ b/src/remsim_client_fsm.c</span><br><span>@@ -17,6 +17,21 @@</span><br><span> </span><br><span> #define S(x) (1 << (x))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void push_and_send(struct ipa_client_conn *ipa, struct msgb *msg_tx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+  ipa_prepend_header_ext(msg_tx, IPAC_PROTO_EXT_RSPRO);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_client_conn_send(ipa, msg_tx);</span><br><span style="color: hsl(120, 100%, 40%);">+    /* msg_tx is now queued and will be freed. */</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%);">+void ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+        struct msgb *msg = rspro_enc_msg(rspro);</span><br><span style="color: hsl(120, 100%, 40%);">+      OSMO_ASSERT(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+     push_and_send(ipa, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void bankd_updown_cb(struct ipa_client_conn *conn, int up)</span><br><span> {</span><br><span>      struct bankd_client *bc = conn->data;</span><br><span>diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c</span><br><span>index 3fc5da0..f54ace3 100644</span><br><span>--- a/src/simtrace2-remsim_client.c</span><br><span>+++ b/src/simtrace2-remsim_client.c</span><br><span>@@ -506,21 +506,6 @@</span><br><span> </span><br><span> /** remsim_client **/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void push_and_send(struct ipa_client_conn *ipa, struct msgb *msg_tx)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-   ipa_prepend_header_ext(msg_tx, IPAC_PROTO_EXT_RSPRO);</span><br><span style="color: hsl(0, 100%, 40%);">-   ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO);</span><br><span style="color: hsl(0, 100%, 40%);">-   ipa_client_conn_send(ipa, msg_tx);</span><br><span style="color: hsl(0, 100%, 40%);">-      /* msg_tx is now queued and will be freed. */</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%);">-void ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-  struct msgb *msg = rspro_enc_msg(rspro);</span><br><span style="color: hsl(0, 100%, 40%);">-        OSMO_ASSERT(msg);</span><br><span style="color: hsl(0, 100%, 40%);">-       push_and_send(ipa, msg);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static int bankd_handle_tpduCardToModem(struct bankd_client *bc, RsproPDU_t *pdu)</span><br><span> {</span><br><span>  OSMO_ASSERT(pdu);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11348">change 11348</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/11348"/><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: I805e7dee0e3dd5a591d215ad340da356b19d03dd </div>
<div style="display:none"> Gerrit-Change-Number: 11348 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>