gnome-nettool-01-sun-patch.diff revision 16266
f743002678eb67b99bbc29fee116b65d9530fec0wrowediff -urN gnome-nettool-2.26.0/configure.in ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/configure.in
80833bb9a1bf25dcf19e814438a4b311d2e1f4cffuankg--- gnome-nettool-2.26.0/configure.in 2009-03-17 02:43:58.000000000 +0000
a34684a59b60a4173c25035d0c627ef17e6dc215rpluem+++ ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/configure.in 2009-03-27 17:44:23.401338000 +0000
1337c7673efc1f80f634139fbad7cbb98a0dc657ylavic@@ -12,11 +12,16 @@
1337c7673efc1f80f634139fbad7cbb98a0dc657ylavic IT_PROG_INTLTOOL([0.35.0])
4da61833a1cbbca94094f9653fd970582b97a72etrawick+dnl *** checks for socket, nsl, and kstat libraries ***
4da61833a1cbbca94094f9653fd970582b97a72etrawick+AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])
4da61833a1cbbca94094f9653fd970582b97a72etrawick+AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
4da61833a1cbbca94094f9653fd970582b97a72etrawick+AC_CHECK_FUNC(kstat_open,,[AC_CHECK_LIB(kstat,kstat_open)])
4789804be088bcd86ae637a29cdb7fda25169521jailletc AC_ISC_POSIX
4789804be088bcd86ae637a29cdb7fda25169521jailletc AC_HEADER_STDC([])
4789804be088bcd86ae637a29cdb7fda25169521jailletc AC_CHECK_HEADERS(sys/sockio.h)
e50c3026198fd496f183cda4c32a202925476778covener-AC_CHECK_HEADERS(sys/socket.h ifaddrs.h,,AC_MSG_ERROR(Required header not found: $ac_header))
e50c3026198fd496f183cda4c32a202925476778covener+AC_CHECK_HEADERS(sys/socket.h,,AC_MSG_ERROR(Required header not found: $ac_header))
e50c3026198fd496f183cda4c32a202925476778covener dnl AC_ARG_PROGRAM
5b88c8507d5ef6d0c4cfbc78230294968175b638minfrin AM_PROG_LIBTOOL
6c3b9cebb551140fbb25d58bae08b539b3802133ylavicdiff -urN gnome-nettool-2.26.0/src/Makefile.am ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/Makefile.am
6c3b9cebb551140fbb25d58bae08b539b3802133ylavic--- gnome-nettool-2.26.0/src/Makefile.am 2008-03-25 04:25:11.000000000 +0000
6c3b9cebb551140fbb25d58bae08b539b3802133ylavic+++ ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/Makefile.am 2009-03-27 17:44:23.403061000 +0000
4f29b65ab4b547ad5dbe506e2d0ff5d12ead9247ylavic@@ -8,7 +8,7 @@
4f29b65ab4b547ad5dbe506e2d0ff5d12ead9247ylavic @NETTOOL_CFLAGS@
0a0df13b7f1f4f1a74fe295253d89ca3911b301aylavic- $(NETTOOL_LIBS)
0a0df13b7f1f4f1a74fe295253d89ca3911b301aylavic+ $(NETTOOL_LIBS)
69301145375a889e7e37caf7cc7321ac0f91801erpluem bin_PROGRAMS = gnome-nettool
506bfe33206b2fece40ef25f695af39dd4130facjkaluza@@ -29,7 +29,9 @@
d58a848a016d401b965111e50ef829e1641f7834minfrin-gnome_nettool_LDADD = @NETTOOL_LIBS@
d58a848a016d401b965111e50ef829e1641f7834minfrin+gnome_nettool_LDADD = @NETTOOL_LIBS@ \
d58a848a016d401b965111e50ef829e1641f7834minfrin+ -lsocket \
2e6f4d654c96c98b761fb012fd25c5d5b1558c44sf EXTRA_DIST = \
17e6c95f3b22d18acdf8380fb26a8d0e10c80767ylavicdiff -urN gnome-nettool-2.26.0/src/callbacks.c ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/callbacks.c
17e6c95f3b22d18acdf8380fb26a8d0e10c80767ylavic--- gnome-nettool-2.26.0/src/callbacks.c 2008-12-12 03:03:54.000000000 +0000
17e6c95f3b22d18acdf8380fb26a8d0e10c80767ylavic+++ ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/callbacks.c 2009-03-27 17:44:23.403858000 +0000
17e6c95f3b22d18acdf8380fb26a8d0e10c80767ylavic@@ -306,7 +306,7 @@
330e16bea8fe9cace4de90c349750c03dfb1fe64ylavic-on_about_activate (gpointer window, GtkWidget *menu_item)
330e16bea8fe9cace4de90c349750c03dfb1fe64ylavic+on_about_activate (GtkWidget *menu_item, gpointer window)
330e16bea8fe9cace4de90c349750c03dfb1fe64ylavic const gchar *authors[] = {
330e16bea8fe9cace4de90c349750c03dfb1fe64ylavic "Germán Poo Caamaño <gpoo@gnome.org>",
330e16bea8fe9cace4de90c349750c03dfb1fe64ylavicdiff -urN gnome-nettool-2.26.0/src/callbacks.h ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/callbacks.h
330e16bea8fe9cace4de90c349750c03dfb1fe64ylavic--- gnome-nettool-2.26.0/src/callbacks.h 2008-12-12 01:44:23.000000000 +0000
d7205b1a86c51c27b71a2c458dc453fd53a261c1covener+++ ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/callbacks.h 2009-03-27 17:44:23.404065000 +0000
d7205b1a86c51c27b71a2c458dc453fd53a261c1covener@@ -36,6 +36,6 @@
d7205b1a86c51c27b71a2c458dc453fd53a261c1covener guint page_num,
d7205b1a86c51c27b71a2c458dc453fd53a261c1covener gpointer data);
44ff304057225e944e220e981d434a046d14cf06covener-void on_about_activate (gpointer window, GtkWidget *menu_item);
44ff304057225e944e220e981d434a046d14cf06covener+void on_about_activate (GtkWidget *menu_item, gpointer window);
44ff304057225e944e220e981d434a046d14cf06covener void on_help_activate (gpointer window, GtkWidget *menu_item);
5d1ba75b8794925e67591c209085a49279791de9covenerdiff -urN gnome-nettool-2.26.0/src/main.c ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/main.c
5d1ba75b8794925e67591c209085a49279791de9covener--- gnome-nettool-2.26.0/src/main.c 2009-03-17 02:15:43.000000000 +0000
5d1ba75b8794925e67591c209085a49279791de9covener+++ ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/main.c 2009-03-27 17:44:23.404612000 +0000
032982212dbcc7c3cce95bf89c503bb56e185ac7kbrand@@ -54,7 +54,7 @@
032982212dbcc7c3cce95bf89c503bb56e185ac7kbrand main (int argc, char *argv[])
032982212dbcc7c3cce95bf89c503bb56e185ac7kbrand GtkWidget *window;
caad2986f81ab263f7af41467dd622dc9add17f3ylavic- GtkWidget *menu_beep;
caad2986f81ab263f7af41467dd622dc9add17f3ylavic+ GtkWidget *menu_beep, *menu_quit, *menu_about;
caad2986f81ab263f7af41467dd622dc9add17f3ylavic GladeXML *xml;
caad2986f81ab263f7af41467dd622dc9add17f3ylavic GtkWidget *notebook;
45a10d38e6051fd7bdf9d742aaae633d97ff02abjailletc GtkWidget *statusbar;
f7317ff316c2b141feea31bddb74d5d3fa1584edjorton@@ -155,6 +155,7 @@
f7317ff316c2b141feea31bddb74d5d3fa1584edjorton current_page = INFO;
2165214331e4afafca4048f66f303d0253d7b001covener info_set_nic (info, info_input);
1e2d421a36999d292042a5539971070d54aa6c63ylavic if (ping_input) {
1e2d421a36999d292042a5539971070d54aa6c63ylavic current_page = PING;
1e2d421a36999d292042a5539971070d54aa6c63ylavic netinfo_set_host (pinger, ping_input);
fa7ed98b9dc94c5845cf845aea0a44ecacd290c9humbedooh@@ -215,11 +216,24 @@
fa7ed98b9dc94c5845cf845aea0a44ecacd290c9humbedooh g_object_set_data (G_OBJECT (notebook), "finger", finger);
fa7ed98b9dc94c5845cf845aea0a44ecacd290c9humbedooh g_object_set_data (G_OBJECT (notebook), "whois", whois);
0b67eb8568cd58bb77082703951679b42cf098actrawick+ menu_quit = glade_xml_get_widget (xml, "m_quit");
0b67eb8568cd58bb77082703951679b42cf098actrawick+ g_signal_connect (G_OBJECT (menu_quit), "activate",
5ef3c61605a3a021ff71f488983cb0065f8e1a79covener+ G_CALLBACK (gn_quit_app),
6502b7b32f980cc2093bb3ebce37e5e4dc68fba4ylavic menu_beep = glade_xml_get_widget (xml, "m_beep");
3060ce7f798fbda7999cd4ddf89b525d2b294185covener g_signal_connect (G_OBJECT (menu_beep), "activate",
c1a63b8fad09c419c1a64f75993feb8a343a6801ylavic G_CALLBACK (on_beep_activate),
c1a63b8fad09c419c1a64f75993feb8a343a6801ylavic (gpointer) pinger);
e6b4bd1113567627ab6bb6c6a7105e1e01a7d889jailletc+ menu_about = glade_xml_get_widget (xml, "m_about");
e466c40e1801982602ee0200c9e8b61cc148742djailletc+ g_signal_connect (G_OBJECT (menu_about), "activate",
e466c40e1801982602ee0200c9e8b61cc148742djailletc+ G_CALLBACK (on_about_activate),
457468b82e59d01eba00dd9d0817309c8f5e414ejim+ (gpointer) window);
04983e3bd1754764eec7d6bb772fe3b0bf391771jorton glade_xml_signal_autoconnect (xml);
04983e3bd1754764eec7d6bb772fe3b0bf391771jorton g_object_unref (G_OBJECT (xml));
15890c9306ba98f6fc243e15a3c4778ddc7d773erpluem@@ -441,6 +455,9 @@
15660979a30d251681463de2e0584853890082accovener netstat->button = glade_xml_get_widget (xml, "netstat_button");
15660979a30d251681463de2e0584853890082accovener netstat->routing = glade_xml_get_widget (xml, "netstat_routing");
49dacedb6c387b786b7911082ff35121a45f414bcovener netstat->protocol = glade_xml_get_widget (xml, "netstat_protocol");
49dacedb6c387b786b7911082ff35121a45f414bcovener+#if defined(sun)
cfd9415521847b2f9394fad04fb701cfb955f503rjung+ gtk_widget_hide (netstat->protocol);
cfd9415521847b2f9394fad04fb701cfb955f503rjung netstat->multicast = glade_xml_get_widget (xml, "netstat_multicast");
28c31fb73c1264bd1d0ff932573677030b024c7dwrowe netstat->sensitive = NULL;
28c31fb73c1264bd1d0ff932573677030b024c7dwrowe netstat->label_run = _("Netstat");
28c31fb73c1264bd1d0ff932573677030b024c7dwrowediff -urN gnome-nettool-2.26.0/src/netstat.c ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/netstat.c
28c31fb73c1264bd1d0ff932573677030b024c7dwrowe--- gnome-nettool-2.26.0/src/netstat.c 2009-03-17 02:15:43.000000000 +0000
28c31fb73c1264bd1d0ff932573677030b024c7dwrowe+++ ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/netstat.c 2009-03-27 17:44:23.405184000 +0000
8491e0600f69b0405e156ea8a419653c065c645bcovener@@ -110,13 +110,21 @@
63b9f1f5880391261705f696d7d65507bbe9ace3covener g_return_val_if_fail (netinfo != NULL, NULL);
63b9f1f5880391261705f696d7d65507bbe9ace3covener if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->routing))) {
49dacedb6c387b786b7911082ff35121a45f414bcovener- /* Works for Solaris and Linux */
49dacedb6c387b786b7911082ff35121a45f414bcovener+#if defined(sun)
49dacedb6c387b786b7911082ff35121a45f414bcovener+ /* Works for Solaris */
49dacedb6c387b786b7911082ff35121a45f414bcovener+ if (netinfo_is_ipv6_enable ()) {
3c990331fc6702119e4f5b8ba9eae3021aea5265jim+ option = g_strdup ("-rn -f inet -f inet6");
3c990331fc6702119e4f5b8ba9eae3021aea5265jim+ option = g_strdup ("-rn -f inet");
fc42512879dd0504532f52fe5d0d0383dda96a1eniq+ /* Works for Linux */
fc42512879dd0504532f52fe5d0d0383dda96a1eniq if (netinfo_is_ipv6_enable ()) {
0451df5dc50fa5d8b3e07d92ee6a92e36a1181a5niq option = g_strdup ("-rn -A inet -A inet6");
0451df5dc50fa5d8b3e07d92ee6a92e36a1181a5niq option = g_strdup ("-rn -A inet");
da0442c0440caef34706e2c2f3af05cb65921cc0jailletc if (netinfo->stbar_text)
06b8f183140c8e02e0974e938a05078b511d1603covener g_free (netinfo->stbar_text);
06b8f183140c8e02e0974e938a05078b511d1603covener netinfo->stbar_text = g_strdup (_("Getting routing table"));
06b8f183140c8e02e0974e938a05078b511d1603covener@@ -485,7 +493,7 @@
15890c9306ba98f6fc243e15a3c4778ddc7d773erpluem g_return_if_fail (line != NULL);
259878293a997ff49f5ddfc53d3739cbdc25444ecovener count = strip_route_line (line, &data);
259878293a997ff49f5ddfc53d3739cbdc25444ecovener-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
259878293a997ff49f5ddfc53d3739cbdc25444ecovener+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(sun)
15890c9306ba98f6fc243e15a3c4778ddc7d773erpluem if (count == 6) {
b54b024c06a19926832d77d40ba35ad8c41e4d3dminfrin if ((count == 8) || (count == 7)) {
b54b024c06a19926832d77d40ba35ad8c41e4d3dminfrin@@ -541,7 +549,11 @@
65967d05f839dbf27cf91d91fa79585eeae19660minfrin gtk_list_store_set (GTK_LIST_STORE (model), &iter,
65967d05f839dbf27cf91d91fa79585eeae19660minfrin+#if defined(sun)
75f5c2db254c0167a0e396254460de09b775d203trawick gtk_tree_view_set_model (widget, model);
4f0358189bfa57b8e75bd6b94db264302a8f336amrumph@@ -562,7 +574,7 @@
4f0358189bfa57b8e75bd6b94db264302a8f336amrumph gchar **items;
5716f9c6daa92dde5f2f9d11ed63f7c9549c223atrawick-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
5716f9c6daa92dde5f2f9d11ed63f7c9549c223atrawick+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(sun)
5716f9c6daa92dde5f2f9d11ed63f7c9549c223atrawick count = sscanf (line, NETSTAT_ROUTE_FORMAT,
54d750a84a175d8e338880514d440773eb986b50covener data->destination,
54d750a84a175d8e338880514d440773eb986b50covener data->gateway, flags,
54d750a84a175d8e338880514d440773eb986b50covener@@ -718,9 +730,15 @@
54d750a84a175d8e338880514d440773eb986b50covener gint count = 0;
54d750a84a175d8e338880514d440773eb986b50covener gint members;
54d750a84a175d8e338880514d440773eb986b50covener+#if defined(sun)
54d750a84a175d8e338880514d440773eb986b50covener+ count = sscanf (line, NETSTAT_MULTICAST_FORMAT,
7a3aa12f0eda24793ee26d6a179bd53132e9dae8covener+ data->iface,
54d750a84a175d8e338880514d440773eb986b50covener+ data->group, &members);
83b50288fa7d306324bba68832011ea08f5c7832covener count = sscanf (line, NETSTAT_MULTICAST_FORMAT,
4e30ef014533a7e93c92d88306291f5e49c9692ftrawick data->iface,
83b50288fa7d306324bba68832011ea08f5c7832covener &members, data->group);
5f066f496cd9f20a2a701255bc67d44e7cb46daetrawick snprintf ((data)->members, 30, "%d", members);
2e15620d724fb8e3a5be183b917359a2fd6e9468covenerdiff -urN gnome-nettool-2.26.0/src/netstat.h ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/netstat.h
2e15620d724fb8e3a5be183b917359a2fd6e9468covener--- gnome-nettool-2.26.0/src/netstat.h 2008-12-10 00:38:30.000000000 +0000
2e15620d724fb8e3a5be183b917359a2fd6e9468covener+++ ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/netstat.h 2009-03-27 17:44:23.406076000 +0000
1b988c41ee505962781d110a3e4c2c90f1ea0aa4covener@@ -34,10 +34,19 @@
1b988c41ee505962781d110a3e4c2c90f1ea0aa4covener # define NETSTAT_PROTOCOL_FORMAT "%s %d %d %d.%d.%d.%d.%s %s %s"
1b988c41ee505962781d110a3e4c2c90f1ea0aa4covener # define ALT_NETSTAT_PROTOCOL_FORMAT "%s %d %d *.%s %s %s"
1b988c41ee505962781d110a3e4c2c90f1ea0aa4covener # define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s"
b8efdc95bec9cf089aa1be0bfd07d46aa1137a7acovener+# define NETSTAT_ROUTE6_FORMAT "%s %s %s %d %d %d %s"
b8efdc95bec9cf089aa1be0bfd07d46aa1137a7acovener # define NETSTAT_MULTICAST_FORMAT "%s %d %s"
f06e7c4b1bce6b6491e5de0b7998d3f5696b293dchrisd+#elif defined(sun)
f06e7c4b1bce6b6491e5de0b7998d3f5696b293dchrisd+# define NETSTAT_PROTOCOL_FORMAT "%s %d %d %s %s %s"
179565be4043d7e5f9161aa75271fa0a001866d9covener+# define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s"
179565be4043d7e5f9161aa75271fa0a001866d9covener+# define NETSTAT_ROUTE6_FORMAT "%s %s %s %d %d %d %s"
179565be4043d7e5f9161aa75271fa0a001866d9covener+# define NETSTAT_MULTICAST_FORMAT "%s %s %d"
fce4949fb0b309a5744afcd503c6ed2d35621ee2covener typedef enum {
7b7430e701e9a31ce809da7c220bb8dfcf68c86etrawickdiff -urN gnome-nettool-2.26.0/src/ping.c ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/ping.c
ccc20788c1e5fc973f36df634399c89acb70deaejerenkrantz--- gnome-nettool-2.26.0/src/ping.c 2008-12-10 00:38:44.000000000 +0000
ccc20788c1e5fc973f36df634399c89acb70deaejerenkrantz+++ ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/ping.c 2009-03-27 17:45:30.906813000 +0000
ccc20788c1e5fc973f36df634399c89acb70deaejerenkrantz@@ -93,8 +93,13 @@
273e512f20f262e5e2aa8e0e83371d1929fb76adjkaluza while (nodeavailable) {
273e512f20f262e5e2aa8e0e83371d1929fb76adjkaluza gtk_tree_model_get (results, &node,
273e512f20f262e5e2aa8e0e83371d1929fb76adjkaluza ICMP_SEQ_COLUMN, &seqnumber, -1);
efe780dcf13b2b95effabf897d694d8f23feac74trawick+#if defined(sun)
fe83f60b41477b14a37edcfcd1f7f5c5a1ebfe44minfrin+ index = seqnumber - rangemin;
fe83f60b41477b14a37edcfcd1f7f5c5a1ebfe44minfrin+ if (seqnumber >= rangemin) {
993d1261a278d7322bccef219101220b7b4fb8c5jkaluza index = seqnumber - rangemin - 1;
993d1261a278d7322bccef219101220b7b4fb8c5jkaluza if (seqnumber > rangemin) {
ba050a6f942b9fa0e81ed73437588005c569655ccovener gtk_tree_model_get (results, &node,
ba050a6f942b9fa0e81ed73437588005c569655ccovener SRTT_COLUMN, &srtt_str,
ba050a6f942b9fa0e81ed73437588005c569655ccovener@@ -193,8 +198,13 @@
135ddda3a989215d2bedbcf1529bfb269c3eda23niq draw_centered_text (widget, x, line1h, tmpstr);
135ddda3a989215d2bedbcf1529bfb269c3eda23niq g_free (tmpstr);
001a44c352f89c9ec332ffd3e0a6927dcd19432chumbedooh+#if defined(sun)
001a44c352f89c9ec332ffd3e0a6927dcd19432chumbedooh+ if (index + rangemin <= rangemax) {
001a44c352f89c9ec332ffd3e0a6927dcd19432chumbedooh+ tmpstr = g_strdup_printf ("%d", index + rangemin);
793214f67dede32edfd9ee96c664ead04d175cbbjfclere if (index + rangemin + 1 <= rangemax) {
cc5a4a08dc9783fcbc52ce86f11e01c281a43810minfrin tmpstr = g_strdup_printf ("%d", index + rangemin + 1);
9b0076ddd1103e5fa9c1f9bafde4b06ce244fbaecovener tmpstr = g_strdup ("-");
249d09d51808cb7981af99762c3b3736ca126cd5jkaluza@@ -294,7 +304,11 @@
249d09d51808cb7981af99762c3b3736ca126cd5jkaluza program = util_find_program_dialog ("ping", parent);
56589be3d7a3e9343370df240010c6928cc78b39jkaluza+#if defined(sun)
56589be3d7a3e9343370df240010c6928cc78b39jkaluza+ program = util_find_program_dialog ("ping", parent);
77ca16c5676da23155311e13cee61e7eaba9fa3ejailletc program = util_find_program_dialog ("ping6", parent);
f87299dab99bc04b51a6b8cad51b6795db862c0atrawick@@ -308,7 +322,7 @@
4d12805e6c18253040223ea637acd6b3b3c18f60jorton if (count == -1) {
4d12805e6c18253040223ea637acd6b3b3c18f60jorton count_string = g_strdup_printf(" ");
85eacfc96a04547ef25aabbc06440039715084c2jorton-#if defined(__sun__) || defined(__hpux__)
85eacfc96a04547ef25aabbc06440039715084c2jorton+#if defined(sun) || defined(__hpux__)
e5d909f2b06bd880fb3675cd49363df981caa631trawick count_string = g_strdup_printf("%d", count);
a4df2cd1e1391575a327c2a90ba4315f805a0a78covener count_string = g_strdup_printf(" -c %d ", count);
a4df2cd1e1391575a327c2a90ba4315f805a0a78covener@@ -317,7 +331,7 @@
cb666b29f81df1d11d65002250153353568021fccovener if (ip_version == IPV4) {
6a80c3c6f4b8ea7ba5e89402b8b779b09ce020e0covener-#if defined(__sun__) || defined(__hpux__)
1c2cab00d988fc48cbe59032cf76cc0bab20d6f7covener+#if defined(__hpux__) || defined(sun)
6a80c3c6f4b8ea7ba5e89402b8b779b09ce020e0covener g_strdup_printf (PING_PROGRAM_FORMAT, program,
75a230a728338d84dcfe81edd375352f34de22d0covener host, count_string);
75a230a728338d84dcfe81edd375352f34de22d0covener@@ -326,7 +340,7 @@
63a5ea80bddcc84a462e40f402b4f330e0e05411covener-#if defined(__sun__) || defined(__hpux__)
63a5ea80bddcc84a462e40f402b4f330e0e05411covener+#if defined(sun) || defined(__hpux__)
63a5ea80bddcc84a462e40f402b4f330e0e05411covener g_strdup_printf (PING_PROGRAM_FORMAT_6, program,
63a5ea80bddcc84a462e40f402b4f330e0e05411covener host, count_string);
65a4e663b82f8bce28ac22ab2edfd7502de36998sfdiff -urN gnome-nettool-2.26.0/src/ping.h ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/ping.h
65a4e663b82f8bce28ac22ab2edfd7502de36998sf--- gnome-nettool-2.26.0/src/ping.h 2008-12-10 00:38:44.000000000 +0000
65a4e663b82f8bce28ac22ab2edfd7502de36998sf+++ ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/ping.h 2009-03-27 17:44:23.407006000 +0000
c7de1955eb0eaeabf7042902476397692672d549sf@@ -36,11 +36,11 @@
74e7f6c55fd67b10cb400b3f6d1dc718a303d944minfrin # define PING_PROGRAM_FORMAT_6 "%s ping6%s-n %s"
74e7f6c55fd67b10cb400b3f6d1dc718a303d944minfrin # define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
74e7f6c55fd67b10cb400b3f6d1dc718a303d944minfrin # define PING_PARAMS_6
74e7f6c55fd67b10cb400b3f6d1dc718a303d944minfrin-#elif defined(__sun__)
a511a29faf2ff7ead3b67680154a624effb31aafminfrin+#elif defined(sun)
a511a29faf2ff7ead3b67680154a624effb31aafminfrin /* <path to program> ping -s -n <host> [<count>] */
a511a29faf2ff7ead3b67680154a624effb31aafminfrin-# define PING_PROGRAM_FORMAT "%s ping -s -n %s 56%s"
a511a29faf2ff7ead3b67680154a624effb31aafminfrin-# define PING_PROGRAM_FORMAT_6 "%s ping -s -A inet6 -a -n %s 56%s"
a511a29faf2ff7ead3b67680154a624effb31aafminfrin-# define PING_FORMAT "%d bytes from %s icmp_seq=%d. time=%f %s"
63921358ef93fcb41bc71d9894221ba3d7fbb87bminfrin+# define PING_PROGRAM_FORMAT "%s ping -s -n %s 56 %s"
63921358ef93fcb41bc71d9894221ba3d7fbb87bminfrin+# define PING_PROGRAM_FORMAT_6 "%s ping -s -A inet6 -a -n %s 56 %s"
63921358ef93fcb41bc71d9894221ba3d7fbb87bminfrin+# define PING_FORMAT "%d bytes from %s icmp_seq=%d. time=%s %s"
deec48c67d4786bc77112ffbf3a4e70b931097edminfrin # define PING_PARAMS_5
6d601599d3d65df0410eae6e573e75b2dbfb1fb4minfrin #elif defined(__hpux__)
6d601599d3d65df0410eae6e573e75b2dbfb1fb4minfrin # define PING_PROGRAM_FORMAT "%s ping %s -n%s"
6d601599d3d65df0410eae6e573e75b2dbfb1fb4minfrindiff -urN gnome-nettool-2.26.0/src/utils.h ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/utils.h
6d601599d3d65df0410eae6e573e75b2dbfb1fb4minfrin--- gnome-nettool-2.26.0/src/utils.h 2008-12-08 15:35:27.000000000 +0000
684e0cfc200f66287a93bbd1708d1dd8a92a7eefcovener+++ ../SUNWgnome-nettool-2.26.0.hacked/gnome-nettool-2.26.0/src/utils.h 2009-03-27 17:44:23.407754000 +0000
684e0cfc200f66287a93bbd1708d1dd8a92a7eefcovener@@ -29,6 +29,10 @@
5c43d2fb853f84497b5ece2d414ef9484aa87e5fsf # include <config.h>
ef82e8fa164e0a1f8b813f7deb6b7ead96018c94niq+#define gethostbyname2(name, domain) getipnodebyname((name), (domain), 0, &g_n_err_macro)
26c5829347f6a355c00f1ba0301d575056b69536niq+int g_n_err_macro;
ef82e8fa164e0a1f8b813f7deb6b7ead96018c94niq #if (GLIB_MINOR_VERSION < 2)
ef82e8fa164e0a1f8b813f7deb6b7ead96018c94niq # define _g_vsprintf vsprintf