1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
--- gnome-netinfo/info.c.orig Thu Mar 20 15:04:48 2003
+++ gnome-netinfo/info.c Sat Jun 28 20:45:20 2003
@@ -26,6 +26,10 @@
#endif
+#ifdef __FreeBSD__
+# include <netinet/in.h>
+#endif
+
#include <sys/socket.h> /* basic socket definitions */
#include <arpa/inet.h> /* inet(3) functions */
#include <sys/un.h> /* for Unix domain sockets */
@@ -124,7 +128,7 @@
gint flags;
gboolean loopback;
- sockfd = socket (AF_INET, SOCK_DGRAM, 0);
+ sockfd = socket (AF_INET, SOCK_STREAM, 0);
ifc.ifc_len = sizeof (buf);
ifc.ifc_req = (struct ifreq *) buf;
@@ -133,13 +137,13 @@
for (ptr = buf; ptr < buf + ifc.ifc_len;) {
ifr = (struct ifreq *) ptr;
len = sizeof (struct sockaddr);
-#ifdef HAVE_SOCKADDR_SA_LEN
+#if defined(HAVE_SOCKADDR_SA_LEN) || defined(__FreeBSD__)
if (ifr->ifr_addr.sa_len > len)
len = ifr->ifr_addr.sa_len; /* length > 16 */
#endif
ptr += sizeof (ifr->ifr_name) + len; /* for next one in buffer */
- if (strcmp (ifr->ifr_name, nic) != 0) {
+ if (strcmp (ifr->ifr_name, nic) != 0 || ifr->ifr_addr.sa_family != AF_INET) {
continue;
}
@@ -149,10 +153,10 @@
/* Get the IPv4 address */
sinptr = (struct sockaddr_in *) &ifr->ifr_addr;
inet_ntop (AF_INET, &sinptr->sin_addr, dst, INFO_ADDRSTRLEN);
-
+
gtk_label_set_text (GTK_LABEL (info->ip_address), dst);
bzero (dst, INFO_ADDRSTRLEN);
-
+
ifrcopy = *ifr;
flags = ifrcopy.ifr_flags;
@@ -255,7 +259,7 @@
break;
}
}
- g_free (ifr);
+/* g_free (ifr);*/
}
GList *
@@ -269,8 +273,10 @@
struct ifreq *ifr;
int sockfd, len;
- sockfd = socket (AF_INET, SOCK_DGRAM, 0);
+ sockfd = socket (AF_INET, SOCK_STREAM, 0);
+ bzero (&ifc, sizeof (struct ifconf));
+ bzero (&buf, sizeof (buf));
ifc.ifc_len = sizeof (buf);
ifc.ifc_req = (struct ifreq *) buf;
@@ -281,9 +287,11 @@
len = sizeof (struct sockaddr);
iface = g_strdup (ifr->ifr_name);
- items = g_list_append (items, iface);
+ if (g_list_find_custom (items, iface, (GCompareFunc) g_ascii_strcasecmp) == NULL) {
+ items = g_list_append (items, iface);
+ }
-#ifdef HAVE_SOCKADDR_SA_LEN
+#if defined(HAVE_SOCKADDR_SA_LEN) || defined(__FreeBSD__)
if (ifr->ifr_addr.sa_len > len)
len = ifr->ifr_addr.sa_len; /* length > 16 */
#endif
|
