Skip to contentSkip to conversation

tc/netem: fix loss state display and p14 parsing

PATCH Applied Jay Vosburgh 2 participants 2 messages May 9, 2014

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Jay Vosburgh

author
#0 lore raw

PATCH 1/1 tc/netem: fix loss state display and p14 parsing

The display of the entire netem loss state is shown as if it
were gemodel state, as the loss state information is assigned to the wrong pointer. Correct this by assigning the loss state to the correct pointer.

Additionally, attempting to set netem loss state will result in
random values in the p14 state probability because the option value passed to the kernel by tc netem is not parsed or initialized. Fix this by supplying a default value of 0 for p14 and parsing the p14 value if one is supplied.

Signed-off-by Jay Vosburgh <[email protected]>
---
 tc/q_netem.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
tc/q_netem.c +9 -1
index 946007c..c83e301 100644
@@ -263,6 +263,7 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv,
 				set_percent(&gimodel.p31, 1. - p13);
 				set_percent(&gimodel.p32, 0);
 				set_percent(&gimodel.p23, 1.);
+				set_percent(&gimodel.p14, 0);
 				loss_type = NETEM_LOSS_GI;
 
 				if (!NEXT_IS_NUMBER())

@@ -288,6 +289,13 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv,
 					explain1("loss p23");
 					return -1;
 				}
+				if (!NEXT_IS_NUMBER())
+					continue;
+				NEXT_ARG();
+				if (get_percent(&gimodel.p14, *argv)) {
+					explain1("loss p14");
+					return -1;
+				}
 
 			} else if (!strcmp(*argv, "gemodel")) {
 				NEXT_ARG();

@@ -569,7 +577,7 @@ static int netem_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
 
 			parse_rtattr_nested(lb, NETEM_LOSS_MAX, tb[TCA_NETEM_LOSS]);
 			if (lb[NETEM_LOSS_GI])
-				gemodel = RTA_DATA(lb[NETEM_LOSS_GI]);
+				gimodel = RTA_DATA(lb[NETEM_LOSS_GI]);
 			if (lb[NETEM_LOSS_GE])
 				gemodel = RTA_DATA(lb[NETEM_LOSS_GE]);
 		}
Signature · 1 line
1.8.3.2
Applied
#1 lore raw
Quoted 12 lines · On Thu, 08 May 2014 19:02:20 -0700 Jay Vosburgh <[email protected]>…

The display of the entire netem loss state is shown as if it
were gemodel state, as the loss state information is assigned to the wrong pointer. Correct this by assigning the loss state to the correct pointer.

Additionally, attempting to set netem loss state will result in
random values in the p14 state probability because the option value passed to the kernel by tc netem is not parsed or initialized. Fix this by supplying a default value of 0 for p14 and parsing the p14 value if one is supplied.

Quoted 5 lines
Signed-off-by Jay Vosburgh <[email protected]>
---
 tc/q_netem.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Applied