Hello community,
here is the log from the commit of package iftop for openSUSE:Factory checked
in at 2012-12-14 09:18:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/iftop (Old)
and /work/SRC/openSUSE:Factory/.iftop.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iftop", Maintainer is "lr...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/iftop/iftop.changes 2012-04-12
09:26:54.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.iftop.new/iftop.changes 2012-12-14
09:18:38.000000000 +0100
@@ -1,0 +2,6 @@
+Sun Nov 25 19:30:40 UTC 2012 - sch...@linux-m68k.org
+
+- Properly handle multicast packages
+- Define USE_GETIFADDRS to use getifaddrs for better IPv6 support
+
+-------------------------------------------------------------------
New:
----
iftop-multicast.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ iftop.spec ++++++
--- /var/tmp/diff_new_pack.w9Uziv/_old 2012-12-14 09:18:40.000000000 +0100
+++ /var/tmp/diff_new_pack.w9Uziv/_new 2012-12-14 09:18:40.000000000 +0100
@@ -28,6 +28,7 @@
BuildRequires: ncurses-devel
Source0: %name-%real_version.tar.gz
Patch1: %name-manpage.patch
+Patch2: %name-multicast.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -46,10 +47,11 @@
%prep
%setup -q -n %name-%real_version
%patch1 -p0
+%patch2 -p1
%build
%configure
-%__make %{?jobs:-j%jobs}
+%__make %{?jobs:-j%jobs} CPPFLAGS=-DUSE_GETIFADDRS
%install
%makeinstall
++++++ iftop-multicast.patch ++++++
>From 0c4d60de0626e97fcd965c67378379b5d7980264 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <sch...@linux-m68k.org>
Date: Sun, 25 Nov 2012 19:26:22 +0100
Subject: [PATCH] Handle incoming multicast packages
Upstream:
http://lists.beasts.org/pipermail/iftop-users/2012-November/000381.html
---
iftop.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/iftop.c b/iftop.c
index 06778d6..2805cd6 100644
--- a/iftop.c
+++ b/iftop.c
@@ -286,6 +286,14 @@ static void handle_ip_packet(struct ip* iptr, int hw_dir)
assign_addr_pair(&ap, iptr, 1);
direction = 0;
}
+ else if (IP_V(iptr) == 4 && IN_MULTICAST(iptr->ip_dst.s_addr)) {
+ assign_addr_pair(&ap, iptr, 1);
+ direction = 0;
+ }
+ else if (IP_V(iptr) == 6 && IN6_IS_ADDR_MULTICAST(&ip6tr->ip6_dst)) {
+ assign_addr_pair(&ap, iptr, 1);
+ direction = 0;
+ }
/*
* Cannot determine direction from hardware or IP levels. Therefore
* assume that it was a packet between two other machines, assign
@@ -304,6 +312,8 @@ static void handle_ip_packet(struct ip* iptr, int hw_dir)
direction = 0;
}
/* Drop other uncertain packages. */
+ else
+ return;
}
if(IP_V(iptr) == 4 && options.netfilter != 0) {
--
1.8.0
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
