aboutsummaryrefslogtreecommitdiff
path: root/net/gnome-netstatus
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2007-07-04 21:41:09 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2007-07-04 21:41:09 +0000
commitc055f7bb53d7a13dd5734f761041a7c281d4e33d (patch)
tree246d9b0b09868fb25c2e323ec718dd607d8f2ea8 /net/gnome-netstatus
parentf1e8f4b56c27814923b50b4f88792caf2deb4690 (diff)
downloadports-c055f7bb53d7a13dd5734f761041a7c281d4e33d.tar.gz
ports-c055f7bb53d7a13dd5734f761041a7c281d4e33d.zip
Notes
Diffstat (limited to 'net/gnome-netstatus')
-rw-r--r--net/gnome-netstatus/Makefile2
-rw-r--r--net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c52
2 files changed, 35 insertions, 19 deletions
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 260f544fcbd3..2f3e70cd5629 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-netstatus
PORTVERSION= 2.12.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.12
diff --git a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
index 200ed74f9c01..a8402931747e 100644
--- a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
+++ b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
@@ -1,6 +1,6 @@
---- src/netstatus-sysdeps.c.orig 2007-02-13 04:39:19.000000000 -0500
-+++ src/netstatus-sysdeps.c 2007-07-01 13:59:34.000000000 -0400
-@@ -37,12 +37,21 @@
+--- src/netstatus-sysdeps.c.orig Tue Feb 13 04:39:19 2007
++++ src/netstatus-sysdeps.c Wed Jul 4 17:39:14 2007
+@@ -37,12 +37,23 @@
#ifdef __FreeBSD__
#include <sys/types.h>
@@ -13,8 +13,10 @@
#include <net/if_var.h>
#include <dev/an/if_aironet_ieee.h>
#include <dev/wi/if_wavelan_ieee.h>
++#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)
@@ -22,7 +24,7 @@
#endif
static inline gboolean
-@@ -430,11 +439,11 @@ static inline char *
+@@ -430,11 +441,11 @@ static inline char *
get_an_data (const char *iface,
int *signal_strength)
{
@@ -36,7 +38,7 @@
int level;
char *error = NULL;
gboolean rssimap_valid = FALSE;
-@@ -486,11 +495,11 @@ get_wi_data (const char *iface,
+@@ -486,11 +497,11 @@ get_wi_data (const char *iface,
level = (int) wreq.wi_val[1];
#ifdef WI_RID_READ_APS
@@ -50,7 +52,7 @@
time_t now;
now = time (NULL);
-@@ -510,15 +519,15 @@ get_wi_data (const char *iface,
+@@ -510,15 +521,15 @@ get_wi_data (const char *iface,
if (nstations > 0)
{
w = (struct wi_apinfo *)(((char *) &wreq.wi_val) + sizeof (int));
@@ -69,10 +71,11 @@
}
}
#endif
-@@ -528,6 +537,69 @@ get_wi_data (const char *iface,
+@@ -528,6 +539,76 @@ get_wi_data (const char *iface,
return error;
}
++#if __FreeBSD_version >= 602000
+static inline char *
+get_net80211_data (const char *iface,
+ int *signal_strength)
@@ -127,19 +130,25 @@
+
+ si = &u_info.info.info[0];
+ noise = si->isi_noise;
-+ if (noise == 0)
-+ noise = -95;
-+ level = (int) abs (rint ((si->isi_rssi / (si->isi_rssi/2. + noise)) * 100.0));
-+ level = CLAMP (level, 0, 100);
++ 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,
gboolean *is_wireless,
-@@ -548,8 +620,12 @@ netstatus_sysdeps_read_iface_wireless_de
+@@ -548,8 +629,12 @@ netstatus_sysdeps_read_iface_wireless_de
g_strncasecmp (iface, "wi", 2) &&
g_strncasecmp (iface, "ath", 3) &&
g_strncasecmp (iface, "ndis", 4) &&
@@ -152,21 +161,28 @@
g_strncasecmp (iface, "acx", 3))
return error_message;
-@@ -558,11 +634,16 @@ netstatus_sysdeps_read_iface_wireless_de
+@@ -558,11 +643,24 @@ netstatus_sysdeps_read_iface_wireless_de
error_message = get_an_data (iface, signal_strength);
*is_wireless = TRUE;
}
-- else
++#if __FreeBSD_version >= 602000
+ else if (g_strncasecmp (iface, "wi", 2) == 0)
- {
- error_message = get_wi_data (iface, signal_strength);
- *is_wireless = TRUE;
- }
++ {
++ error_message = get_wi_data (iface, signal_strength);
++ *is_wireless = TRUE;
++ }
+ else
+ {
+ error_message = get_net80211_data (iface, signal_strength);
+ *is_wireless = TRUE;
+ }
++#else
+ else
+ {
+ error_message = get_wi_data (iface, signal_strength);
+ *is_wireless = TRUE;
+ }
++#endif
return error_message;
}