diff options
Diffstat (limited to 'net/gnome-nettool/files/patch-src_info.c')
| -rw-r--r-- | net/gnome-nettool/files/patch-src_info.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/net/gnome-nettool/files/patch-src_info.c b/net/gnome-nettool/files/patch-src_info.c index 2d95d26204ac..9b895e8fd67f 100644 --- a/net/gnome-nettool/files/patch-src_info.c +++ b/net/gnome-nettool/files/patch-src_info.c @@ -1,14 +1,15 @@ ---- src/info.c.orig Tue Feb 1 06:05:58 2005 -+++ src/info.c Thu Mar 3 23:39:57 2005 -@@ -20,6 +20,7 @@ +--- src/info.c.orig Thu Jan 27 18:26:53 2005 ++++ src/info.c Sun Jul 3 17:46:31 2005 +@@ -20,6 +20,8 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gprintf.h> +#include <sys/types.h> ++#include <string.h> #ifdef HAVE_CONFIG_H # include <config.h> -@@ -38,6 +39,11 @@ +@@ -38,6 +40,11 @@ #include <sys/ioctl.h> #include <stdlib.h> #include <net/if.h> @@ -20,7 +21,7 @@ #include "info.h" #include "utils.h" -@@ -58,6 +64,7 @@ +@@ -58,6 +65,7 @@ static InfoInterfaceDescription info_ifa { N_("Ethernet Interface"), INFO_INTERFACE_ETH, "16_ethernet.xpm", "eth", NULL }, { N_("Wireless Interface"), INFO_INTERFACE_WLAN, "wavelan-16.png", "wlan", NULL }, { N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "ppp", NULL }, @@ -28,7 +29,7 @@ { N_("Parallel Line Interface"), INFO_INTERFACE_PLIP, "16_plip.xpm", "plip", NULL }, { N_("Infrared Interface"), INFO_INTERFACE_IRLAN, "irda-16.png", "irlan", NULL }, { N_("Loopback Interface"), INFO_INTERFACE_LO, "16_loopback.xpm", "lo", NULL }, -@@ -128,9 +135,42 @@ +@@ -128,9 +136,42 @@ info_get_interface_from_dev_name (const { gint i; gchar *path; @@ -73,7 +74,7 @@ (*iface) = g_strdup_printf ("%s (%s)", info_iface_desc[i].name, dev_name); if (info_iface_desc[i].pixbuf == NULL) { path = g_build_filename (PIXMAPS_DIR, info_iface_desc[i].icon, NULL); -@@ -217,38 +257,87 @@ +@@ -217,38 +258,87 @@ info_nic_update_stats (gpointer data) gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10]; */ gchar iface[30]; /*, flags[30]; */ @@ -167,7 +168,7 @@ if (g_ascii_strcasecmp (iface, text) == 0) { /* -@@ -276,7 +365,9 @@ +@@ -276,7 +366,9 @@ info_nic_update_stats (gpointer data) } g_io_channel_unref (io); @@ -178,7 +179,7 @@ return TRUE; } -@@ -405,8 +496,16 @@ +@@ -405,8 +497,16 @@ info_get_nic_information (const gchar *n InfoIpAddr *ip; gint flags; mii_data_result data; @@ -195,7 +196,7 @@ for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) { if (strcmp (ifr6->ifa_name, nic) != 0) { -@@ -452,7 +551,9 @@ +@@ -452,7 +552,9 @@ info_get_nic_information (const gchar *n ifc.ifc_req = (struct ifreq *) buf; ioctl (sockfd, SIOCGIFCONF, &ifc); @@ -205,7 +206,7 @@ for (ptr = buf; ptr < buf + ifc.ifc_len;) { ifr = (struct ifreq *) ptr; -@@ -483,6 +584,45 @@ +@@ -483,6 +585,45 @@ info_get_nic_information (const gchar *n (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[3], (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[4], (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[5]); |