190418a078
The release notes can be found at http://www.gnome.org/start/2.10/notes/rnwhatsnew.html, and will give you a good idea of what has gone into this release overall. However, a lot of FreeBSD specific additions and fixes have been made. For example, this release offers fixed ACPI support as well as new CPU freqeuncy monitoring support. See the FreeBSD GNOME 2.10 upgrade page at http://www.FreeBSD.org/gnome/docs/faq210.html for the entire list as well as a list of known issues and upgrade instructions. GNOME 2.10, as well as all of our releases, would not be possible without the great team that goes into porting and testign each and every component. Thanks definitely goes out to ahze, adamw, bland, kwm, mezz, and pav for all their work. We would also like to thank our adventurous users that chose to ride the walrus. We'd especially like to thank the following users that provided patches for GNOME 2.10: ade Yasuda Keisuke Franz Klammer Khairil Yusof Radek Kozlowsk And anyone else I may have accidentally omitted. As with GNOME 2.8, 2.10 comes with a brand-spankin' new splashscreen courtesy of Franz Klammer. However, unlike GNOME 2.8, we've included all of the FreeBSD GNOME splashscreen entries with gnomesession. You can use the deskutils/splashsetter port to choose the one you like best. As always, GNOME users should _not_ use portupgrade alone to upgrade to 2.10. Instead, get the gnome_upgrade.sh script from http://www.FreeBSD.org/gnome/gnome_upgrade.sh. Enjoy!
252 lines
6.5 KiB
C
252 lines
6.5 KiB
C
--- src/netstatus-sysdeps.c.orig Fri Jul 30 04:21:30 2004
|
|
+++ src/netstatus-sysdeps.c Thu Mar 3 03:04:41 2005
|
|
@@ -35,6 +35,16 @@
|
|
#include <glib.h>
|
|
#include <libgnome/gnome-i18n.h>
|
|
|
|
+#ifdef __FreeBSD__
|
|
+#include <sys/types.h>
|
|
+#include <sys/socket.h>
|
|
+#include <sys/ioctl.h>
|
|
+#include <net/if.h>
|
|
+#include <net/if_var.h>
|
|
+#include <dev/an/if_aironet_ieee.h>
|
|
+#include <dev/wi/if_wavelan_ieee.h>
|
|
+#endif
|
|
+
|
|
static inline gboolean
|
|
parse_stats (char *buf,
|
|
int prx_idx,
|
|
@@ -384,6 +394,173 @@
|
|
}
|
|
}
|
|
|
|
+static inline gboolean
|
|
+wireless_getval (const char *iface,
|
|
+ gpointer req,
|
|
+ unsigned long req_type,
|
|
+ char **error)
|
|
+{
|
|
+ struct ifreq ifr;
|
|
+ int s;
|
|
+
|
|
+ memset (&ifr, 0, sizeof (ifr));
|
|
+
|
|
+ strlcpy (ifr.ifr_name, iface, sizeof (ifr.ifr_name));
|
|
+ ifr.ifr_data = (caddr_t) req;
|
|
+
|
|
+ s = socket (AF_INET, SOCK_DGRAM, 0);
|
|
+
|
|
+ if (s == -1)
|
|
+ {
|
|
+ *error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface);
|
|
+ return FALSE;
|
|
+ }
|
|
+
|
|
+ if (ioctl (s, req_type, &ifr) == -1)
|
|
+ {
|
|
+ *error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface);
|
|
+ close (s);
|
|
+ return FALSE;
|
|
+ }
|
|
+
|
|
+ close (s);
|
|
+ return TRUE;
|
|
+}
|
|
+
|
|
+static inline char*
|
|
+get_an_data (const char *iface,
|
|
+ int *signal_strength)
|
|
+{
|
|
+ struct an_req areq;
|
|
+ struct an_ltv_status *sts;
|
|
+#ifdef AN_RID_RSSI_MAP
|
|
+ struct an_ltv_rssi_map an_rssimap;
|
|
+#endif
|
|
+ int level;
|
|
+ char *error = NULL;
|
|
+ gboolean rssimap_valid = FALSE;
|
|
+
|
|
+#ifdef AN_RID_RSSI_MAP
|
|
+ an_rssimap.an_len = sizeof (an_rssimap);
|
|
+ an_rssimap.an_type = AN_RID_RSSI_MAP;
|
|
+ rssimap_valid = wireless_getval (iface, (gpointer) &an_rssimap, SIOCGAIRONET, &error);
|
|
+#endif
|
|
+
|
|
+ areq.an_len = sizeof (areq);
|
|
+ areq.an_type = AN_RID_STATUS;
|
|
+
|
|
+ if (!wireless_getval (iface, (gpointer) &areq, SIOCGAIRONET, &error))
|
|
+ return error;
|
|
+
|
|
+ sts = (struct an_ltv_status *)&areq;
|
|
+#ifdef AN_RID_RSSI_MAP
|
|
+ if (rssimap_valid)
|
|
+ level = (int) (an_rssimap.an_entries[sts->an_normalized_strength].an_rss_pct);
|
|
+ else
|
|
+ level = (int) (sts->an_normalized_strength);
|
|
+#else
|
|
+ level = (int) (sts->an_normalized_rssi);
|
|
+#endif
|
|
+ memcpy (signal_strength, &level, sizeof (signal_strength));
|
|
+
|
|
+ return error;
|
|
+}
|
|
+
|
|
+static inline char*
|
|
+get_wi_data (const char *iface,
|
|
+ int *signal_strength)
|
|
+{
|
|
+ struct wi_req wreq;
|
|
+ int level;
|
|
+ char *error = NULL;
|
|
+
|
|
+ memset (&wreq, 0, sizeof (wreq));
|
|
+
|
|
+ wreq.wi_len = WI_MAX_DATALEN;
|
|
+ wreq.wi_type = WI_RID_COMMS_QUALITY;
|
|
+
|
|
+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error))
|
|
+ return error;
|
|
+
|
|
+ level = (int) (wreq.wi_val[1]);
|
|
+
|
|
+#ifdef WI_RID_READ_APS
|
|
+ if (signal_strength <= 0)
|
|
+ {
|
|
+ /* we fail to get signal strength by usual means, try another way */
|
|
+ static time_t last_scan;
|
|
+ static long int cached;
|
|
+ time_t now = time (NULL);
|
|
+
|
|
+ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */
|
|
+ if (now > last_scan + 5)
|
|
+ {
|
|
+ struct wi_apinfo *w;
|
|
+ int nstations;
|
|
+
|
|
+ bzero ((char *)&wreq, sizeof(wreq));
|
|
+ wreq.wi_len = WI_MAX_DATALEN;
|
|
+ wreq.wi_type = WI_RID_READ_APS;
|
|
+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error))
|
|
+ return error;
|
|
+ nstations = *(int *)wreq.wi_val;
|
|
+ if (nstations > 0)
|
|
+ {
|
|
+ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int));
|
|
+ signal_strength = (long int)w->signal;
|
|
+ }
|
|
+
|
|
+ cached = signal_strength;
|
|
+ last_scan = now;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ signal_strength = cached;
|
|
+ }
|
|
+ }
|
|
+#endif
|
|
+
|
|
+ memcpy (signal_strength, &level, sizeof (signal_strength));
|
|
+
|
|
+ return error;
|
|
+}
|
|
+
|
|
+char *
|
|
+netstatus_sysdeps_read_iface_wireless_details (const char *iface,
|
|
+ gboolean *is_wireless,
|
|
+ int *signal_strength)
|
|
+{
|
|
+ char *error_message = NULL;
|
|
+
|
|
+ g_return_val_if_fail (iface != NULL, NULL);
|
|
+ g_return_val_if_fail (is_wireless != NULL, NULL);
|
|
+ g_return_val_if_fail (signal_strength != NULL, NULL);
|
|
+
|
|
+ if (is_wireless)
|
|
+ *is_wireless = FALSE;
|
|
+ if (signal_strength)
|
|
+ *signal_strength = 0;
|
|
+
|
|
+ if (g_strncasecmp (iface, "an", 2) && g_strncasecmp (iface, "wi", 2) &&
|
|
+ g_strncasecmp (iface, "ath", 3) && g_strncasecmp (iface, "ndis", 4) &&
|
|
+ g_strncasecmp (iface, "ipw", 3) && g_strncasecmp (iface, "iwi", 3) &&
|
|
+ g_strncasecmp (iface, "acx", 3))
|
|
+ return error_message;
|
|
+
|
|
+ if (g_strncasecmp (iface, "an", 2) == 0)
|
|
+ {
|
|
+ error_message = get_an_data (iface, signal_strength);
|
|
+ *is_wireless = TRUE;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ error_message = get_wi_data (iface, signal_strength);
|
|
+ *is_wireless = TRUE;
|
|
+ }
|
|
+
|
|
+ return error_message;
|
|
+}
|
|
+
|
|
char *
|
|
netstatus_sysdeps_read_iface_statistics (const char *iface,
|
|
gulong *in_packets,
|
|
@@ -413,11 +590,11 @@
|
|
if (!g_shell_parse_argv (command_line, NULL, &argv, &error))
|
|
{
|
|
error_message = g_strdup_printf (_("Could not parse command line '%s': %s"),
|
|
- command_line,
|
|
- error->message);
|
|
+ command_line,
|
|
+ error->message);
|
|
g_error_free (error);
|
|
g_free (command_line);
|
|
-
|
|
+
|
|
return error_message;
|
|
}
|
|
g_free (command_line);
|
|
@@ -456,8 +633,8 @@
|
|
g_io_channel_read_line (channel, &buf, NULL, NULL, NULL);
|
|
|
|
if (!parse_stats (buf,
|
|
- prx_idx, ptx_idx, in_packets, out_packets,
|
|
- brx_idx, btx_idx, in_bytes, out_bytes))
|
|
+ prx_idx, ptx_idx, in_packets, out_packets,
|
|
+ brx_idx, btx_idx, in_bytes, out_bytes))
|
|
{
|
|
error_message = g_strdup_printf (_("Could not parse interface statistics from '%s'. "
|
|
"prx_idx = %d; ptx_idx = %d; brx_idx = %d; btx_idx = %d;"),
|
|
@@ -477,7 +654,7 @@
|
|
}
|
|
else
|
|
{
|
|
- error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s",
|
|
+ error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s",
|
|
iface, error->message);
|
|
g_error_free (error);
|
|
}
|
|
@@ -485,23 +662,6 @@
|
|
g_strfreev (argv);
|
|
|
|
return error_message;
|
|
-}
|
|
-
|
|
-char *
|
|
-netstatus_sysdeps_read_iface_wireless_details (const char *iface,
|
|
- gboolean *is_wireless,
|
|
- int *signal_strength)
|
|
-{
|
|
- g_return_val_if_fail (iface != NULL, NULL);
|
|
- g_return_val_if_fail (is_wireless != NULL, NULL);
|
|
- g_return_val_if_fail (signal_strength_wireless != NULL, NULL);
|
|
-
|
|
- if (is_wireless)
|
|
- *is_wireless = FALSE;
|
|
- if (signal_strength)
|
|
- *signal_strength = 0;
|
|
-
|
|
- return NULL;
|
|
}
|
|
|
|
#endif /* !defined(__FreeBSD__) */
|