fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 09:58:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh: fix parse of tc qdiscs and filters

Browse source 
Fixes: 902bbfdb18
This commit is contained in:
Beniamino Galvani 2018-04-16 16:45:28 +02:00
parent fa7af768a9
commit 805cbe7439
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -1999,11 +1999,15 @@ make_tc_setting (shvarFile *ifcfg)
break;
qdisc = nm_utils_tc_qdisc_from_str (value, &local);
if (!qdisc)
PARSE_WARNING ("ignoring bad qdisc: '%s': %s", value, local->message);
if (!qdisc) {
PARSE_WARNING ("ignoring bad tc qdisc: '%s': %s", value, local->message);
continue;
}
if (!nm_setting_tc_config_add_qdisc (s_tc, qdisc))
PARSE_WARNING ("duplicate qdisc");
PARSE_WARNING ("duplicate tc qdisc");
nm_tc_qdisc_unref (qdisc);
}
for (i = 1;; i++) {
@ -2017,11 +2021,15 @@ make_tc_setting (shvarFile *ifcfg)
break;
tfilter = nm_utils_tc_tfilter_from_str (value, &local);
if (!tfilter)
PARSE_WARNING ("ignoring bad tfilter: '%s': %s", value, local->message);
if (!tfilter) {
PARSE_WARNING ("ignoring bad tc filter: '%s': %s", value, local->message);
continue;
}
if (!nm_setting_tc_config_add_tfilter (s_tc, tfilter))
PARSE_WARNING ("duplicate filter");
PARSE_WARNING ("duplicate tc filter");
nm_tc_tfilter_unref (tfilter);
}
if ( nm_setting_tc_config_get_num_qdiscs (s_tc) > 0