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

tc: fix batch force option 

When sending accumulated compound command results an error, check 'force'
option before exiting. Move return code check after putting batch bufs and
freeing iovs to prevent memory leak. Break from loop, instead of returning
error code to allow cleanup at the end of batch function. Don't reset ret
code on each iteration.

Fixes: 485d0c6001 ("tc: Add batchsize feature for filter and actions")
Reviewed-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Chris Mi <chrism@mellanox.com>
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Vlad Buslov 2018-06-20 10:24:21 +03:00 committed by Stephen Hemminger
parent 46c16a5d1e
commit b133392468
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tc/tc.c
View File

@ -331,6 +331,7 @@ static int batch(const char *name)
int batchsize = 0; int batchsize = 0;
size_t len = 0; size_t len = 0;
int ret = 0; int ret = 0;
int err;
bool send; bool send;
batch_mode = 1; batch_mode = 1;
@ -399,9 +400,9 @@ static int batch(const char *name)
continue; /* blank line */ continue; /* blank line */
} }
ret = do_cmd(largc, largv, tail == NULL ? NULL : tail->buf, err = do_cmd(largc, largv, tail == NULL ? NULL : tail->buf,
tail == NULL ? 0 : sizeof(tail->buf)); tail == NULL ? 0 : sizeof(tail->buf));
if (ret != 0) { if (err != 0) {
fprintf(stderr, "Command failed %s:%d\n", name, fprintf(stderr, "Command failed %s:%d\n", name,
cmdlineno - 1); cmdlineno - 1);
ret = 1; ret = 1;
@ -423,15 +424,17 @@ static int batch(const char *name)
iov->iov_len = n->nlmsg_len; iov->iov_len = n->nlmsg_len;
} }
ret = rtnl_talk_iov(&rth, iovs, batchsize, NULL); err = rtnl_talk_iov(&rth, iovs, batchsize, NULL);
if (ret < 0) {
fprintf(stderr, "Command failed %s:%d\n", name,
cmdlineno - (batchsize + ret) - 1);
return 2;
}
put_batch_bufs(&buf_pool, &head, &tail); put_batch_bufs(&buf_pool, &head, &tail);
batchsize = 0;
free(iovs); free(iovs);
if (err < 0) {
fprintf(stderr, "Command failed %s:%d\n", name,
cmdlineno - (batchsize + err) - 1);
ret = 1;
if (!force)
break;
}
batchsize = 0;
} }
} while (!lastline); } while (!lastline);