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

ss: Fix return value checks for net_*_open 

In ss.c, generic_proc_open(), for which the net_*_open functions are just
convenient wrappers, uses fopen, so errors are signalled by a NULL return
value. Some checks were expecting negative values instead, fix them.

Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
This commit is contained in:
Björn Steinbrink 2008-04-03 11:42:41 +02:00 committed by Stephen Hemminger
parent 5344bb287c
commit 69cae645b2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
misc/ss.c
View File

@ -1641,7 +1641,7 @@ static int tcp_show(struct filter *f, int socktype)
} }
if (f->families & (1<<AF_INET)) { if (f->families & (1<<AF_INET)) {
if ((fp = net_tcp_open()) < 0) if ((fp = net_tcp_open()) == NULL)
goto outerr; goto outerr;
setbuffer(fp, buf, bufsize); setbuffer(fp, buf, bufsize);
@ -1651,7 +1651,7 @@ static int tcp_show(struct filter *f, int socktype)
} }
if ((f->families & (1<<AF_INET6)) && if ((f->families & (1<<AF_INET6)) &&
(fp = net_tcp6_open()) >= 0) { (fp = net_tcp6_open()) != NULL) {
setbuffer(fp, buf, bufsize); setbuffer(fp, buf, bufsize);
if (generic_record_read(fp, tcp_show_line, f, AF_INET6)) if (generic_record_read(fp, tcp_show_line, f, AF_INET6))
goto outerr; goto outerr;
@ -1773,7 +1773,7 @@ int udp_show(struct filter *f)
dg_proto = UDP_PROTO; dg_proto = UDP_PROTO;
if (f->families&(1<<AF_INET)) { if (f->families&(1<<AF_INET)) {
if ((fp = net_udp_open()) < 0) if ((fp = net_udp_open()) == NULL)
goto outerr; goto outerr;
if (generic_record_read(fp, dgram_show_line, f, AF_INET)) if (generic_record_read(fp, dgram_show_line, f, AF_INET))
goto outerr; goto outerr;
@ -1781,7 +1781,7 @@ int udp_show(struct filter *f)
} }
if ((f->families&(1<<AF_INET6)) && if ((f->families&(1<<AF_INET6)) &&
(fp = net_udp6_open()) >= 0) { (fp = net_udp6_open()) != NULL) {
if (generic_record_read(fp, dgram_show_line, f, AF_INET6)) if (generic_record_read(fp, dgram_show_line, f, AF_INET6))
goto outerr; goto outerr;
fclose(fp); fclose(fp);
@ -1805,7 +1805,7 @@ int raw_show(struct filter *f)
dg_proto = RAW_PROTO; dg_proto = RAW_PROTO;
if (f->families&(1<<AF_INET)) { if (f->families&(1<<AF_INET)) {
if ((fp = net_raw_open()) < 0) if ((fp = net_raw_open()) == NULL)
goto outerr; goto outerr;
if (generic_record_read(fp, dgram_show_line, f, AF_INET)) if (generic_record_read(fp, dgram_show_line, f, AF_INET))
goto outerr; goto outerr;
@ -1813,7 +1813,7 @@ int raw_show(struct filter *f)
} }
if ((f->families&(1<<AF_INET6)) && if ((f->families&(1<<AF_INET6)) &&
(fp = net_raw6_open()) >= 0) { (fp = net_raw6_open()) != NULL) {
if (generic_record_read(fp, dgram_show_line, f, AF_INET6)) if (generic_record_read(fp, dgram_show_line, f, AF_INET6))
goto outerr; goto outerr;
fclose(fp); fclose(fp);