osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

gprs_ns: Allow to set the DSCP for the UDP socket. 

Allow to tag the NS service with a custom DSCP.
This commit is contained in:
Holger Hans Peter Freyther 2013-03-25 11:59:58 +01:00
parent 1c83e36cc9
commit 2c3393d9e3
4 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/osmocom/gprs/gprs_ns.h
View File

@ -73,6 +73,7 @@ struct gprs_ns_inst {
struct osmo_fd fd;
uint32_t local_ip;
uint16_t local_port;
int dscp;
} nsip;
/*! \brief NS-over-FR-over-GRE-over-IP specific bits */
struct {

3
src/gb/Makefile.am
View File

@ -1,3 +1,6 @@
# FIXME: LIBVERSION adjustments required for next version
# ABI of gprs_ns structure changed by adding DSCP.
#
# This is _NOT_ the library release version, it's an API version.
# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
LIBVERSION=2:0:0

7
src/gb/gprs_ns.c
View File

@ -1051,6 +1051,13 @@ int gprs_ns_nsip_listen(struct gprs_ns_inst *nsi)
if (ret < 0)
return ret;
ret = setsockopt(nsi->nsip.fd.fd, IPPROTO_IP, IP_TOS,
&nsi->nsip.dscp, sizeof(nsi->nsip.dscp));
if (ret < 0)
LOGP(DNS, LOGL_ERROR,
"Failed to set the DSCP to %d with ret(%d) errno(%d)\n",
nsi->nsip.dscp, ret, errno);
return ret;
}

14
src/gb/gprs_ns_vty.c
View File

@ -131,6 +131,9 @@ static int config_write_ns(struct vty *vty)
if (vty_nsi->nsip.local_port)
vty_out(vty, " encapsulation udp local-port %u%s",
vty_nsi->nsip.local_port, VTY_NEWLINE);
if (vty_nsi->nsip.dscp)
vty_out(vty, " encapsulation udp dscp %d%s",
vty_nsi->nsip.dscp, VTY_NEWLINE);
vty_out(vty, " encapsulation framerelay-gre enabled %u%s",
vty_nsi->frgre.enabled ? 1 : 0, VTY_NEWLINE);
@ -454,6 +457,16 @@ DEFUN(cfg_nsip_local_port, cfg_nsip_local_port_cmd,
return CMD_SUCCESS;
}
DEFUN(cfg_nsip_dscp, cfg_nsip_dscp_cmd,
"encapsulation udp dscp <0-255>",
ENCAPS_STR "NS over UDP Encapsulation\n"
"Set DSCP/TOS on the UDP socket\n" "DSCP Value\n")
{
int dscp = atoi(argv[0]);
vty_nsi->nsip.dscp = dscp;
return CMD_SUCCESS;
}
DEFUN(cfg_frgre_local_ip, cfg_frgre_local_ip_cmd,
"encapsulation framerelay-gre local-ip A.B.C.D",
ENCAPS_STR "NS over Frame Relay over GRE Encapsulation\n"
@ -572,6 +585,7 @@ int gprs_ns_vty_init(struct gprs_ns_inst *nsi)
install_element(L_NS_NODE, &cfg_ns_timer_cmd);
install_element(L_NS_NODE, &cfg_nsip_local_ip_cmd);
install_element(L_NS_NODE, &cfg_nsip_local_port_cmd);
install_element(L_NS_NODE, &cfg_nsip_dscp_cmd);
install_element(L_NS_NODE, &cfg_frgre_enable_cmd);
install_element(L_NS_NODE, &cfg_frgre_local_ip_cmd);