Support was recently added for device filters. The intent was to allow
the device to be specified by name or index, and using the if%u format
(dev == if5) or the simpler and more intuitive index alone (dev == 5).
The latter case is broken since the index is not saved to the filter
after the strtoul conversion. Further, the tmp variable used for the
conversion shadows another variable used in the function. Fix both.
With this change all 3 variants work as expected:
$ ss -t 'dev == 62'
State Recv-Q Send-Q Local Address:Port Peer Address:Port
ESTAB 0 224 10.0.1.3%mgmt:ssh 192.168.0.50:58442
$ ss -t 'dev == mgmt'
State Recv-Q Send-Q Local Address:Port Peer Address:Port
ESTAB 0 224 10.0.1.3%mgmt:ssh 192.168.0.50:58442
$ ss -t 'dev == if62'
State Recv-Q Send-Q Local Address:Port Peer Address:Port
ESTAB 0 36 10.0.1.3%mgmt:ssh 192.168.0.50:58442
Fixes: 2d2932125616 ("ss: Add support to filter on device")
Signed-off-by: David Ahern <redacted>
---
misc/ss.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/misc/ss.c b/misc/ss.c
index a0f9c6b9623c..abece96c0946 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -1435,11 +1435,13 @@ void *parse_devcond(char *name)
a.iface = xll_name_to_index(name);
if (a.iface == 0) {
char *end;
- unsigned long res;
+ unsigned long n;
- res = strtoul(name, &end, 0);
- if (!end || end == name || *end || res > UINT_MAX)
+ n = strtoul(name, &end, 0);
+ if (!end || end == name || *end || n > UINT_MAX)
return NULL;
+
+ a.iface = n;
}
res = malloc(sizeof(*res));--
2.1.4
On Fri, 15 Jul 2016 09:29:28 -0700
David Ahern [off-list ref] wrote:
Support was recently added for device filters. The intent was to allow
the device to be specified by name or index, and using the if%u format
(dev == if5) or the simpler and more intuitive index alone (dev == 5).
The latter case is broken since the index is not saved to the filter
after the strtoul conversion. Further, the tmp variable used for the
conversion shadows another variable used in the function. Fix both.
With this change all 3 variants work as expected:
$ ss -t 'dev == 62'
State Recv-Q Send-Q Local Address:Port Peer Address:Port
ESTAB 0 224 10.0.1.3%mgmt:ssh 192.168.0.50:58442
$ ss -t 'dev == mgmt'
State Recv-Q Send-Q Local Address:Port Peer Address:Port
ESTAB 0 224 10.0.1.3%mgmt:ssh 192.168.0.50:58442
$ ss -t 'dev == if62'
State Recv-Q Send-Q Local Address:Port Peer Address:Port
ESTAB 0 36 10.0.1.3%mgmt:ssh 192.168.0.50:58442
Fixes: 2d2932125616 ("ss: Add support to filter on device")
Signed-off-by: David Ahern <redacted>
Won't apply to current code.
Please rebase.
On 7/15/16 12:53 PM, Stephen Hemminger wrote:
On Fri, 15 Jul 2016 09:29:28 -0700
David Ahern [off-list ref] wrote:
quoted
Support was recently added for device filters. The intent was to allow
the device to be specified by name or index, and using the if%u format
(dev == if5) or the simpler and more intuitive index alone (dev == 5).
The latter case is broken since the index is not saved to the filter
after the strtoul conversion. Further, the tmp variable used for the
conversion shadows another variable used in the function. Fix both.
With this change all 3 variants work as expected:
$ ss -t 'dev == 62'
State Recv-Q Send-Q Local Address:Port Peer Address:Port
ESTAB 0 224 10.0.1.3%mgmt:ssh 192.168.0.50:58442
$ ss -t 'dev == mgmt'
State Recv-Q Send-Q Local Address:Port Peer Address:Port
ESTAB 0 224 10.0.1.3%mgmt:ssh 192.168.0.50:58442
$ ss -t 'dev == if62'
State Recv-Q Send-Q Local Address:Port Peer Address:Port
ESTAB 0 36 10.0.1.3%mgmt:ssh 192.168.0.50:58442
Fixes: 2d2932125616 ("ss: Add support to filter on device")
Signed-off-by: David Ahern <redacted>
Won't apply to current code.
Please rebase.
It applies cleanly for me to master branch. That's where the ss dev
filter is from June:
commit 2d29321256168e13e10fbde3c57f33e70dcb6cc8
Author: David Ahern [off-list ref]
Date: Mon Jun 27 11:34:25 2016 -0700
ss: Add support to filter on device
No commits on that file since except
62000e51e05d635016bae9891a4e00134ed8aefb which does not impact the
function in question.