<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22572">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets<br><br>Change-Id: If57bfdeb390d88d1ea058f7a9ce0403e64a5beda<br>---<br>M utils/osmo-ns-dummy-vty.c<br>M utils/osmo-ns-dummy.c<br>2 files changed, 43 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/22572/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/utils/osmo-ns-dummy-vty.c b/utils/osmo-ns-dummy-vty.c</span><br><span>index 1b7ce1c..f4a270c 100644</span><br><span>--- a/utils/osmo-ns-dummy-vty.c</span><br><span>+++ b/utils/osmo-ns-dummy-vty.c</span><br><span>@@ -46,8 +46,9 @@</span><br><span> #include <osmocom/vty/stats.h></span><br><span> #include <osmocom/vty/misc.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct gprs_ns2_inst *g_nsi;</span><br><span style="color: hsl(120, 100%, 40%);">+extern struct gprs_ns2_inst *g_nsi;</span><br><span> static struct llist_head g_ns_traf_gens = LLIST_HEAD_INIT(g_ns_traf_gens);</span><br><span style="color: hsl(120, 100%, 40%);">+int g_mirror_mode;</span><br><span> </span><br><span> /* one NS traffic generator instance. You can have as many of these as you want,</span><br><span> * just as long as they have unique names */</span><br><span>@@ -167,6 +168,7 @@</span><br><span> vty_out(vty, " lsp %u%s", ntg->cfg.lsp, VTY_NEWLINE);</span><br><span> vty_out(vty, " lsp-mode %s%s", ntg->cfg.lsp_randomize ? "randomized" : "fixed", VTY_NEWLINE);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "mirror-mode %s%s", g_mirror_mode ? "enable" : "disable", VTY_NEWLINE);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -288,12 +290,26 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int nsdummy_vty_init(struct gprs_ns2_inst *nsi)</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(mirror_mode, mirror_mode_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "mirror-mode (enable|disable)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Configure mirroring of incoming NS-UNITDATA\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Enable mirroring of incoming NS-UNITDATA\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Disable mirroring of incoming NS-UNITDATA\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsi = nsi;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(argv[0], "enable"))</span><br><span style="color: hsl(120, 100%, 40%);">+ g_mirror_mode = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ g_mirror_mode = false;</span><br><span> </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%);">+int nsdummy_vty_init(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> /* configuration of traffic generators via CONFIG / NTG node */</span><br><span> install_element(CONFIG_NODE, &gen_traffic_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(CONFIG_NODE, &mirror_mode_cmd);</span><br><span> install_node(&ntg_node, config_write_ntg);</span><br><span> install_element(NTG_NODE, &ntg_nsei_cmd);</span><br><span> install_element(NTG_NODE, &ntg_bvci_cmd);</span><br><span>diff --git a/utils/osmo-ns-dummy.c b/utils/osmo-ns-dummy.c</span><br><span>index 4b93788..3520145 100644</span><br><span>--- a/utils/osmo-ns-dummy.c</span><br><span>+++ b/utils/osmo-ns-dummy.c</span><br><span>@@ -28,6 +28,7 @@</span><br><span> static bool daemonize = false;</span><br><span> static int vty_port = 0;</span><br><span> static char *config_file = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+struct gprs_ns2_inst *g_nsi;</span><br><span> </span><br><span> static const char vty_copyright[] =</span><br><span> "Copyright (C) 2020 by by sysmocom - s.f.m.c. GmbH\r\n"</span><br><span>@@ -185,9 +186,27 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+extern int g_mirror_mode;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* called by the ns layer */</span><br><span> int gprs_ns_prim_cb(struct osmo_prim_hdr *oph, void *ctx)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gprs_ns2_prim *nsp = container_of(oph, struct osmo_gprs_ns2_prim, oph);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (oph->primitive) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_PRIM_UNIT_DATA:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_mirror_mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* simply switch indication->request and resubmit */</span><br><span style="color: hsl(120, 100%, 40%);">+ oph->operation = PRIM_OP_REQUEST;</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_pull_to_l3(oph->msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ nsp->u.unitdata.link_selector = rand(); /* ensure random distribution */</span><br><span style="color: hsl(120, 100%, 40%);">+ return gprs_ns2_recv_prim(g_nsi, oph);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (oph->msg)</span><br><span> msgb_free(oph->msg);</span><br><span> </span><br><span>@@ -204,7 +223,6 @@</span><br><span> int main (int argc, char *argv[])</span><br><span> {</span><br><span> void *ctx = tall_nsdummy_ctx = talloc_named_const(NULL, 0, "osmo-ns-dummy");</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns2_inst *nsi;</span><br><span> int rc = 0;</span><br><span> </span><br><span> osmo_init_logging2(ctx, &log_info);</span><br><span>@@ -224,14 +242,14 @@</span><br><span> </span><br><span> handle_options(argc, argv);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- nsi = gprs_ns2_instantiate(ctx, gprs_ns_prim_cb, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!nsi) {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsi = gprs_ns2_instantiate(ctx, gprs_ns_prim_cb, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!g_nsi) {</span><br><span> LOGP(DLNS, LOGL_ERROR, "Failed to create NS instance\n");</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns2_vty_init(nsi);</span><br><span style="color: hsl(0, 100%, 40%);">- nsdummy_vty_init(nsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_vty_init(g_nsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ nsdummy_vty_init(g_nsi);</span><br><span> rc = vty_read_config_file(config_file, NULL);</span><br><span> if (rc < 0 && config_given) {</span><br><span> fprintf(stderr, "Failed to parse the config file: '%s'\n",</span><br><span>@@ -270,7 +288,7 @@</span><br><span> }</span><br><span> </span><br><span> telnet_exit();</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns2_free(nsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_free(g_nsi);</span><br><span> </span><br><span> talloc_report_full(tall_nsdummy_ctx, stderr);</span><br><span> talloc_free(tall_nsdummy_ctx);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22572">change 22572</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/libosmocore/+/22572"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If57bfdeb390d88d1ea058f7a9ce0403e64a5beda </div>
<div style="display:none"> Gerrit-Change-Number: 22572 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>