16854N/Adiff -urN -x'*.orig' -x'*.rej' gnome-nettool-2.27.4/configure.in ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/configure.in

16854N/A--- gnome-nettool-2.27.4/configure.in 2009-07-15 16:51:43.000000000 +0100

16854N/A+++ ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/configure.in 2009-07-23 17:23:26.777626002 +0100

16202N/A@@ -12,11 +12,16 @@

16202N/A

16202N/A IT_PROG_INTLTOOL([0.35.0])

16202N/A

15713N/A+dnl *** checks for socket, nsl, and kstat libraries ***

15713N/A+AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])

15713N/A+AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])

15713N/A+AC_CHECK_FUNC(kstat_open,,[AC_CHECK_LIB(kstat,kstat_open)])

15713N/A+

16202N/A AC_ISC_POSIX

16202N/A AC_PROG_CC

16202N/A AC_HEADER_STDC([])

14027N/A AC_CHECK_HEADERS(sys/sockio.h)

14027N/A-AC_CHECK_HEADERS(sys/socket.h ifaddrs.h,,AC_MSG_ERROR(Required header not found: $ac_header))

14027N/A+AC_CHECK_HEADERS(sys/socket.h,,AC_MSG_ERROR(Required header not found: $ac_header))

14027N/A dnl AC_ARG_PROGRAM

14027N/A AM_PROG_LIBTOOL

14027N/A

16854N/Adiff -urN -x'*.orig' -x'*.rej' gnome-nettool-2.27.4/src/Makefile.am ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/Makefile.am

16854N/A--- gnome-nettool-2.27.4/src/Makefile.am 2009-07-15 16:49:48.000000000 +0100

16854N/A+++ ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/Makefile.am 2009-07-23 17:23:26.788021925 +0100

16202N/A@@ -8,7 +8,7 @@

14027N/A @NETTOOL_CFLAGS@

14027N/A

14027N/A LDADD = \

14027N/A- $(NETTOOL_LIBS)

14027N/A+ $(NETTOOL_LIBS)

14027N/A

14027N/A bin_PROGRAMS = gnome-nettool

14027N/A

16202N/A@@ -29,7 +29,9 @@

16202N/A util-mii-wireless.h \

16202N/A main.c

14027N/A

16202N/A-gnome_nettool_LDADD = @NETTOOL_LIBS@

16202N/A+gnome_nettool_LDADD = @NETTOOL_LIBS@ \

16202N/A+ -lsocket \

16202N/A+ -lnsl

16202N/A

16202N/A EXTRA_DIST = \

16202N/A gnome-nettool.desktop.in \

16854N/Adiff -urN -x'*.orig' -x'*.rej' gnome-nettool-2.27.4/src/callbacks.c ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/callbacks.c

16854N/A--- gnome-nettool-2.27.4/src/callbacks.c 2009-06-18 18:51:14.000000000 +0100

16854N/A+++ ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/callbacks.c 2009-07-23 17:23:26.799546215 +0100

16202N/A@@ -306,7 +306,7 @@

14027N/A }

14027N/A

16202N/A void

16202N/A-on_about_activate (gpointer window, GtkWidget *menu_item)

16202N/A+on_about_activate (GtkWidget *menu_item, gpointer window)

14027N/A {

16202N/A const gchar *authors[] = {

16202N/A "Germán Poo Caamaño <gpoo@gnome.org>",

16854N/Adiff -urN -x'*.orig' -x'*.rej' gnome-nettool-2.27.4/src/callbacks.h ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/callbacks.h

16854N/A--- gnome-nettool-2.27.4/src/callbacks.h 2009-06-18 18:51:14.000000000 +0100

16854N/A+++ ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/callbacks.h 2009-07-23 17:23:26.809936267 +0100

16202N/A@@ -36,6 +36,6 @@

16202N/A guint page_num,

16202N/A gpointer data);

16202N/A

16202N/A-void on_about_activate (gpointer window, GtkWidget *menu_item);

16202N/A+void on_about_activate (GtkWidget *menu_item, gpointer window);

14027N/A

16202N/A void on_help_activate (gpointer window, GtkWidget *menu_item);

16854N/Adiff -urN -x'*.orig' -x'*.rej' gnome-nettool-2.27.4/src/main.c ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/main.c

16854N/A--- gnome-nettool-2.27.4/src/main.c 2009-07-15 16:49:48.000000000 +0100

16854N/A+++ ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/main.c 2009-07-23 17:35:47.576957555 +0100

16854N/A@@ -53,7 +53,7 @@

16202N/A main (int argc, char *argv[])

16202N/A {

16202N/A GtkWidget *window;

16202N/A- GtkWidget *menu_beep;

16202N/A+ GtkWidget *menu_beep, *menu_quit, *menu_about;

16854N/A GtkBuilder *builder;

16202N/A GtkWidget *notebook;

16202N/A GtkWidget *statusbar;

16854N/A@@ -157,6 +157,7 @@

14027N/A current_page = INFO;

14027N/A info_set_nic (info, info_input);

14027N/A }

14027N/A+

14027N/A if (ping_input) {

14027N/A current_page = PING;

14027N/A netinfo_set_host (pinger, ping_input);

16854N/A@@ -217,6 +218,18 @@

16202N/A g_object_set_data (G_OBJECT (notebook), "finger", finger);

16202N/A g_object_set_data (G_OBJECT (notebook), "whois", whois);

16202N/A

16854N/A+ menu_quit = GTK_WIDGET (gtk_builder_get_object (builder, "m_quit"));

16202N/A+

16202N/A+ g_signal_connect (G_OBJECT (menu_quit), "activate",

16202N/A+ G_CALLBACK (gn_quit_app),

16202N/A+ NULL);

16202N/A+

16854N/A+ menu_about = GTK_WIDGET (gtk_builder_get_object (builder, "m_about"));

16202N/A+

16202N/A+ g_signal_connect (G_OBJECT (menu_about), "activate",

16202N/A+ G_CALLBACK (on_about_activate),

16854N/A+ NULL);

16202N/A+

16854N/A menu_beep = GTK_WIDGET (gtk_builder_get_object (builder, "m_beep"));

16854N/A

16854N/A g_signal_connect (G_OBJECT (menu_beep), "activate",

16854N/A@@ -441,6 +454,10 @@

16854N/A netstat->button = GTK_WIDGET (gtk_builder_get_object (builder, "netstat_button"));

16854N/A netstat->routing = GTK_WIDGET (gtk_builder_get_object (builder, "netstat_routing"));

16854N/A netstat->protocol = GTK_WIDGET (gtk_builder_get_object (builder, "netstat_protocol"));

16854N/A+

14254N/A+#if defined(sun)

14254N/A+ gtk_widget_hide (netstat->protocol);

14254N/A+#endif

16854N/A netstat->multicast = GTK_WIDGET (gtk_builder_get_object (builder, "netstat_multicast"));

14254N/A netstat->sensitive = NULL;

14254N/A netstat->label_run = _("Netstat");

16854N/Adiff -urN -x'*.orig' -x'*.rej' gnome-nettool-2.27.4/src/netstat.c ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/netstat.c

16854N/A--- gnome-nettool-2.27.4/src/netstat.c 2009-06-18 18:51:14.000000000 +0100

16854N/A+++ ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/netstat.c 2009-07-23 17:23:26.847898478 +0100

14254N/A@@ -110,13 +110,21 @@

14254N/A g_return_val_if_fail (netinfo != NULL, NULL);

14254N/A

14254N/A if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->routing))) {

14254N/A- /* Works for Solaris and Linux */

14254N/A+#if defined(sun)

14254N/A+ /* Works for Solaris */

14254N/A+ if (netinfo_is_ipv6_enable ()) {

14254N/A+ option = g_strdup ("-rn -f inet -f inet6");

14254N/A+ } else {

14254N/A+ option = g_strdup ("-rn -f inet");

14254N/A+ }

14254N/A+#else

14254N/A+ /* Works for Linux */

14254N/A if (netinfo_is_ipv6_enable ()) {

14254N/A option = g_strdup ("-rn -A inet -A inet6");

14254N/A } else {

14254N/A option = g_strdup ("-rn -A inet");

14254N/A }

14254N/A-

14254N/A+#endif

14254N/A if (netinfo->stbar_text)

14254N/A g_free (netinfo->stbar_text);

14254N/A netinfo->stbar_text = g_strdup (_("Getting routing table"));

14254N/A@@ -541,7 +549,11 @@

14254N/A gtk_list_store_set (GTK_LIST_STORE (model), &iter,

14254N/A 0, data.destination,

14254N/A 1, data.gateway,

14254N/A+#if defined(sun)

14254N/A+ 2, NULL,

14254N/A+#else

14254N/A 2, data.netmask,

14254N/A+#endif

14254N/A 3, data.iface, -1);

14254N/A

14254N/A gtk_tree_view_set_model (widget, model);

16202N/A@@ -718,9 +730,15 @@

14254N/A gint count = 0;

14254N/A gint members;

14254N/A

14254N/A+#if defined(sun)

14254N/A+ count = sscanf (line, NETSTAT_MULTICAST_FORMAT,

14254N/A+ data->iface,

14254N/A+ data->group, &members);

14254N/A+#else

14254N/A count = sscanf (line, NETSTAT_MULTICAST_FORMAT,

14254N/A data->iface,

14254N/A &members, data->group);

14254N/A+#endif

14254N/A

14254N/A snprintf ((data)->members, 30, "%d", members);

14254N/A

16854N/Adiff -urN -x'*.orig' -x'*.rej' gnome-nettool-2.27.4/src/netstat.h ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/netstat.h

16854N/A--- gnome-nettool-2.27.4/src/netstat.h 2009-06-18 18:51:14.000000000 +0100

16854N/A+++ ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/netstat.h 2009-07-23 17:23:26.859125307 +0100

14254N/A@@ -34,10 +34,19 @@

14027N/A # define NETSTAT_PROTOCOL_FORMAT "%s %d %d %d.%d.%d.%d.%s %s %s"

14027N/A # define ALT_NETSTAT_PROTOCOL_FORMAT "%s %d %d *.%s %s %s"

14027N/A # define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s"

14027N/A+# define NETSTAT_ROUTE6_FORMAT "%s %s %s %d %d %d %s"

14027N/A # define NETSTAT_MULTICAST_FORMAT "%s %d %s"

14027N/A

14254N/A+#elif defined(sun)

14254N/A+

14254N/A+# define NETSTAT_PROTOCOL_FORMAT "%s %d %d %s %s %s"

14254N/A+# define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s"

14254N/A+# define NETSTAT_ROUTE6_FORMAT "%s %s %s %d %d %d %s"

14254N/A+# define NETSTAT_MULTICAST_FORMAT "%s %s %d"

14254N/A+

14027N/A #endif

14254N/A

14254N/A+

14254N/A typedef enum {

14254N/A NONE,

14254N/A ROUTE,

16854N/Adiff -urN -x'*.orig' -x'*.rej' gnome-nettool-2.27.4/src/ping.c ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/ping.c

16854N/A--- gnome-nettool-2.27.4/src/ping.c 2009-06-18 18:51:14.000000000 +0100

16854N/A+++ ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/ping.c 2009-07-23 17:23:26.870528364 +0100

16266N/A@@ -93,8 +93,13 @@

16266N/A while (nodeavailable) {

16266N/A gtk_tree_model_get (results, &node,

16266N/A ICMP_SEQ_COLUMN, &seqnumber, -1);

16266N/A+#if defined(sun)

16266N/A+ index = seqnumber - rangemin;

16266N/A+ if (seqnumber >= rangemin) {

16266N/A+#else

16266N/A index = seqnumber - rangemin - 1;

16266N/A if (seqnumber > rangemin) {

16266N/A+#endif

16266N/A gtk_tree_model_get (results, &node,

16266N/A SRTT_COLUMN, &srtt_str,

16266N/A -1);

16266N/A@@ -193,8 +198,13 @@

16266N/A }

16266N/A draw_centered_text (widget, x, line1h, tmpstr);

16266N/A g_free (tmpstr);

16266N/A+#if defined(sun)

16266N/A+ if (index + rangemin <= rangemax) {

16266N/A+ tmpstr = g_strdup_printf ("%d", index + rangemin);

16266N/A+#else

16266N/A if (index + rangemin + 1 <= rangemax) {

16266N/A tmpstr = g_strdup_printf ("%d", index + rangemin + 1);

16266N/A+#endif

16266N/A } else {

16266N/A tmpstr = g_strdup ("-");

16266N/A }

16266N/A@@ -294,7 +304,11 @@

14234N/A program = util_find_program_dialog ("ping", parent);

14234N/A break;

14234N/A case IPV6:

14234N/A+#if defined(sun)

14234N/A+ program = util_find_program_dialog ("ping", parent);

14234N/A+#else

14234N/A program = util_find_program_dialog ("ping6", parent);

14234N/A+#endif

14234N/A

14234N/A break;

14234N/A case -1:

16266N/A@@ -308,7 +322,7 @@

16202N/A if (count == -1) {

16202N/A count_string = g_strdup_printf(" ");

16202N/A } else {

14027N/A-#if defined(__sun__) || defined(__hpux__)

14027N/A+#if defined(sun) || defined(__hpux__)

16202N/A count_string = g_strdup_printf("%d", count);

16202N/A #else

16202N/A count_string = g_strdup_printf(" -c %d ", count);

16266N/A@@ -317,7 +331,7 @@

16202N/A

16202N/A if (ip_version == IPV4) {

14027N/A command =

16202N/A-#if defined(__sun__) || defined(__hpux__)

16202N/A+#if defined(__hpux__) || defined(sun)

16202N/A g_strdup_printf (PING_PROGRAM_FORMAT, program,

16202N/A host, count_string);

16202N/A #else

16266N/A@@ -326,7 +340,7 @@

16202N/A #endif

16202N/A } else {

16202N/A command =

16202N/A-#if defined(__sun__) || defined(__hpux__)

16202N/A+#if defined(sun) || defined(__hpux__)

16202N/A g_strdup_printf (PING_PROGRAM_FORMAT_6, program,

16202N/A host, count_string);

16202N/A #else

16854N/Adiff -urN -x'*.orig' -x'*.rej' gnome-nettool-2.27.4/src/ping.h ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/ping.h

16854N/A--- gnome-nettool-2.27.4/src/ping.h 2009-06-18 18:51:14.000000000 +0100

16854N/A+++ ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/ping.h 2009-07-23 17:23:26.881337639 +0100

16202N/A@@ -36,11 +36,11 @@

16202N/A # define PING_PROGRAM_FORMAT_6 "%s ping6%s-n %s"

14027N/A # define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"

14027N/A # define PING_PARAMS_6

14027N/A-#elif defined(__sun__)

14027N/A+#elif defined(sun)

16202N/A /* <path to program> ping -s -n <host> [<count>] */

16202N/A-# define PING_PROGRAM_FORMAT "%s ping -s -n %s 56%s"

16202N/A-# define PING_PROGRAM_FORMAT_6 "%s ping -s -A inet6 -a -n %s 56%s"

14234N/A-# define PING_FORMAT "%d bytes from %s icmp_seq=%d. time=%f %s"

16202N/A+# define PING_PROGRAM_FORMAT "%s ping -s -n %s 56 %s"

16202N/A+# define PING_PROGRAM_FORMAT_6 "%s ping -s -A inet6 -a -n %s 56 %s"

14234N/A+# define PING_FORMAT "%d bytes from %s icmp_seq=%d. time=%s %s"

14234N/A # define PING_PARAMS_5

14234N/A #elif defined(__hpux__)

16202N/A # define PING_PROGRAM_FORMAT "%s ping %s -n%s"

16854N/Adiff -urN -x'*.orig' -x'*.rej' gnome-nettool-2.27.4/src/utils.h ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/utils.h

16854N/A--- gnome-nettool-2.27.4/src/utils.h 2009-06-18 18:51:14.000000000 +0100

16854N/A+++ ../SUNWgnome-nettool-2.27.4.changed/gnome-nettool-2.27.4/src/utils.h 2009-07-23 17:23:26.891315897 +0100

14234N/A@@ -29,6 +29,10 @@

14027N/A # include <config.h>

14027N/A #endif

14027N/A

14234N/A+#define gethostbyname2(name, domain) getipnodebyname((name), (domain), 0, &g_n_err_macro)

14234N/A+int g_n_err_macro;

14234N/A+

14027N/A+

14027N/A #if (GLIB_MINOR_VERSION < 2)

14027N/A

14027N/A # define _g_vsprintf vsprintf

18580N/Adiff -ruN gnome-nettool-2.30.0.orig/src/netstat.c gnome-nettool-2.30.0/src/netstat.c

18580N/A--- gnome-nettool-2.30.0.orig/src/netstat.c 2010-04-12 22:19:53.848593242 +0100

18580N/A+++ gnome-nettool-2.30.0/src/netstat.c 2010-04-12 22:21:14.229846239 +0100

18580N/A@@ -493,7 +493,7 @@

18580N/A g_return_if_fail (line != NULL);

18580N/A

18580N/A count = strip_route_line (line, &data);

18580N/A-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)

18580N/A+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(sun)

18580N/A if (count == 6) {

18580N/A #else

18580N/A if ((count == 8) || (count == 7)) {

18580N/A@@ -574,7 +574,7 @@

18580N/A gchar **items;

18580N/A #endif

18580N/A

18580N/A-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)

18580N/A+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(sun)

18580N/A count = sscanf (line, NETSTAT_ROUTE_FORMAT,

18580N/A data->destination,

18580N/A data->gateway, flags,