kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
freebsd-ports/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wi__bsd.c
Guido Falsi 74979a9660 - Import upstream patch to fix a memory leak [1] 
- While here rename and regenerate patches

PR:		223937 [1]
Submitted by:	J.R. Oldroyd <fbsd@opal.com>
Obtained from:	https://git.xfce.org/panel-plugins/xfce4-wavelan-plugin/commit/?id=d4c76389d63199636c52e8a7a0ce80d5f2fde591
MFH:		2017Q4
2017-11-30 20:36:35 +00:00

251 lines
7.8 KiB
C
Raw Blame History

--- panel-plugin/wi_bsd.c.orig 2016-05-01 15:53:40 UTC
+++ panel-plugin/wi_bsd.c
@@ -3,6 +3,8 @@
* (OpenBSD support)
* 2008 Pietro Cerutti <gahr@gahr.ch>
* (FreeBSD > 700000 adaptation)
+ * 2014 J.R. Oldroyd <fbsd@opal.com>
+ * (Enhance FreeBSD support)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,14 +28,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if !defined(__FreeBSD_kernel__) && defined(__FreeBSD__)
-#define __FreeBSD_kernel__ __FreeBSD__
-#endif
-#if !defined(__FreeBSD_kernel_version) && defined(__FreeBSD_version)
-#define __FreeBSD_kernel_version __FreeBSD_version
-#endif
+#include <sys/param.h>
-#if defined(__NetBSD__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD_kernel_kernel__) || defined(__OpenBSD__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
#include <sys/types.h>
#include <sys/cdefs.h>
@@ -44,20 +41,14 @@
#include <net/if.h>
#include <net/if_media.h>
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <netinet/in.h>
#include <netinet/if_ether.h>
#include <sys/endian.h>
-#if __FreeBSD_kernel_version >= 700000
#include <sys/types.h>
#include <sys/sysctl.h>
#include <net80211/ieee80211_ioctl.h>
#else
-#include <net/if_var.h>
-#include <net/ethernet.h>
-#include <dev/wi/if_wavelan_ieee.h>
-#endif
-#else
#ifdef __NetBSD__
#include <net80211/ieee80211.h>
#include <net80211/ieee80211_ioctl.h>
@@ -107,14 +98,10 @@ struct wi_device
};
static int _wi_carrier(const struct wi_device *);
-#if defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
static int _wi_vendor(const struct wi_device *, char *, size_t);
-#if __FreeBSD_kernel_version > 700000
static int _wi_getval(const struct wi_device *, struct ieee80211req_scan_result *);
-#else
-static int _wi_getval(const struct wi_device *, struct wi_req *);
#endif
-#endif
static int _wi_netname(const struct wi_device *, char *, size_t);
static int _wi_quality(const struct wi_device *, int *);
static int _wi_rate(const struct wi_device *, int *);
@@ -164,7 +151,7 @@ wi_query(struct wi_device *device, struct wi_stats *st
strlcpy(stats->ws_qunit, "dBm", 4);
#endif
/* check vendor (independent of carrier state) */
-#if defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
if ((result = _wi_vendor(device, stats->ws_vendor, WI_MAXSTRLEN)) != WI_OK)
return(result);
#endif
@@ -305,12 +292,10 @@ _wi_rate(const struct wi_device *device, int *rate)
}
#endif
-/* seems only FreeBSD supports this operation */
-#if defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
static int
_wi_vendor(const struct wi_device *device, char *buffer, size_t len)
{
-#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
/*
* We use sysctl to get a device description
*/
@@ -327,59 +312,30 @@ _wi_vendor(const struct wi_device *device, char *buffe
dev_number = (int)strtol(c, NULL, 10);
*c = '\0';
+ /*
+ * Also, wlan doesn't present dev.wlan.N.%desc, need to use
+ * underlying driver name, instead: dev.ath.0.%desc, so we
+ * need to get the parent's name.
+ */
+ if(strcmp(dev_name, "wlan") == 0) {
+ snprintf(mib, sizeof(mib), "net.%s.%d.%%parent", dev_name, dev_number);
+ if(sysctlbyname(mib, dev_name, &len, NULL, 0) == -1)
+ return (WI_NOSUCHDEV);
+
+ c = dev_name;
+ while(!isdigit(*c)) c++;
+ dev_number = (int)strtol(c, NULL, 10);
+ *c = '\0';
+ len = WI_MAXSTRLEN;
+ }
+
snprintf(mib, sizeof(mib), "dev.%s.%d.%%desc", dev_name, dev_number);
if(sysctlbyname(mib, buffer, &len, NULL, 0) == -1)
return (WI_NOSUCHDEV);
-#else
-#define WI_RID_STA_IDENTITY_LUCENT 0x1
-#define WI_RID_STA_IDENTITY_PRISMII 0x2
-#define WI_RID_STA_IDENTITY_SAMSUNG 0x3
-#define WI_RID_STA_IDENTITY_DLINK 0x6
- const char* vendor = "Unknown";
- struct wi_req wr;
- int result;
- bzero((void*)&wr, sizeof(wr));
- wr.wi_len = WI_MAX_DATALEN;
- wr.wi_type = WI_RID_STA_IDENTITY;
-
- if ((result = _wi_getval(device, &wr)) != WI_OK){
- /* For the Atheros, IDENTITY does not work. */
- if (strcmp(device->interface, "ath") != 0)
- return(result);
- }
- else if (wr.wi_len < 4)
- return(WI_NOSUCHDEV);
-
- switch (wr.wi_val[1]) {
- case WI_RID_STA_IDENTITY_LUCENT:
- vendor = "Lucent";
- break;
-
- case WI_RID_STA_IDENTITY_PRISMII:
- vendor = "generic PRISM II";
- break;
-
- case WI_RID_STA_IDENTITY_SAMSUNG:
- vendor = "Samsung";
- break;
- case WI_RID_STA_IDENTITY_DLINK:
- vendor = "D-Link";
- break;
- }
-
- snprintf(buffer, len, "%s (ID %d, version %d.%d)", vendor,
- wr.wi_val[0], wr.wi_val[2], wr.wi_val[3]);
-#endif
-
return(WI_OK);
}
-#endif /* wi_vendor */
-/* NetBSD and FreeBSD 6.x uses old wi_* API */
-#if defined(__NetBSD__) || defined(__FreeBSD_kernel__)
-/* FreeBSD 7.x use its own new iee80211 API */
-#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
static int
_wi_getval(const struct wi_device *device, struct ieee80211req_scan_result *scan)
{
@@ -404,7 +360,9 @@ _wi_getval(const struct wi_device *device, struct ieee
return(WI_OK);
}
-#else
+#endif
+
+#if defined(__NetBSD__)
static int
_wi_getval(const struct wi_device *device, struct wi_req *wr)
{
@@ -420,10 +378,11 @@ _wi_getval(const struct wi_device *device, struct wi_r
return(WI_OK);
}
#endif
+
static int
_wi_netname(const struct wi_device *device, char *buffer, size_t len)
{
-#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
struct ieee80211req ireq;
memset(&ireq, 0, sizeof(ireq));
@@ -434,7 +393,7 @@ _wi_netname(const struct wi_device *device, char *buff
ireq.i_len = len;
if (ioctl(device->socket, SIOCG80211, &ireq) < 0)
return WI_NOSUCHDEV;
-#else
+#elif defined(__NetBSD__)
struct wi_req wr;
int result;
@@ -454,7 +413,7 @@ _wi_netname(const struct wi_device *device, char *buff
static int
_wi_quality(const struct wi_device *device, int *quality)
{
-#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
struct ieee80211req_scan_result req;
int result;
bzero(&req, sizeof(req));
@@ -462,8 +421,16 @@ _wi_quality(const struct wi_device *device, int *quali
if((result = _wi_getval(device, &req)) != WI_OK)
return (result);
- *quality = req.isr_rssi;
-#else
+ /*
+ * FreeBSD's wlan stats:
+ * signal (in dBm) = rssi * 2 + noise;
+ * quality_bars = 4 * (signal - noise);
+ * or
+ * quality_bars = rssi * 8;
+ * but, per wi_query(), above, we need to return strength in dBm, so...
+ */
+ *quality = req.isr_rssi * 2 + req.isr_noise;
+#elif defined(__NetBSD__)
struct wi_req wr;
int result;
@@ -486,7 +453,7 @@ _wi_quality(const struct wi_device *device, int *quali
static int
_wi_rate(const struct wi_device *device, int *rate)
{
-#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
struct ieee80211req_scan_result req;
int result, i, high;
bzero(&req, sizeof(req));
@@ -499,7 +466,7 @@ _wi_rate(const struct wi_device *device, int *rate)
high = req.isr_rates[i] & IEEE80211_RATE_VAL;
*rate = high / 2;
-#else
+#elif defined(__NetBSD__)
struct wi_req wr;
int result;
@@ -516,5 +483,4 @@ _wi_rate(const struct wi_device *device, int *rate)
return(WI_OK);
}
-#endif /* defined(__NetBSD__) || defined(__FreeBSD_kernel__) */
#endif
Reference in a new issue View git blame Copy permalink