aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/utils/iftop/patches
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-10-10 13:21:30 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-10-10 13:21:30 +0000
commitc748c36d2c5d2c1741f7e1e4c7e37304f62b38b9 (patch)
tree0fca528c03b177dbd77c0565653aa27e29c3c0b6 /package/network/utils/iftop/patches
parent711fdc3b099689a42bdb80b321ab9223f325adce (diff)
downloadupstream-c748c36d2c5d2c1741f7e1e4c7e37304f62b38b9.tar.gz
upstream-c748c36d2c5d2c1741f7e1e4c7e37304f62b38b9.tar.bz2
upstream-c748c36d2c5d2c1741f7e1e4c7e37304f62b38b9.zip
iftop: move to trunk and add myself as maintainer
SVN-Revision: 33702
Diffstat (limited to 'package/network/utils/iftop/patches')
-rw-r--r--package/network/utils/iftop/patches/001-debian_armeb.patch11
-rw-r--r--package/network/utils/iftop/patches/002-debian_frozen_order.patch10
-rw-r--r--package/network/utils/iftop/patches/003-debian_arm.patch15
-rw-r--r--package/network/utils/iftop/patches/004-debian_bar_display.patch11
-rw-r--r--package/network/utils/iftop/patches/005-debian_bar_bytes.patch11
5 files changed, 58 insertions, 0 deletions
diff --git a/package/network/utils/iftop/patches/001-debian_armeb.patch b/package/network/utils/iftop/patches/001-debian_armeb.patch
new file mode 100644
index 0000000000..8abd92e1b3
--- /dev/null
+++ b/package/network/utils/iftop/patches/001-debian_armeb.patch
@@ -0,0 +1,11 @@
+--- a/ether.h
++++ b/ether.h
+@@ -12,7 +12,7 @@ struct ether_header {
+ 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;
diff --git a/package/network/utils/iftop/patches/002-debian_frozen_order.patch b/package/network/utils/iftop/patches/002-debian_frozen_order.patch
new file mode 100644
index 0000000000..c622036c56
--- /dev/null
+++ b/package/network/utils/iftop/patches/002-debian_frozen_order.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -446,6 +446,7 @@ void screen_hash_clear() {
+ hash_node_type* n = NULL;
+ while(hash_next_item(screen_hash, &n) == HASH_STATUS_OK) {
+ host_pair_line* hpl = (host_pair_line*)n->rec;
++ hpl->total_recv = hpl->total_sent = 0;
+ memset(hpl->recv, 0, sizeof(hpl->recv));
+ memset(hpl->sent, 0, sizeof(hpl->sent));
+ }
diff --git a/package/network/utils/iftop/patches/003-debian_arm.patch b/package/network/utils/iftop/patches/003-debian_arm.patch
new file mode 100644
index 0000000000..090ea1cbb7
--- /dev/null
+++ b/package/network/utils/iftop/patches/003-debian_arm.patch
@@ -0,0 +1,15 @@
+--- a/cfgfile.c
++++ b/cfgfile.c
+@@ -45,9 +45,9 @@ stringmap config;
+ 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;
+ }
+
diff --git a/package/network/utils/iftop/patches/004-debian_bar_display.patch b/package/network/utils/iftop/patches/004-debian_bar_display.patch
new file mode 100644
index 0000000000..7efaa2bfa3
--- /dev/null
+++ b/package/network/utils/iftop/patches/004-debian_bar_display.patch
@@ -0,0 +1,11 @@
+--- a/options.c
++++ b/options.c
+@@ -302,7 +302,7 @@ void options_read_args(int argc, char **
+ break;
+
+ case 'b':
+- config_set_string("show-bars", "true");
++ config_set_string("show-bars", "false");
+ break;
+
+ case 'B':
diff --git a/package/network/utils/iftop/patches/005-debian_bar_bytes.patch b/package/network/utils/iftop/patches/005-debian_bar_bytes.patch
new file mode 100644
index 0000000000..b9ecc26f02
--- /dev/null
+++ b/package/network/utils/iftop/patches/005-debian_bar_bytes.patch
@@ -0,0 +1,11 @@
+--- a/ui.c
++++ b/ui.c
+@@ -263,7 +263,7 @@ static void draw_bar_scale(int* y) {
+ char s[40], *p;
+ int x;
+ /* This 1024 vs 1000 stuff is just plain evil */
+- readable_size(i, s, sizeof s, options.log_scale ? 1000 : 1024, 0);
++ readable_size(i, s, sizeof s, options.log_scale ? 1000 : 1024, options.bandwidth_in_bytes);
+ p = s + strspn(s, " ");
+ x = get_bar_length(i * 8);
+ mvaddch(*y + 1, x, ACS_BTEE);