diff --git a/server/etc/example.conf b/server/etc/example.conf index 86c563ccd..e80e592c6 100644 --- a/server/etc/example.conf +++ b/server/etc/example.conf @@ -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) diff --git a/server/include/tc.h b/server/include/tc.h index b987fd8e1..b5eefb824 100644 --- a/server/include/tc.h +++ b/server/include/tc.h @@ -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) */ diff --git a/server/src/cfg.c b/server/src/cfg.c index c5c712085..bfd0d9961 100644 --- a/server/src/cfg.c +++ b/server/src/cfg.c @@ -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)) diff --git a/server/src/tc.c b/server/src/tc.c index cec7696ff..a5210305b 100644 --- a/server/src/tc.c +++ b/server/src/tc.c @@ -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);