Sophie

Sophie

distrib > Fedora > 13 > i386 > media > updates-src > by-pkgid > d3da47e473396ce88b22c4103ac14adc > files > 1

iftop-0.17-12.fc13.src.rpm

First patch is by Lennert Buytenhek <buytenh+debian@wantstofly.org> for
iftop >= 0.17, which fixes a armeb specific bug of structure size. For
further information, please have a look to Debian bug ID #336212. Second
patch is by Joey Hess <joeyh@debian.org> for iftop >= 0.17, which fixes
a crash on arm. For further information, please have a look to Debian bug
ID #351293.

--- iftop-0.17/ether.h			2005-03-31 14:08:05.000000000 +0200
+++ iftop-0.17/ether.h.arme		2010-11-18 22:48:02.961811528 +0100
@@ -12,7 +12,7 @@
 	u_int8_t	ether_dhost[ETHER_ADDR_LEN];
 	u_int8_t	ether_shost[ETHER_ADDR_LEN];
 	u_int16_t	ether_type;
-};
+} __attribute__((packed));
 
 struct vlan_8021q_header {
 	u_int16_t	priority_cfi_vid;
--- iftop-0.17/cfgfile.c		2005-12-24 12:37:43.000000000 +0100
+++ iftop-0.17/cfgfile.c.arm		2010-11-18 22:49:26.590812710 +0100
@@ -45,9 +45,9 @@
 extern options_t options ;
 
 int is_cfgdirective_valid(const char *s) {
-    char **t;
-    for (t = config_directives; *t != NULL; ++t)
-        if (strcmp(s, *t) == 0) return 1;
+    int t;
+    for (t = 0; config_directives[t] != NULL; t++)
+       if (strcmp(s, config_directives[t]) == 0) return 1;
     return 0;
 }