<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-abis/+/23958">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">e1_input: Allow (vty) configuration of IP DSCP and socket priority<br><br>Change-Id: I8991dd6eb406a5b9a70498974fc1ad339452f871<br>Related: SYS#5427<br>---<br>M include/internal.h<br>M src/e1_input_vty.c<br>M src/input/ipaccess.c<br>3 files changed, 69 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/internal.h b/include/internal.h</span><br><span>index aeca02f..0ee2dcb 100644</span><br><span>--- a/include/internal.h</span><br><span>+++ b/include/internal.h</span><br><span>@@ -10,6 +10,19 @@</span><br><span> struct e1inp_sign_link;</span><br><span> struct e1inp_ts;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct ipa_proto_pars {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t dscp;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t priority;</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%);">+struct ipa_pars {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ipa_proto_pars oml;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ipa_proto_pars rsl;</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%);">+/* global parameters of IPA input driver */</span><br><span style="color: hsl(120, 100%, 40%);">+extern struct ipa_pars g_e1inp_ipaccess_pars;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* talloc context for libosmo-abis. */</span><br><span> extern void *libosmo_abis_ctx;</span><br><span> </span><br><span>diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c</span><br><span>index 64f5f63..c392a3b 100644</span><br><span>--- a/src/e1_input_vty.c</span><br><span>+++ b/src/e1_input_vty.c</span><br><span>@@ -1,5 +1,5 @@</span><br><span> /* E1 vty interface */</span><br><span style="color: hsl(0, 100%, 40%);">-/* (C) 2011 by Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(120, 100%, 40%);">+/* (C) 2011-2021 by Harald Welte <laforge@gnumonks.org></span><br><span> * All Rights Reserved</span><br><span> *</span><br><span> * SPDX-License-Identifier: AGPL-3.0+</span><br><span>@@ -327,6 +327,38 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_ipa_dscp, cfg_ipa_dscp_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(OSMO_ABIS_LIB_ATTR_IPA_NEW_LNK),</span><br><span style="color: hsl(120, 100%, 40%);">+ "ipa ip-dscp (oml|rsl) <0-63>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "ipa driver config\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set IP DSCP value for outbound packets\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set IP DSCP for OML link\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set IP DSCP for RSL link\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "IP DSCP Value to use\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(argv[0], "oml"))</span><br><span style="color: hsl(120, 100%, 40%);">+ g_e1inp_ipaccess_pars.oml.dscp = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ g_e1inp_ipaccess_pars.rsl.dscp = atoi(argv[1]);</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%);">+DEFUN_USRATTR(cfg_ipa_priority, cfg_ipa_priority_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(OSMO_ABIS_LIB_ATTR_IPA_NEW_LNK),</span><br><span style="color: hsl(120, 100%, 40%);">+ "ipa socket-priority (oml|rsl) <0-255>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "ipa driver config\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set socket priority value for outbound packets\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set socket priority for OML link\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set socket priority for RSL link\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "socket priority value to use (>6 requires CAP_NET_ADMIN)\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(argv[0], "oml"))</span><br><span style="color: hsl(120, 100%, 40%);">+ g_e1inp_ipaccess_pars.oml.priority = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ g_e1inp_ipaccess_pars.rsl.priority = atoi(argv[1]);</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> static int e1inp_config_write(struct vty *vty)</span><br><span> {</span><br><span> struct e1inp_line *line;</span><br><span>@@ -373,6 +405,15 @@</span><br><span> vty_out(vty, " ipa bind %s%s",</span><br><span> ipa_bind, VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_e1inp_ipaccess_pars.oml.dscp)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " ipa ip-dscp oml %u%s", g_e1inp_ipaccess_pars.oml.dscp, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_e1inp_ipaccess_pars.rsl.dscp)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " ipa ip-dscp rsl %u%s", g_e1inp_ipaccess_pars.rsl.dscp, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_e1inp_ipaccess_pars.oml.priority)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " ipa socket-priority oml %u%s", g_e1inp_ipaccess_pars.oml.priority, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_e1inp_ipaccess_pars.rsl.priority)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " ipa socket-priority rsl %u%s", g_e1inp_ipaccess_pars.rsl.priority, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -532,6 +573,8 @@</span><br><span> install_lib_element(L_E1INP_NODE, &cfg_e1_line_no_ipa_keepalive_cmd);</span><br><span> </span><br><span> install_lib_element(L_E1INP_NODE, &cfg_ipa_bind_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_lib_element(L_E1INP_NODE, &cfg_ipa_dscp_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_lib_element(L_E1INP_NODE, &cfg_ipa_priority_cmd);</span><br><span> </span><br><span> install_lib_element_ve(&show_e1drv_cmd);</span><br><span> install_lib_element_ve(&show_e1line_cmd);</span><br><span>diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c</span><br><span>index be882a9..e876790 100644</span><br><span>--- a/src/input/ipaccess.c</span><br><span>+++ b/src/input/ipaccess.c</span><br><span>@@ -1,6 +1,6 @@</span><br><span> /* OpenBSC Abis input driver for ip.access */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* (C) 2009 by Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(120, 100%, 40%);">+/* (C) 2009-2021 by Harald Welte <laforge@gnumonks.org></span><br><span> * (C) 2010 by Holger Hans Peter Freyther</span><br><span> * (C) 2010 by On-Waves</span><br><span> *</span><br><span>@@ -51,6 +51,9 @@</span><br><span> #include <osmocom/core/backtrace.h></span><br><span> #include <osmocom/gsm/ipa.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* global parameters of IPA input driver */</span><br><span style="color: hsl(120, 100%, 40%);">+struct ipa_pars g_e1inp_ipaccess_pars;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void *tall_ipa_ctx;</span><br><span> </span><br><span> #define TS1_ALLOC_SIZE 900</span><br><span>@@ -1041,6 +1044,8 @@</span><br><span> "BSC link: %s\n", strerror(errno));</span><br><span> return -ENOMEM;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_link->dscp = g_e1inp_ipaccess_pars.oml.dscp;</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_link->priority = g_e1inp_ipaccess_pars.oml.priority;</span><br><span> if (ipa_server_link_open(oml_link) < 0) {</span><br><span> LOGP(DLINP, LOGL_ERROR, "cannot open OML BSC link: %s\n",</span><br><span> strerror(errno));</span><br><span>@@ -1055,6 +1060,8 @@</span><br><span> "BSC link: %s\n", strerror(errno));</span><br><span> return -ENOMEM;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_link->dscp = g_e1inp_ipaccess_pars.rsl.dscp;</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_link->priority = g_e1inp_ipaccess_pars.rsl.priority;</span><br><span> if (ipa_server_link_open(rsl_link) < 0) {</span><br><span> LOGP(DLINP, LOGL_ERROR, "cannot open RSL BSC link: %s\n",</span><br><span> strerror(errno));</span><br><span>@@ -1087,6 +1094,8 @@</span><br><span> "BTS link: %s\n", strerror(errno));</span><br><span> return -ENOMEM;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ link->dscp = g_e1inp_ipaccess_pars.oml.dscp;</span><br><span style="color: hsl(120, 100%, 40%);">+ link->priority = g_e1inp_ipaccess_pars.oml.priority;</span><br><span> if (ipa_client_conn_open(link) < 0) {</span><br><span> LOGP(DLINP, LOGL_ERROR, "cannot open OML BTS link: %s\n",</span><br><span> strerror(errno));</span><br><span>@@ -1141,6 +1150,8 @@</span><br><span> "BTS link: %s\n", strerror(errno));</span><br><span> return -ENOMEM;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_link->dscp = g_e1inp_ipaccess_pars.rsl.dscp;</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_link->priority = g_e1inp_ipaccess_pars.rsl.priority;</span><br><span> if (ipa_client_conn_open(rsl_link) < 0) {</span><br><span> LOGP(DLINP, LOGL_ERROR, "cannot open RSL BTS link: %s\n",</span><br><span> strerror(errno));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-abis/+/23958">change 23958</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/libosmo-abis/+/23958"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-abis </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8991dd6eb406a5b9a70498974fc1ad339452f871 </div>
<div style="display:none"> Gerrit-Change-Number: 23958 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>