ip{,6}tunnel: have a shared stats parser/printer
Subsystems (2)
PATCH 1/1 ip{,6}tunnel: have a shared stats parser/printer
This has a slight side-effect of not aborting when /proc/net/dev is malformed, but OTOH stats are not parsed for uninteresting interfaces.
--- ip/ip6tunnel.c | 21 ++------------------- ip/iptunnel.c | 21 ++------------------- ip/tunnel.c | 28 ++++++++++++++++++++++++++++ ip/tunnel.h | 1 + 4 files changed, 33 insertions(+), 38 deletions(-)
ip/ip6tunnel.c +2 -19
@@ -341,10 +341,6 @@ static int do_tunnels_list(struct ip6_tnl_parm2 *p)while (fgets (buf,sizeof (buf), fp) !=NULL ) {char name[IFNAMSIZ ];int index, type; -unsigned long rx_bytes, rx_packets, rx_errs, rx_drops, - rx_fifo, rx_frame, - tx_bytes, tx_packets, tx_errs, tx_drops, - tx_fifo, tx_colls, tx_carrier, rx_multi;struct ip6_tnl_parm2 p1;char *ptr;
@@ -354,12 +350,6 @@ static int do_tunnels_list(struct ip6_tnl_parm2 *p)fprintf (stderr,"Wrong format for /proc/net/dev. Giving up.\n" ); goto end; } -if (sscanf (ptr,"%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu" , - &rx_bytes, &rx_packets, &rx_errs, &rx_drops, - &rx_fifo, &rx_frame, &rx_multi, - &tx_bytes, &tx_packets, &tx_errs, &tx_drops, - &tx_fifo, &tx_colls, &tx_carrier) !=14 ) -continue ;if (p->name[0 ] &&strcmp (p->name, name))continue ; index =ll_name_to_index (name);
@@ -385,15 +375,8 @@ static int do_tunnels_list(struct ip6_tnl_parm2 *p)if (!ip6_tnl_parm_match (p, &p1))continue ;print_tunnel (&p1); -if (show_stats) { -printf ("%s" , _SL_); -printf ("RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts%s" , _SL_); -printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-8ld%s" , - rx_packets, rx_bytes, rx_errs, rx_frame, rx_fifo, rx_multi, _SL_); -printf ("TX: Packets Bytes Errors DeadLoop NoRoute NoBufs%s" , _SL_); -printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-6ld" , - tx_packets, tx_bytes, tx_errs, tx_colls, tx_carrier, tx_drops); - } +if (show_stats) +tnl_print_stats (ptr);printf ("\n" ); } err =0 ;
ip/iptunnel.c +2 -19
@@ -405,10 +405,6 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)while (fgets (buf,sizeof (buf), fp) !=NULL ) {char name[IFNAMSIZ ];int index, type; -unsigned long rx_bytes, rx_packets, rx_errs, rx_drops, - rx_fifo, rx_frame, - tx_bytes, tx_packets, tx_errs, tx_drops, - tx_fifo, tx_colls, tx_carrier, rx_multi;struct ip_tunnel_parm p1;char *ptr;
@@ -419,12 +415,6 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)fprintf (stderr,"Wrong format for /proc/net/dev. Giving up.\n" ); goto end; } -if (sscanf (ptr,"%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu" , - &rx_bytes, &rx_packets, &rx_errs, &rx_drops, - &rx_fifo, &rx_frame, &rx_multi, - &tx_bytes, &tx_packets, &tx_errs, &tx_drops, - &tx_fifo, &tx_colls, &tx_carrier) !=14 ) -continue ;if (p->name[0 ] &&strcmp (p->name, name))continue ; index =ll_name_to_index (name);
@@ -447,15 +437,8 @@ static int do_tunnels_list(struct ip_tunnel_parm *p) (p->i_key && p1.i_key != p->i_key))continue ;print_tunnel (&p1); -if (show_stats) { -printf ("%s" , _SL_); -printf ("RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts%s" , _SL_); -printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-8ld%s" , - rx_packets, rx_bytes, rx_errs, rx_frame, rx_fifo, rx_multi, _SL_); -printf ("TX: Packets Bytes Errors DeadLoop NoRoute NoBufs%s" , _SL_); -printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-6ld" , - tx_packets, tx_bytes, tx_errs, tx_colls, tx_carrier, tx_drops); - } +if (show_stats) +tnl_print_stats (ptr);printf ("\n" ); } err =0 ;
ip/tunnel.c +28 -0
@@ -195,3 +195,31 @@ __be32 tnl_parse_key(const char *name, const char *key) }return htonl (uval); } + +/* tnl_print_stats - print tunnel statistics +* +* @buf - tunnel interface's line in /proc/net/dev, +* starting past the interface name and following colon +*/ +void tnl_print_stats (const char *buf) +{ +unsigned long rx_bytes, rx_packets, rx_errs, rx_drops, + rx_fifo, rx_frame, + tx_bytes, tx_packets, tx_errs, tx_drops, + tx_fifo, tx_colls, tx_carrier, rx_multi; + +if (sscanf (ptr,"%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu" , + &rx_bytes, &rx_packets, &rx_errs, &rx_drops, + &rx_fifo, &rx_frame, &rx_multi, + &tx_bytes, &tx_packets, &tx_errs, &tx_drops, + &tx_fifo, &tx_colls, &tx_carrier) !=14 ) +return ; + +printf ("%s" , _SL_); +printf ("RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts%s" , _SL_); +printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-8ld%s" , + rx_packets, rx_bytes, rx_errs, rx_frame, rx_fifo, rx_multi, _SL_); +printf ("TX: Packets Bytes Errors DeadLoop NoRoute NoBufs%s" , _SL_); +printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-6ld" , + tx_packets, tx_bytes, tx_errs, tx_colls, tx_carrier, tx_drops); +}
ip/tunnel.h +1 -0
@@ -32,5 +32,6 @@ int tnl_prl_ioctl(int cmd, const char *name, void *p);int tnl_6rd_ioctl (int cmd,const char *name,void *p);int tnl_ioctl_get_6rd (const char *name,void *p);__be32 tnl_parse_key (const char *name,const char *key); +void tnl_print_stats (const char *buf);#endif
Signature · 1 line
2.6.4
Quoted 144 lines · On Fri, 11 Dec 2015 13:23:44 +0100 Phil Sutter <[email protected]> wrote:
This has a slight side-effect of not aborting when
/proc/net/devis malformed, but OTOH stats are not parsed for uninteresting interfaces.Signed-off-by Phil Sutter <[email protected]>--- ip/ip6tunnel.c | 21 ++------------------- ip/iptunnel.c | 21 ++------------------- ip/tunnel.c | 28 ++++++++++++++++++++++++++++ ip/tunnel.h | 1 + 4 files changed, 33 insertions(+), 38 deletions(-)ip/ip6tunnel.c +2
-19@@ -341,10 +341,6 @@ static int do_tunnels_list(struct ip6_tnl_parm2 *p)while (fgets (buf,sizeof (buf), fp) !=NULL ) {char name[IFNAMSIZ ];int index, type; -unsigned long rx_bytes, rx_packets, rx_errs, rx_drops, - rx_fifo, rx_frame, - tx_bytes, tx_packets, tx_errs, tx_drops, - tx_fifo, tx_colls, tx_carrier, rx_multi;struct ip6_tnl_parm2 p1;char *ptr;@@ -354,12 +350,6 @@ static int do_tunnels_list(struct ip6_tnl_parm2 *p)fprintf (stderr,"Wrong format for /proc/net/dev. Giving up.\n" ); goto end; } -if (sscanf (ptr,"%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu" , - &rx_bytes, &rx_packets, &rx_errs, &rx_drops, - &rx_fifo, &rx_frame, &rx_multi, - &tx_bytes, &tx_packets, &tx_errs, &tx_drops, - &tx_fifo, &tx_colls, &tx_carrier) !=14 ) -continue ;if (p->name[0 ] &&strcmp (p->name, name))continue ; index =ll_name_to_index (name);@@ -385,15 +375,8 @@ static int do_tunnels_list(struct ip6_tnl_parm2 *p)if (!ip6_tnl_parm_match (p, &p1))continue ;print_tunnel (&p1); -if (show_stats) { -printf ("%s" , _SL_); -printf ("RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts%s" , _SL_); -printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-8ld%s" , - rx_packets, rx_bytes, rx_errs, rx_frame, rx_fifo, rx_multi, _SL_); -printf ("TX: Packets Bytes Errors DeadLoop NoRoute NoBufs%s" , _SL_); -printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-6ld" , - tx_packets, tx_bytes, tx_errs, tx_colls, tx_carrier, tx_drops); - } +if (show_stats) +tnl_print_stats (ptr);printf ("\n" ); } err =0 ;ip/iptunnel.c +2
-19@@ -405,10 +405,6 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)while (fgets (buf,sizeof (buf), fp) !=NULL ) {char name[IFNAMSIZ ];int index, type; -unsigned long rx_bytes, rx_packets, rx_errs, rx_drops, - rx_fifo, rx_frame, - tx_bytes, tx_packets, tx_errs, tx_drops, - tx_fifo, tx_colls, tx_carrier, rx_multi;struct ip_tunnel_parm p1;char *ptr;@@ -419,12 +415,6 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)fprintf (stderr,"Wrong format for /proc/net/dev. Giving up.\n" ); goto end; } -if (sscanf (ptr,"%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu" , - &rx_bytes, &rx_packets, &rx_errs, &rx_drops, - &rx_fifo, &rx_frame, &rx_multi, - &tx_bytes, &tx_packets, &tx_errs, &tx_drops, - &tx_fifo, &tx_colls, &tx_carrier) !=14 ) -continue ;if (p->name[0 ] &&strcmp (p->name, name))continue ; index =ll_name_to_index (name);@@ -447,15 +437,8 @@ static int do_tunnels_list(struct ip_tunnel_parm *p) (p->i_key && p1.i_key != p->i_key))continue ;print_tunnel (&p1); -if (show_stats) { -printf ("%s" , _SL_); -printf ("RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts%s" , _SL_); -printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-8ld%s" , - rx_packets, rx_bytes, rx_errs, rx_frame, rx_fifo, rx_multi, _SL_); -printf ("TX: Packets Bytes Errors DeadLoop NoRoute NoBufs%s" , _SL_); -printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-6ld" , - tx_packets, tx_bytes, tx_errs, tx_colls, tx_carrier, tx_drops); - } +if (show_stats) +tnl_print_stats (ptr);printf ("\n" ); } err =0 ;ip/tunnel.c +28
-0@@ -195,3 +195,31 @@ __be32 tnl_parse_key(const char *name, const char *key) }return htonl (uval); } + +/* tnl_print_stats - print tunnel statistics +* +* @buf - tunnel interface's line in /proc/net/dev, +* starting past the interface name and following colon +*/ +void tnl_print_stats (const char *buf) +{ +unsigned long rx_bytes, rx_packets, rx_errs, rx_drops, + rx_fifo, rx_frame, + tx_bytes, tx_packets, tx_errs, tx_drops, + tx_fifo, tx_colls, tx_carrier, rx_multi; + +if (sscanf (ptr,"%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu" , + &rx_bytes, &rx_packets, &rx_errs, &rx_drops, + &rx_fifo, &rx_frame, &rx_multi, + &tx_bytes, &tx_packets, &tx_errs, &tx_drops, + &tx_fifo, &tx_colls, &tx_carrier) !=14 ) +return ; + +printf ("%s" , _SL_); +printf ("RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts%s" , _SL_); +printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-8ld%s" , + rx_packets, rx_bytes, rx_errs, rx_frame, rx_fifo, rx_multi, _SL_); +printf ("TX: Packets Bytes Errors DeadLoop NoRoute NoBufs%s" , _SL_); +printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-6ld" , + tx_packets, tx_bytes, tx_errs, tx_colls, tx_carrier, tx_drops); +}ip/tunnel.h +0
-0
ip/tunnel.h int tnl_prl_ioctl(int cmd, const char *name, void *p); · line 37
Quoted 6 lines
ip/tunnel.h +1
-0@@ -32,5 +32,6 @@ int tnl_prl_ioctl(int cmd, const char *name, void *p);int tnl_6rd_ioctl (int cmd,const char *name,void *p);int tnl_ioctl_get_6rd (const char *name,void *p);__be32 tnl_parse_key (const char *name,const char *key); +void tnl_print_stats (const char *buf);#endif
I just fixed the sscanf formats and after that this patch caused build error. tunnel.c: In function ‘tnl_print_stats’:
tunnel.c:211:13: error: ‘ptr’ undeclared (first use in this function)
if (sscanf(ptr, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu",
^
tunnel.c:211:13: note: each undeclared identifier is reported only once for each function it appears in <builtin>: recipe for target 'tunnel.o' failed
Quoted 7 lines · Stephen Hemminger
I just fixed the sscanf formats and after that this patch caused build error.
tunnel.c: In function ‘tnl_print_stats’:
tunnel.c:211:13: error: ‘ptr’ undeclared (first use in this function)
if (sscanf(ptr, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu",^tunnel.c:211:13: note: each undeclared identifier is reported only once for each function it appears in <builtin>: recipe for target 'tunnel.o' failed
Ah, sorry. I obviously messed up conflict resolution while rebasing this onto your master. Fixed version follows.
Thanks, Phil
PATCH v2 1/1 ip{,6}tunnel: have a shared stats parser/printer
This has a slight side-effect of not aborting when /proc/net/dev is malformed, but OTOH stats are not parsed for uninteresting interfaces.
---
Changes since v1:
- Fix conflict resolution (sscan from 'buf' instead of 'ptr').
--- ip/ip6tunnel.c | 21 ++------------------- ip/iptunnel.c | 21 ++------------------- ip/tunnel.c | 28 ++++++++++++++++++++++++++++ ip/tunnel.h | 1 + 4 files changed, 33 insertions(+), 38 deletions(-)
ip/ip6tunnel.c +2 -19
@@ -341,10 +341,6 @@ static int do_tunnels_list(struct ip6_tnl_parm2 *p)while (fgets (buf,sizeof (buf), fp) !=NULL ) {char name[IFNAMSIZ ];int index, type; -unsigned long rx_bytes, rx_packets, rx_errs, rx_drops, - rx_fifo, rx_frame, - tx_bytes, tx_packets, tx_errs, tx_drops, - tx_fifo, tx_colls, tx_carrier, rx_multi;struct ip6_tnl_parm2 p1;char *ptr;
@@ -354,12 +350,6 @@ static int do_tunnels_list(struct ip6_tnl_parm2 *p)fprintf (stderr,"Wrong format for /proc/net/dev. Giving up.\n" ); goto end; } -if (sscanf (ptr,"%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu" , - &rx_bytes, &rx_packets, &rx_errs, &rx_drops, - &rx_fifo, &rx_frame, &rx_multi, - &tx_bytes, &tx_packets, &tx_errs, &tx_drops, - &tx_fifo, &tx_colls, &tx_carrier) !=14 ) -continue ;if (p->name[0 ] &&strcmp (p->name, name))continue ; index =ll_name_to_index (name);
@@ -385,15 +375,8 @@ static int do_tunnels_list(struct ip6_tnl_parm2 *p)if (!ip6_tnl_parm_match (p, &p1))continue ;print_tunnel (&p1); -if (show_stats) { -printf ("%s" , _SL_); -printf ("RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts%s" , _SL_); -printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-8ld%s" , - rx_packets, rx_bytes, rx_errs, rx_frame, rx_fifo, rx_multi, _SL_); -printf ("TX: Packets Bytes Errors DeadLoop NoRoute NoBufs%s" , _SL_); -printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-6ld" , - tx_packets, tx_bytes, tx_errs, tx_colls, tx_carrier, tx_drops); - } +if (show_stats) +tnl_print_stats (ptr);printf ("\n" ); } err =0 ;
ip/iptunnel.c +2 -19
@@ -405,10 +405,6 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)while (fgets (buf,sizeof (buf), fp) !=NULL ) {char name[IFNAMSIZ ];int index, type; -unsigned long rx_bytes, rx_packets, rx_errs, rx_drops, - rx_fifo, rx_frame, - tx_bytes, tx_packets, tx_errs, tx_drops, - tx_fifo, tx_colls, tx_carrier, rx_multi;struct ip_tunnel_parm p1;char *ptr;
@@ -419,12 +415,6 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)fprintf (stderr,"Wrong format for /proc/net/dev. Giving up.\n" ); goto end; } -if (sscanf (ptr,"%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu" , - &rx_bytes, &rx_packets, &rx_errs, &rx_drops, - &rx_fifo, &rx_frame, &rx_multi, - &tx_bytes, &tx_packets, &tx_errs, &tx_drops, - &tx_fifo, &tx_colls, &tx_carrier) !=14 ) -continue ;if (p->name[0 ] &&strcmp (p->name, name))continue ; index =ll_name_to_index (name);
@@ -447,15 +437,8 @@ static int do_tunnels_list(struct ip_tunnel_parm *p) (p->i_key && p1.i_key != p->i_key))continue ;print_tunnel (&p1); -if (show_stats) { -printf ("%s" , _SL_); -printf ("RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts%s" , _SL_); -printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-8ld%s" , - rx_packets, rx_bytes, rx_errs, rx_frame, rx_fifo, rx_multi, _SL_); -printf ("TX: Packets Bytes Errors DeadLoop NoRoute NoBufs%s" , _SL_); -printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-6ld" , - tx_packets, tx_bytes, tx_errs, tx_colls, tx_carrier, tx_drops); - } +if (show_stats) +tnl_print_stats (ptr);printf ("\n" ); } err =0 ;
ip/tunnel.c +28 -0
@@ -195,3 +195,31 @@ __be32 tnl_parse_key(const char *name, const char *key) }return htonl (uval); } + +/* tnl_print_stats - print tunnel statistics +* +* @buf - tunnel interface's line in /proc/net/dev, +* starting past the interface name and following colon +*/ +void tnl_print_stats (const char *buf) +{ +unsigned long rx_bytes, rx_packets, rx_errs, rx_drops, + rx_fifo, rx_frame, + tx_bytes, tx_packets, tx_errs, tx_drops, + tx_fifo, tx_colls, tx_carrier, rx_multi; + +if (sscanf (ptr,"%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu" , + &rx_bytes, &rx_packets, &rx_errs, &rx_drops, + &rx_fifo, &rx_frame, &rx_multi, + &tx_bytes, &tx_packets, &tx_errs, &tx_drops, + &tx_fifo, &tx_colls, &tx_carrier) !=14 ) +return ; + +printf ("%s" , _SL_); +printf ("RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts%s" , _SL_); +printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-8ld%s" , + rx_packets, rx_bytes, rx_errs, rx_frame, rx_fifo, rx_multi, _SL_); +printf ("TX: Packets Bytes Errors DeadLoop NoRoute NoBufs%s" , _SL_); +printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-6ld" , + tx_packets, tx_bytes, tx_errs, tx_colls, tx_carrier, tx_drops); +}
ip/tunnel.h +1 -0
@@ -32,5 +32,6 @@ int tnl_prl_ioctl(int cmd, const char *name, void *p);int tnl_6rd_ioctl (int cmd,const char *name,void *p);int tnl_ioctl_get_6rd (const char *name,void *p);__be32 tnl_parse_key (const char *name,const char *key); +void tnl_print_stats (const char *buf);#endif
Signature · 1 line
2.6.4
Quoted 7 lines · On Fri, 18 Dec 2015 11:58:06 +0100 Phil Sutter <[email protected]> wrote:
This has a slight side-effect of not aborting when
/proc/net/devis malformed, but OTOH stats are not parsed for uninteresting interfaces.Signed-off-by Phil Sutter <[email protected]>---
Changes since v1:
- Fix conflict resolution (sscan from 'buf' instead of 'ptr').
Applied thanks.
Quoted 7 lines · Phil Sutter
This has a slight side-effect of not aborting when
/proc/net/devis malformed, but OTOH stats are not parsed for uninteresting interfaces.Signed-off-by Phil Sutter <[email protected]>---
Changes since v1:
- Fix conflict resolution (sscan from 'buf' instead of 'ptr').
[...]
Hmm, did you actually compile that?
The code is still the same as in v1 ... the only thing added is the "Changes since v1" description. ;)
[...]
ip/tunnel.c __be32 tnl_parse_key(const char *name, const char *key) · line 211
Quoted 8 lines
ip/tunnel.c +8
-0+void tnl_print_stats (const char *buf) +{ +unsigned long rx_bytes, rx_packets, rx_errs, rx_drops, + rx_fifo, rx_frame, + tx_bytes, tx_packets, tx_errs, tx_drops, + tx_fifo, tx_colls, tx_carrier, rx_multi; + + if (sscanf(ptr, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu",
s/ptr/buf/
Quoted 4 lines
ip/tunnel.c +4
-0+ &rx_bytes, &rx_packets, &rx_errs, &rx_drops, + &rx_fifo, &rx_frame, &rx_multi, + &tx_bytes, &tx_packets, &tx_errs, &tx_drops, + &tx_fifo, &tx_colls, &tx_carrier) != 14)
ip/tunnel.c __be32 tnl_parse_key(const char *name, const char *key) · line 225
Quoted 10 lines
ip/tunnel.c +10
-0+return ; + +printf ("%s" , _SL_); +printf ("RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts%s" , _SL_); +printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-8ld%s" , + rx_packets, rx_bytes, rx_errs, rx_frame, rx_fifo, rx_multi, _SL_); +printf ("TX: Packets Bytes Errors DeadLoop NoRoute NoBufs%s" , _SL_); +printf (" %-10ld %-12ld %-6ld %-8ld %-8ld %-6ld" , + tx_packets, tx_bytes, tx_errs, tx_colls, tx_carrier, tx_drops); +}
tunnel.c: In function ‘tnl_print_stats’:
tunnel.c:211:13: error: ‘buff’ undeclared (first use in this function)
if (sscanf(buff, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu",
^
tunnel.c:211:13: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [tunnel.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [all] Error 2
Quoted 8 lines · Daniel Borkmann
Quoted 7 lines · Phil Sutter
This has a slight side-effect of not aborting when
/proc/net/devis malformed, but OTOH stats are not parsed for uninteresting interfaces.Signed-off-by Phil Sutter <[email protected]>---
Changes since v1:
- Fix conflict resolution (sscan from 'buf' instead of 'ptr').
Quoted 6 lines
[...]
Hmm, did you actually compile that?
The code is still the same as in v1 ... the only thing added is the "Changes since v1" description. ;)
Oh man. I certainly double-checked it, especially since I messed it up the first time already. Quick forensics in my local clone revealed what had happened:
1) Exported the V2 patch into a dedicated patch subdir.
2) ???
3) Edited the V1 patch in $TOPDIR and sent that out.
Face -> Desk.
Fix follows. :(
Thanks for reporting,
Phil
PATCH 1/1 iptunnel: Fix compile error in ip/tunnel.c
In reply to Daniel BorkmannI repeatedly failed to get this right, so now I have to clean up my mess afterwards.
--- ip/tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
ip/tunnel.c +1 -1
@@ -208,7 +208,7 @@ void tnl_print_stats(const char *buf) tx_bytes, tx_packets, tx_errs, tx_drops, tx_fifo, tx_colls, tx_carrier, rx_multi; - if (sscanf(ptr, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu", + if (sscanf(buf, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu", &rx_bytes, &rx_packets, &rx_errs, &rx_drops, &rx_fifo, &rx_frame, &rx_multi, &tx_bytes, &tx_packets, &tx_errs, &tx_drops,
Signature · 1 line
2.5.3
Stephen Hemminger
AppliedRe: [iproute PATCH] iptunnel: Fix compile error in ip/tunnel.c
Quoted 14 lines · On Mon, 21 Dec 2015 20:42:56 +0100 Phil Sutter <[email protected]> wrote:
I repeatedly failed to get this right, so now I have to clean up my mess afterwards.
Fixes 7d6aadcd0a1dc ("ip{,6}tunnel: have a shared stats parser/printer")Signed-off-by Phil Sutter <[email protected]>--- ip/tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)ip/tunnel.c +0
-0
ip/tunnel.c void tnl_print_stats(const char *buf) · line 214
Quoted 8 lines
ip/tunnel.c +1
-1@@ -208,7 +208,7 @@ void tnl_print_stats(const char *buf) tx_bytes, tx_packets, tx_errs, tx_drops, tx_fifo, tx_colls, tx_carrier, rx_multi; - if (sscanf(ptr, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu", + if (sscanf(buf, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu", &rx_bytes, &rx_packets, &rx_errs, &rx_drops, &rx_fifo, &rx_frame, &rx_multi, &tx_bytes, &tx_packets, &tx_errs, &tx_drops,
Applied..