<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/17962">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">om2k: Add VTY command to allow TX of arbitrary message for testing<br><br>Signed-off-by: Sylvain Munaut <tnt@246tNt.com><br>Change-Id: I5a385614fc670946f83ea79cc176c2d448675672<br>---<br>M include/osmocom/bsc/abis_om2000.h<br>M src/osmo-bsc/abis_om2000.c<br>M src/osmo-bsc/abis_om2000_vty.c<br>3 files changed, 45 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/abis_om2000.h b/include/osmocom/bsc/abis_om2000.h</span><br><span>index 163a49c..0d48c0c 100644</span><br><span>--- a/include/osmocom/bsc/abis_om2000.h</span><br><span>+++ b/include/osmocom/bsc/abis_om2000.h</span><br><span>@@ -113,6 +113,7 @@</span><br><span> int abis_om2k_tx_op_info(struct gsm_bts *bts, const struct abis_om2k_mo *mo,</span><br><span> uint8_t operational);</span><br><span> int abis_om2k_tx_cap_req(struct gsm_bts *bts, const struct abis_om2k_mo *mo);</span><br><span style="color: hsl(120, 100%, 40%);">+int abis_om2k_tx_arb(struct gsm_bts *bts, struct abis_om2k_mo *mo, uint16_t req, uint8_t *buf, int buf_len);</span><br><span> int abis_om2k_tx_is_conf_req(struct gsm_bts *bts);</span><br><span> int abis_om2k_tx_con_conf_req(struct gsm_bts *bts);</span><br><span> int abis_om2k_tx_tf_conf_req(struct gsm_bts *bts);</span><br><span>diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c</span><br><span>index e1a526c..b221441 100644</span><br><span>--- a/src/osmo-bsc/abis_om2000.c</span><br><span>+++ b/src/osmo-bsc/abis_om2000.c</span><br><span>@@ -1129,6 +1129,21 @@</span><br><span> return abis_om2k_tx_simple(bts, mo, OM2K_MSGT_CAPA_REQ);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int abis_om2k_tx_arb(struct gsm_bts *bts, struct abis_om2k_mo *mo,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t req, uint8_t *buf, int buf_len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = om2k_msgb_alloc();</span><br><span style="color: hsl(120, 100%, 40%);">+ struct abis_om2k_hdr *o2k;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ o2k = (struct abis_om2k_hdr *) msgb_put(msg, sizeof(*o2k));</span><br><span style="color: hsl(120, 100%, 40%);">+ fill_om2k_hdr(o2k, mo, req);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (buf_len)</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(msgb_put(msg, buf_len), buf, buf_len);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return abis_om2k_sendmsg(bts, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void om2k_fill_is_conn_grp(struct om2k_is_conn_grp *grp, uint16_t icp1,</span><br><span> uint16_t icp2, uint8_t cont_idx)</span><br><span> {</span><br><span>diff --git a/src/osmo-bsc/abis_om2000_vty.c b/src/osmo-bsc/abis_om2000_vty.c</span><br><span>index 5404d62..972fff0 100644</span><br><span>--- a/src/osmo-bsc/abis_om2000_vty.c</span><br><span>+++ b/src/osmo-bsc/abis_om2000_vty.c</span><br><span>@@ -255,6 +255,34 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(om2k_arb, om2k_arb_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "arbitrary <0-65535> [HEXSTRING]",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Send arbitrary OM2k message\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Command identifier\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Hex Encoded payload\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct oml_node_state *oms = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t buf[128];</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ int cmd = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (argc >= 2) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_hexparse(argv[1], buf, sizeof(buf));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0 || rc > sizeof(buf)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "Error parsing HEXSTRING%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = 0;</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%);">+ abis_om2k_tx_arb(oms->bts, &oms->mo, cmd, buf, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct con_group *con_group_find_or_create(struct gsm_bts *bts, uint8_t cg)</span><br><span> {</span><br><span> struct con_group *ent;</span><br><span>@@ -595,6 +623,7 @@</span><br><span> install_element(OM2K_NODE, &om2k_test_cmd);</span><br><span> install_element(OM2K_NODE, &om2k_cap_req_cmd);</span><br><span> install_element(OM2K_NODE, &om2k_conf_req_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(OM2K_NODE, &om2k_arb_cmd);</span><br><span> </span><br><span> install_node(&om2k_con_group_node, dummy_config_write);</span><br><span> install_element(OM2K_CON_GROUP_NODE, &cfg_om2k_con_path_dec_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/17962">change 17962</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-bsc/+/17962"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I5a385614fc670946f83ea79cc176c2d448675672 </div>
<div style="display:none"> Gerrit-Change-Number: 17962 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>