matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use parse_rtattr_nested 

(Logical change 1.129)
This commit is contained in:
8!tgraf 2005-01-18 22:11:58 +00:00
parent 2af5c3d344
commit ac2fc2df5e
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tc/f_u32.c
View File

@ -956,9 +956,7 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, __
if (opt == NULL) if (opt == NULL)
return 0; return 0;
memset(tb, 0, sizeof(tb)); parse_rtattr_nested(tb, TCA_U32_MAX, opt);
if (opt)
parse_rtattr(tb, TCA_U32_MAX, RTA_DATA(opt), RTA_PAYLOAD(opt));
if (handle) { if (handle) {
SPRINT_BUF(b1); SPRINT_BUF(b1);

7
tc/m_action.c
View File

@ -229,8 +229,7 @@ tc_print_one_action(FILE * f, struct rtattr *arg)
if (arg == NULL) if (arg == NULL)
return -1; return -1;
memset(tb, 0, sizeof (tb)); parse_rtattr_nested(tb, TCA_ACT_MAX, arg);
parse_rtattr(tb, TCA_ACT_MAX, RTA_DATA(arg), RTA_PAYLOAD(arg));
if (tb[TCA_ACT_KIND] == NULL) { if (tb[TCA_ACT_KIND] == NULL) {
fprintf(stderr, "NULL Action!\n"); fprintf(stderr, "NULL Action!\n");
return -1; return -1;
@ -272,8 +271,7 @@ tc_print_action(FILE * f, const struct rtattr *arg)
if (arg == NULL) if (arg == NULL)
return 0; return 0;
memset(tb, 0, sizeof (tb)); parse_rtattr_nested(tb, TCA_ACT_MAX_PRIO, arg);
parse_rtattr(tb, TCA_ACT_MAX_PRIO, RTA_DATA(arg), RTA_PAYLOAD(arg));
if (tab_flush && NULL != tb[0] && NULL == tb[1]) { if (tab_flush && NULL != tb[0] && NULL == tb[1]) {
int ret = tc_print_one_action(f, tb[0]); int ret = tc_print_one_action(f, tb[0]);
@ -310,7 +308,6 @@ static int do_print_action(const struct sockaddr_nl *who,
return -1; return -1;
} }
memset(tb, 0, sizeof(tb));
parse_rtattr(tb, TCAA_MAX, TA_RTA(t), len); parse_rtattr(tb, TCAA_MAX, TA_RTA(t), len);
if (NULL == tb[TCA_ACT_TAB]) { if (NULL == tb[TCA_ACT_TAB]) {

3
tc/q_hfsc.c
View File

@ -239,8 +239,7 @@ hfsc_print_class_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
if (opt == NULL) if (opt == NULL)
return 0; return 0;
memset(tb, 0, sizeof(tb)); parse_rtattr_nested(tb, TCA_HFSC_MAX, opt);
parse_rtattr(tb, TCA_HFSC_MAX, RTA_DATA(opt), RTA_PAYLOAD(opt));
if (tb[TCA_HFSC_RSC]) { if (tb[TCA_HFSC_RSC]) {
if (RTA_PAYLOAD(tb[TCA_HFSC_RSC]) < sizeof(*rsc)) if (RTA_PAYLOAD(tb[TCA_HFSC_RSC]) < sizeof(*rsc))