From 58406bee8938178fc317574c4236434b0dd11a25 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sun, 7 Nov 2004 22:24:32 +0000 Subject: Presenting GNOME 2.8 for FreeBSD (2.8.1 to be exact). This release notes detailing all of the new goodies in GNOME 2.8 can be found at http://www.gnome.org/start/2.8/notes/, and the list of what was fixed in GNOME 2.8.1 can be found at http://lists.gnome.org/archives/gnome-announce-list/2004-October/msg00056.html. This release, as well as all of our others, would not have been possible without the great efforts of our FreeBSD GNOME Team. The list of current members can be found at http://www.freebsd.org/gnome/contact.html (including our newest member, Michael Johnson ). Special thanks also goes out to all of the loyal FreeBSD GNOME users that put up with crashes and hangs to test and debug GNOME on FreeBSD. We would especially like to thank those users that provided patches for GNOME 2.7 and 2.8: Franz Klammer Piotr Smyrak Radek Kozlowski Khairil Yusof Yasuda Keisuke Tom McLaughlin Vladimir Grebenschikov GNOME 2.8 also features a new, FreeBSD-specific splashscreen that was designed by jimmac for GNOME 2.8, then daemonized by Franz Klammer and Radek Kozlowski . As with GNOME 2.6, you cannot just "portupgrade" to GNOME 2.8. There is a script provided at http://www.marcuscom.com/downloads/gnome_upgrade28.sh that will aid in the upgrade process. Full documentation on the GNOME 2.8 upgrade is coming following this commit. From all of us at FreeBSD GNOME, ENJOY! --- .../files/patch-src_netstatus-sysdeps.c | 207 +++++++++++++++++++++ 1 file changed, 207 insertions(+) create mode 100644 net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c (limited to 'net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c') diff --git a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c new file mode 100644 index 000000000000..a13a23161769 --- /dev/null +++ b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c @@ -0,0 +1,207 @@ +--- src/netstatus-sysdeps.c.orig Fri Jul 30 04:19:31 2004 ++++ src/netstatus-sysdeps.c Tue Sep 21 00:27:19 2004 +@@ -35,6 +35,16 @@ + #include + #include + ++#ifdef __FreeBSD__ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#endif ++ + static inline gboolean + parse_stats (char *buf, + int prx_idx, +@@ -384,6 +394,163 @@ + } + } + ++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)) ++ 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, +@@ -485,23 +652,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__) */ -- cgit v1.2.3