summaryrefslogtreecommitdiffstats
path: root/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
blob: 5ffcd32f501a5550c7f3119e8ca18292cdf23ce1 (plain) (blame)
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
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
--- src/netstatus-sysdeps.c.orig    2007-02-13 04:39:19.000000000 -0500
+++ src/netstatus-sysdeps.c 2007-07-29 13:14:34.000000000 -0400
@@ -37,13 +37,26 @@
 
 #ifdef __FreeBSD__
 #include <sys/types.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <ifaddrs.h>
 #include <net/if.h>
+#include <net/if_media.h>
 #include <net/if_var.h>
+#if __FreeBSD_version < 700046
 #include <dev/an/if_aironet_ieee.h>
 #include <dev/wi/if_wavelan_ieee.h>
 #endif
+#if __FreeBSD_version >= 602000
+#include <net80211/ieee80211.h>
+#include <net80211/ieee80211_ioctl.h>
+#endif
+#include <stdlib.h>
+#ifndef IEEE80211_ADDR_COPY
+#define IEEE80211_ADDR_COPY(dst, src)   memcpy(dst, src, IEEE80211_ADDR_LEN)
+#endif
+#endif
 
 static inline gboolean
 parse_stats (char    *buf,
@@ -426,15 +439,16 @@ wireless_getval (const char      *iface,
   return TRUE;
 }
 
+#if __FreeBSD_version < 700046
 static inline char *
 get_an_data (const char *iface,
         int        *signal_strength)
 {
+  struct an_ltv_status *sts;
+  struct an_req         areq;
 #ifdef AN_RID_RSSI_MAP
   struct an_ltv_rssi_map  an_rssimap;
 #endif
-  struct an_req         areq;
-  struct an_ltv_status *sts;
   int                   level;
   char                 *error = NULL;
   gboolean              rssimap_valid = FALSE;
@@ -486,11 +500,11 @@ get_wi_data (const char *iface,
   level = (int) wreq.wi_val[1];
 
 #ifdef WI_RID_READ_APS
-  if (signal_strength <= 0)
+  if (level <= 0)
     {
       /* we fail to get signal strength by usual means, try another way */
       static time_t   last_scan;
-      static long int cached;
+      static int cached;
       time_t          now;
 
       now = time (NULL);
@@ -510,15 +524,15 @@ get_wi_data (const char *iface,
           if (nstations > 0)
        {
               w = (struct wi_apinfo *)(((char *) &wreq.wi_val) + sizeof (int));
-              signal_strength = (long int) w->signal;
+              level = w->signal;
             }
 
-            cached = signal_strength;
+            cached = level;
             last_scan = now;
           }
         else
      {
-            signal_strength = cached;
+            level = cached;
           }
     }
 #endif
@@ -527,6 +541,77 @@ get_wi_data (const char *iface,
 
   return error;
 }
+#endif
+
+#if __FreeBSD_version >= 602000
+static inline char *
+get_net80211_data (const char *iface,
+          int        *signal_strength)
+{
+  struct ieee80211req_sta_info *si;
+  struct ieee80211req           ireq;
+  int                           level;
+  int                           s;
+  uint8_t                       mac[IEEE80211_ADDR_LEN];
+  int8_t                        noise;
+  char                         *error = NULL;
+  union {
+    struct ieee80211req_sta_req info;
+    char buf[1024];
+  } u_info;
+
+  memset (&u_info, 0, sizeof (u_info));
+  memset (&ireq, 0, sizeof (ireq));
+
+  strlcpy (ireq.i_name, iface, sizeof (ireq.i_name));
+  ireq.i_type = IEEE80211_IOC_BSSID;
+  ireq.i_data = mac;
+  ireq.i_len = IEEE80211_ADDR_LEN;
+
+  s = socket (AF_INET, SOCK_DGRAM, 0);
+  if (s == -1)
+    {
+      error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface);
+      return error;
+    }
+
+  if (ioctl (s, SIOCG80211, &ireq) == -1)
+    {
+      error = g_strdup_printf (_("Could not get MAC for interface, '%s'"), iface);
+      close (s);
+      return error;
+    }
+
+  IEEE80211_ADDR_COPY (u_info.info.is_u.macaddr, mac);
+  ireq.i_type = IEEE80211_IOC_STA_INFO;
+  ireq.i_data = (caddr_t) &u_info;
+  ireq.i_len = sizeof (u_info);
+
+  if (ioctl (s, SIOCG80211, &ireq) == -1)
+    {
+      error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface);
+      close (s);
+      return error;
+    }
+
+  close (s);
+
+  si = &u_info.info.info[0];
+  noise = si->isi_noise;
+  if (si->isi_rssi == 0)
+    level = 0;
+  else
+    {
+      if (noise == 0)
+        noise = -95;
+      level = (int) abs (rint ((si->isi_rssi / (si->isi_rssi/2. + noise)) * 100.0));
+      level = CLAMP (level, 0, 100);
+    }
+
+  memcpy (signal_strength, &level, sizeof (signal_strength));
+  return error;
+}
+#endif
 
 char *
 netstatus_sysdeps_read_iface_wireless_details (const char *iface,
@@ -548,21 +633,44 @@ netstatus_sysdeps_read_iface_wireless_de
       g_strncasecmp (iface, "wi",   2) &&
       g_strncasecmp (iface, "ath",  3) &&
       g_strncasecmp (iface, "ndis", 4) &&
+      g_strncasecmp (iface, "ural", 4) &&
+      g_strncasecmp (iface, "ral",  3) &&
       g_strncasecmp (iface, "ipw",  3) &&
       g_strncasecmp (iface, "iwi",  3) &&
+      g_strncasecmp (iface, "rum",  3) &&
+      g_strncasecmp (iface, "ray",  3) &&
       g_strncasecmp (iface, "acx",  3))
     return error_message;
 
+#if __FreeBSD_version < 700046
   if (g_strncasecmp (iface, "an", 2) == 0)
     {
       error_message = get_an_data (iface, signal_strength);
       *is_wireless = TRUE;
     }
+#endif
+#if __FreeBSD_version >= 602000
+#if __FreeBSD_version < 700046
+  else if (g_strncasecmp (iface, "wi", 2) == 0)
+    {
+      error_message = get_wi_data (iface, signal_strength);
+      *is_wireless = TRUE;
+    }
+  else
+#endif
+    {
+      error_message = get_net80211_data (iface, signal_strength);
+      *is_wireless = TRUE;
+    }
+#else
+#if __FreeBSD_version < 700046
   else
     {
       error_message = get_wi_data (iface, signal_strength);
       *is_wireless = TRUE;
     }
+#endif
+#endif
 
   return error_message;
 }