Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-16 00:00:02 +01:00
Code Issues Releases Wiki Activity

removed useless limit netem option

Browse source 
(does not what it should do, bug in manpage)

git-svn-id: https://zerberus.eonerc.rwth-aachen.de:8443/svn/s2ss/trunk@124 8ec27952-4edc-4aab-86aa-e87bb2611832
This commit is contained in:
Steffen Vogel 2014-07-04 09:44:08 +00:00
parent a455c74188
commit 68eacb790a
4 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server/etc/example.conf
View file

@ -20,7 +20,6 @@ nodes = {
# Network emulation for single nodes
netem = {
limit = 99999, # Limit network emulation to a certain amount of packets
delay = 100000, # Additional latency in uS
jitter = 30000, # Jitter in uS
distribution = "normal",# Distribution of delay (uniform, normal, pareto, paretonormal)

15
server/include/tc.h
View file

@ -32,13 +32,12 @@ typedef uint32_t tc_hdl_t;
#define TC_HDL_ROOT (0xFFFFFFFFU)
/* Bitfield for valid fields in struct netem */
#define TC_NETEM_LIMIT (1 << 0) /**< netem::limit is valid @see netem::valid */
#define TC_NETEM_DELAY (1 << 1) /**< netem::delay is valid @see netem::valid */
#define TC_NETEM_JITTER (1 << 2) /**< netem::jitter is valid @see netem::valid */
#define TC_NETEM_DISTR (1 << 3) /**< netem::distribution is valid @see netem::valid */
#define TC_NETEM_LOSS (1 << 4) /**< netem::loss is valid @see netem::valid */
#define TC_NETEM_CORRUPT (1 << 5) /**< netem::corrupt is valid @see netem::valid */
#define TC_NETEM_DUPL (1 << 6) /**< netem::duplicate is valid @see netem::valid */
#define TC_NETEM_DELAY (1 << 0) /**< netem::delay is valid @see netem::valid */
#define TC_NETEM_JITTER (1 << 1) /**< netem::jitter is valid @see netem::valid */
#define TC_NETEM_DISTR (1 << 2) /**< netem::distribution is valid @see netem::valid */
#define TC_NETEM_LOSS (1 << 3) /**< netem::loss is valid @see netem::valid */
#define TC_NETEM_CORRUPT (1 << 4) /**< netem::corrupt is valid @see netem::valid */
#define TC_NETEM_DUPL (1 << 5) /**< netem::duplicate is valid @see netem::valid */
struct interface;
@ -53,8 +52,6 @@ struct netem {
/** Delay distribution: uniform, normal, pareto, paretonormal */
const char *distribution;
/** Fifo limit (packets) */
int limit;
/** Added delay (uS) */
int delay;
/** Delay jitter (uS) */

2
server/src/cfg.c
View file

@ -218,8 +218,6 @@ int config_parse_netem(config_setting_t *cfg, struct netem *em)
if (config_setting_lookup_string(cfg, "distribution", &em->distribution))
em->valid |= TC_NETEM_DISTR;
if (config_setting_lookup_int(cfg, "limit", &em->limit))
em->valid |= TC_NETEM_LIMIT;
if (config_setting_lookup_int(cfg, "delay", &em->delay))
em->valid |= TC_NETEM_DELAY;
if (config_setting_lookup_int(cfg, "jitter", &em->jitter))

2
server/src/tc.c
View file

@ -48,8 +48,6 @@ int tc_netem(struct interface *i, tc_hdl_t parent, struct netem *em)
"tc qdisc add dev %s parent %u:%u netem",
i->name, TC_HDL_MAJ(parent), TC_HDL_MIN(parent));
if (em->valid & TC_NETEM_LIMIT)
len += snprintf(cmd+len, sizeof(cmd)-len, " limit %u", em->limit);
if (em->valid & TC_NETEM_DELAY) {
len += snprintf(cmd+len, sizeof(cmd)-len, " delay %u", em->delay);