gnome-nettool-01-sun-patch.diff revision 14029
--- gnome-nettool-2.22.0.orig/configure.in 2008-03-10 18:07:42.000000000 +0000
+++ gnome-nettool-2.22.0.hacked/configure.in 2008-07-17 15:42:01.347558000 +0100
@@ -16,7 +16,7 @@
AC_PROG_CC
AC_HEADER_STDC([])
AC_CHECK_HEADERS(sys/sockio.h)
-AC_CHECK_HEADERS(sys/socket.h ifaddrs.h,,AC_MSG_ERROR(Required header not found: $ac_header))
+AC_CHECK_HEADERS(sys/socket.h,,AC_MSG_ERROR(Required header not found: $ac_header))
dnl AC_ARG_PROGRAM
AM_PROG_LIBTOOL
--- gnome-nettool-2.22.0.orig/src/Makefile.am 2008-02-12 18:25:08.000000000 +0000
+++ gnome-nettool-2.22.0.hacked/src/Makefile.am 2008-08-04 11:32:51.208692000 +0100
@@ -8,11 +8,12 @@
@NETTOOL_CFLAGS@
LDADD = \
- $(NETTOOL_LIBS)
+ $(NETTOOL_LIBS)
bin_PROGRAMS = gnome-nettool
gnome_nettool_SOURCES = \
@@ -29,7 +30,11 @@
-gnome_nettool_LDADD = @NETTOOL_LIBS@
+gnome_nettool_LDADD = @NETTOOL_LIBS@ \
+ -lresolv \
+ -lsocket \
+ -lnsl \
+ -lkstat
EXTRA_DIST = \
--- gnome-nettool-2.22.0.orig/src/getifaddrs.c 1970-01-01 01:00:00.000000000 +0100
+++ gnome-nettool-2.22.0.hacked/src/getifaddrs.c 2008-08-01 11:00:40.965611000 +0100
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 2006 WIDE Project. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/sockio.h>
+#include <sys/socket.h>
+#include <net/if.h>
+
+#include "ifaddrs.h"
+
+static int
+get_lifreq(int fd, struct lifreq **ifr_ret)
+{
+ struct lifnum lifn;
+ struct lifconf lifc;
+ struct lifreq *lifrp;
+
+ lifn.lifn_family = AF_UNSPEC;
+ lifn.lifn_flags = 0;
+ if (ioctl(fd, SIOCGLIFNUM, &lifn) == -1)
+ lifn.lifn_count = 16;
+ else
+ lifn.lifn_count += 16;
+
+ for (;;) {
+ lifc.lifc_len = lifn.lifn_count * sizeof (*lifrp);
+ lifrp = malloc(lifc.lifc_len);
+ if (lifrp == NULL)
+ return (-1);
+
+ lifc.lifc_family = AF_UNSPEC;
+ lifc.lifc_flags = 0;
+ lifc.lifc_buf = (char *)lifrp;
+ if (ioctl(fd, SIOCGLIFCONF, &lifc) == -1) {
+ free(lifrp);
+ if (errno == EINVAL) {
+ lifn.lifn_count <<= 1;
+ continue;
+ }
+ (void) close(fd);
+ return (-1);
+ }
+ if (lifc.lifc_len < (lifn.lifn_count - 1) * sizeof (*lifrp))
+ break;
+ free(lifrp);
+ lifn.lifn_count <<= 1;
+ }
+
+ *ifr_ret = lifrp;
+
+ return (lifc.lifc_len / sizeof (*lifrp));
+}
+
+static size_t
+nbytes(const struct lifreq *lifrp, int nlif, size_t socklen)
+{
+ size_t len = 0;
+ size_t slen;
+
+ while (nlif > 0) {
+ slen = strlen(lifrp->lifr_name) + 1;
+ len += sizeof (struct ifaddrs) + ((slen + 3) & ~3);
+ len += 3 * socklen;
+ lifrp++;
+ nlif--;
+ }
+ return (len);
+}
+
+static struct sockaddr *
+addrcpy(struct sockaddr_storage *addr, char **bufp)
+{
+ char *buf = *bufp;
+ size_t len;
+
+ len = addr->ss_family == AF_INET ? sizeof (struct sockaddr_in) :
+ sizeof (struct sockaddr_in6);
+ (void) memcpy(buf, addr, len);
+ *bufp = buf + len;
+ return ((struct sockaddr *)buf);
+}
+
+static int
+populate(struct ifaddrs *ifa, int fd, struct lifreq *lifrp, int nlif, int af,
+ char **bufp)
+{
+ char *buf = *bufp;
+ size_t slen;
+
+ while (nlif > 0) {
+ ifa->ifa_next = (nlif > 1) ? ifa + 1 : NULL;
+ (void) strcpy(ifa->ifa_name = buf, lifrp->lifr_name);
+ slen = strlen(lifrp->lifr_name) + 1;
+ buf += (slen + 3) & ~3;
+ if (ioctl(fd, SIOCGLIFFLAGS, lifrp) == -1)
+ ifa->ifa_flags = 0;
+ else
+ ifa->ifa_flags = lifrp->lifr_flags;
+ if (ioctl(fd, SIOCGLIFADDR, lifrp) == -1)
+ ifa->ifa_addr = NULL;
+ else
+ ifa->ifa_addr = addrcpy(&lifrp->lifr_addr, &buf);
+ if (ioctl(fd, SIOCGLIFNETMASK, lifrp) == -1)
+ ifa->ifa_netmask = NULL;
+ else
+ ifa->ifa_netmask = addrcpy(&lifrp->lifr_addr, &buf);
+ if (ifa->ifa_flags & IFF_POINTOPOINT) {
+ if (ioctl(fd, SIOCGLIFDSTADDR, lifrp) == -1)
+ ifa->ifa_dstaddr = NULL;
+ else
+ ifa->ifa_dstaddr =
+ addrcpy(&lifrp->lifr_dstaddr, &buf);
+ } else if (ifa->ifa_flags & IFF_BROADCAST) {
+ if (ioctl(fd, SIOCGLIFBRDADDR, lifrp) == -1)
+ ifa->ifa_broadaddr = NULL;
+ else
+ ifa->ifa_broadaddr =
+ addrcpy(&lifrp->lifr_broadaddr, &buf);
+ } else {
+ ifa->ifa_dstaddr = NULL;
+ }
+
+ ifa++;
+ nlif--;
+ lifrp++;
+ }
+ *bufp = buf;
+ return (0);
+}
+
+int
+getifaddrs(struct ifaddrs **ifap)
+{
+ int fd4, fd6;
+ int nif4, nif6 = 0;
+ struct lifreq *ifr4 = NULL;
+ struct lifreq *ifr6 = NULL;
+ struct ifaddrs *ifa = NULL;
+ char *buf;
+
+ if ((fd4 = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
+ return (-1);
+ if ((fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) == -1 &&
+ errno != EAFNOSUPPORT) {
+ (void) close(fd4);
+ return (-1);
+ }
+
+ if ((nif4 = get_lifreq(fd4, &ifr4)) == -1 ||
+ (fd6 != -1 && (nif6 = get_lifreq(fd6, &ifr6)) == -1))
+ goto failure;
+
+ if (nif4 == 0 && nif6 == 0) {
+ *ifap = NULL;
+ return (0);
+ }
+
+ ifa = malloc(nbytes(ifr4, nif4, sizeof (struct sockaddr_in)) +
+ nbytes(ifr6, nif6, sizeof (struct sockaddr_in6)));
+ if (ifa == NULL)
+ goto failure;
+
+ buf = (char *)(ifa + nif4 + nif6);
+
+ if (populate(ifa, fd4, ifr4, nif4, AF_INET, &buf) == -1)
+ goto failure;
+ if (nif4 > 0 && nif6 > 0)
+ ifa[nif4 - 1].ifa_next = ifa + nif4;
+ if (populate(ifa + nif4, fd6, ifr6, nif6, AF_INET6, &buf) == -1)
+ goto failure;
+
+ *ifap = ifa;
+ return (0);
+
+failure:
+ free(ifa);
+ (void) close(fd4);
+ if (fd6 != -1)
+ (void) close(fd6);
+ free(ifr4);
+ free(ifr6);
+ return (-1);
+}
+
+void
+freeifaddrs(struct ifaddrs *ifa)
+{
+ free(ifa);
+}
--- gnome-nettool-2.22.0.orig/src/ifaddrs.h 1970-01-01 01:00:00.000000000 +0100
+++ gnome-nettool-2.22.0.hacked/src/ifaddrs.h 2008-07-28 16:03:13.251431000 +0100
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2006 WIDE Project. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef __IFADDRS_H
+#define __IFADDRS_H
+
+#include <sys/types.h>
+
+#undef ifa_broadaddr
+#undef ifa_dstaddr
+struct ifaddrs {
+ struct ifaddrs *ifa_next; /* Pointer to next struct */
+ char *ifa_name; /* Interface name */
+ uint64_t ifa_flags; /* Interface flags */
+ struct sockaddr *ifa_addr; /* Interface address */
+ struct sockaddr *ifa_netmask; /* Interface netmask */
+ struct sockaddr *ifa_dstaddr; /* P2P interface destination */
+};
+#define ifa_broadaddr ifa_dstaddr
+
+extern int getifaddrs(struct ifaddrs **);
+extern void freeifaddrs(struct ifaddrs *);
+#endif
--- gnome-nettool-2.22.0.orig/src/info.c 2008-02-12 18:25:08.000000000 +0000
+++ gnome-nettool-2.22.0.hacked/src/info.c 2008-08-04 11:32:11.119602000 +0100
@@ -20,6 +20,8 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glib/gprintf.h>
+#include <errno.h>
+#include <kstat.h>
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -208,6 +210,106 @@
gtk_combo_box_set_active (GTK_COMBO_BOX (info->combo), 0);
}
+char *
+netstatus_sysdeps_read_iface_statistics (const char *iface,
+ gulong *out_bytes,
+ gulong *out_packets,
+ gulong *out_errors,
+ gulong *in_bytes,
+ gulong *in_packets,
+ gulong *in_errors,
+ gulong *collisions,
+ gulong *if_speed)
+{
+ char *error_message = NULL;
+ static kstat_ctl_t *kc = NULL;
+ kstat_t *ksp;
+ kstat_named_t *kn;
+
+ /*
+ * The linux-specific code uses -1 as the default value. But if we return -1
+ * (see comment below), then it gets interpreted as (unsigned long)-1, which
+ * looks stupid and is definitely more wrong than just showing 0.
+ */
+
+ *out_bytes = 0;
+ *out_packets = 0;
+ *out_errors = 0;
+ *in_bytes = 0;
+ *in_packets = 0;
+ *in_errors = 0;
+ *collisions = 0;
+ *if_speed = 0;
+
+ if (kc == NULL)
+ {
+ if ((kc = kstat_open ()) == NULL)
+ return g_strdup_printf ("Cannot open /dev/kstat: %s",
+ g_strerror (errno));
+ }
+ else
+ {
+ if (kstat_chain_update (kc) < 0)
+ {
+ int e = errno;
+ kstat_close (kc);
+ kc = NULL;
+ return g_strdup_printf ("Cannot update kstats: %s",
+ g_strerror (e));
+ }
+ }
+
+ if ((ksp = kstat_lookup (kc, NULL, -1, iface)) == NULL)
+ {
+ kstat_close (kc);
+ kc = NULL;
+ return g_strdup_printf ("Cannot find information on interface '%s'",
+ iface);
+ }
+
+ if (kstat_read (kc, ksp, NULL) < 0)
+ {
+ kstat_close (kc);
+ kc = NULL;
+ return g_strdup_printf ("Cannot read kstat");
+ }
+
+ if ((kn = kstat_data_lookup (ksp, "rbytes")) != NULL)
+ *in_bytes = kn->value.ui32;
+
+ if ((kn = kstat_data_lookup (ksp, "opackets")) != NULL)
+ *out_packets = kn->value.ui32;
+
+ if ((kn = kstat_data_lookup (ksp, "oerrors")) != NULL)
+ *out_errors = kn->value.ui32;
+
+ if ((kn = kstat_data_lookup (ksp, "obytes")) != NULL)
+ *out_bytes = kn->value.ui32;
+
+ if ((kn = kstat_data_lookup (ksp, "ipackets")) != NULL)
+ *in_packets = kn->value.ui32;
+
+ if ((kn = kstat_data_lookup (ksp, "ierrors")) != NULL)
+ *in_errors = kn->value.ui32;
+
+ if ((kn = kstat_data_lookup (ksp, "collisions")) != NULL)
+ *collisions = kn->value.ui32;
+
+ if ((kn = kstat_data_lookup (ksp, "ifspeed")) != NULL)
+ *if_speed = kn->value.ui32;
+
+
+
+ /*
+ * On Solaris, loopback doesn't report bytes, just packets. The behavior of
+ * the linux-specific code reports an error if all the data is not present,
+ * and that shuts the applet down. So perhaps it's best to simply return
+ * success if we can access the data at all.
+ */
+
+ return NULL;
+}
+
static gboolean
info_nic_update_stats (gpointer data)
{
@@ -279,6 +381,28 @@
g_io_channel_unref (io);
#endif /* defined(__linux__) */
+ gulong out_bytes, out_pkts, out_err, in_bytes, in_pkts, in_err, collisions, ifspeed;
+ char buf[128];
+
+ netstatus_sysdeps_read_iface_statistics (text, &out_bytes, &out_pkts, &out_err,
+ &in_bytes, &in_pkts, &in_err,
+ &collisions, &ifspeed);
+ snprintf (buf, 128, "%ld", out_bytes);
+ gtk_label_set_text (GTK_LABEL (info->tx_bytes), buf);
+ snprintf (buf, 128, "%ld", out_pkts);
+ gtk_label_set_text (GTK_LABEL (info->tx), buf);
+ snprintf (buf, 128, "%ld", out_err);
+ gtk_label_set_text (GTK_LABEL (info->tx_errors), buf);
+ snprintf (buf, 128, "%ld", in_bytes);
+ gtk_label_set_text (GTK_LABEL (info->rx_bytes), buf);
+ snprintf (buf, 128, "%ld", in_pkts);
+ gtk_label_set_text (GTK_LABEL (info->rx), buf);
+ snprintf (buf, 128, "%ld", in_err);
+ gtk_label_set_text (GTK_LABEL (info->rx_errors), buf);
+ snprintf (buf, 128, "%ld", collisions);
+ gtk_label_set_text (GTK_LABEL (info->collisions), buf);
+ snprintf (buf, 128, "%ld", ifspeed);
+ gtk_label_set_text (GTK_LABEL (info->link_speed), buf);
return TRUE;
}
@@ -369,7 +493,7 @@
scope = g_strdup ("Link");
else if (IN6_IS_ADDR_SITELOCAL (&sinptr6->sin6_addr))
scope = g_strdup ("Site");
- else if (IN6_IS_ADDR_GLOBAL (&sinptr6->sin6_addr))
+ else if (IN6_IS_ADDR_MC_GLOBAL (&sinptr6->sin6_addr))
scope = g_strdup ("Global");
else if (IN6_IS_ADDR_MC_ORGLOCAL (&sinptr6->sin6_addr))
scope = g_strdup ("Global");
--- gnome-nettool-2.22.0.orig/src/main.c 2008-02-12 18:25:08.000000000 +0000
+++ gnome-nettool-2.22.0.hacked/src/main.c 2008-07-28 15:45:28.844550000 +0100
@@ -151,6 +151,7 @@
current_page = INFO;
info_set_nic (info, info_input);
}
+
if (ping_input) {
current_page = PING;
netinfo_set_host (pinger, ping_input);
--- gnome-nettool-2.22.0.orig/src/netstat.h 2008-02-12 18:25:08.000000000 +0000
+++ gnome-nettool-2.22.0.hacked/src/netstat.h 2008-07-17 15:47:02.608512000 +0100
@@ -30,10 +30,11 @@
# define NETSTAT_ROUTE6_FORMAT "%s %s %s %d %d %d %s"
# define NETSTAT_MULTICAST_FORMAT "%s %d %s"
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(sun)
# define NETSTAT_PROTOCOL_FORMAT "%s %d %d %d.%d.%d.%d.%s %s %s"
# define ALT_NETSTAT_PROTOCOL_FORMAT "%s %d %d *.%s %s %s"
# define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s"
+# define NETSTAT_ROUTE6_FORMAT "%s %s %s %d %d %d %s"
# define NETSTAT_MULTICAST_FORMAT "%s %d %s"
#endif
--- gnome-nettool-2.22.0.orig/src/ping.c 2008-02-12 18:25:08.000000000 +0000
+++ gnome-nettool-2.22.0.hacked/src/ping.c 2008-07-17 15:40:39.680340000 +0100
@@ -310,7 +310,7 @@
}
if (program != NULL) {
-#if defined(__sun__) || defined(__hpux__)
+#if defined(sun) || defined(__hpux__)
if (ip_version == IPV4)
command =
g_strdup_printf (PING_PROGRAM_FORMAT, program, host,
--- gnome-nettool-2.22.0.orig/src/ping.h 2008-02-12 18:25:08.000000000 +0000
+++ gnome-nettool-2.22.0.hacked/src/ping.h 2008-07-17 15:40:16.548135000 +0100
@@ -35,7 +35,7 @@
# define PING_PROGRAM_FORMAT_6 "%s ping6 -c %d -n %s"
# define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
# define PING_PARAMS_6
-#elif defined(__sun__)
+#elif defined(sun)
# define PING_PROGRAM_FORMAT "%s ping -s -n %s 56 %d"
# define PING_PROGRAM_FORMAT_6 "%s ping -s -A inet6 -a -n %s 56 %d"
# define PING_FORMAT "%d bytes from %s icmp_seq=%d. time=%f %s"
--- gnome-nettool-2.22.0.orig/src/utils.h 2008-02-12 18:25:08.000000000 +0000
+++ gnome-nettool-2.22.0.hacked/src/utils.h 2008-07-21 11:42:26.388716000 +0100
@@ -29,6 +29,8 @@
# include <config.h>
#endif
+#define gethostbyname2 res_gethostbyname2
+
#if (GLIB_MINOR_VERSION < 2)
# define _g_vsprintf vsprintf