Bug 514626 - [10.6] Wi-Fi monitor doesn't work on Mac 10.6. r=josh

netwerk/wifi/src/Makefile.in

@@ -52,7 +52,8 @@ CPPSRCS	=	nsWifiMonitor.cpp \
 		$(NULL)
 
 ifeq ($(OS_ARCH),Darwin)
-CPPSRCS	+= nsWifiScannerMac.cpp
+CPPSRCS += nsWifiScannerMac.cpp
+CMMSRCS = osx_corewlan.mm
 else
 ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
 CPPSRCS	+= nsWifiScannerWin.cpp

netwerk/wifi/src/nsWifiAccessPoint.h

@@ -65,16 +65,17 @@ public:
     mSignal = signal;
   };
 
-  void setMac(const uint8 mac_as_int[6])
+  void setMac(const unsigned char mac_as_int[6])
   {
     // mac_as_int is big-endian. Write in byte chunks.
     // Format is XX-XX-XX-XX-XX-XX.
 
     static const char *kMacFormatString = ("%02x-%02x-%02x-%02x-%02x-%02x");
-    
+
     sprintf(mMac, kMacFormatString,
             mac_as_int[0], mac_as_int[1], mac_as_int[2],
             mac_as_int[3], mac_as_int[4], mac_as_int[5]);
+
     mMac[17] = 0;
   };
 

netwerk/wifi/src/nsWifiMonitor.h

@@ -88,6 +88,11 @@ class nsWifiMonitor : nsIRunnable, nsIWifiMonitor, nsIObserver
 
   nsresult DoScan();
 
+#if defined(XP_MACOSX)
+  nsresult DoScanWithCoreWLAN();
+  nsresult DoScanOld();
+#endif
+
   PRBool mKeepGoing;
   nsCOMPtr<nsIThread> mThread;
 

netwerk/wifi/src/nsWifiScannerMac.cpp

@@ -53,8 +53,88 @@
 #include "nsComponentManagerUtils.h"
 #include "nsIMutableArray.h"
 
+// defined in osx_corewlan.mm
+// basically relaces accesspoints in the passed reference
+// it lives in a seperate file so that we can use objective c.
+extern nsresult GetAccessPointsFromWLAN(nsCOMArray<nsWifiAccessPoint> &accessPoints);
+
 nsresult
-nsWifiMonitor::DoScan()
+nsWifiMonitor::DoScanWithCoreWLAN()
+{
+  // Regularly get the access point data.
+    
+  nsCOMArray<nsWifiAccessPoint> lastAccessPoints;
+  nsCOMArray<nsWifiAccessPoint> accessPoints;
+
+  do {    
+    nsresult rv = GetAccessPointsFromWLAN(accessPoints);
+    if (NS_FAILED(rv))
+      return rv;
+
+    PRBool accessPointsChanged = !AccessPointsEqual(accessPoints, lastAccessPoints);
+    nsCOMArray<nsIWifiListener> currentListeners;
+
+    {
+      nsAutoMonitor mon(mMonitor);
+      
+      for (PRUint32 i = 0; i < mListeners.Length(); i++) {
+        if (!mListeners[i].mHasSentData || accessPointsChanged) {
+          mListeners[i].mHasSentData = PR_TRUE;
+          currentListeners.AppendObject(mListeners[i].mListener);
+        }
+      }
+    }
+    
+    ReplaceArray(lastAccessPoints, accessPoints);
+
+    if (currentListeners.Count() > 0)
+    {
+      PRUint32 resultCount = lastAccessPoints.Count();
+      nsIWifiAccessPoint** result = static_cast<nsIWifiAccessPoint**> (nsMemory::Alloc(sizeof(nsIWifiAccessPoint*) * resultCount));
+      if (!result) {
+        return NS_ERROR_OUT_OF_MEMORY;
+      }
+
+      for (PRUint32 i = 0; i < resultCount; i++)
+        result[i] = lastAccessPoints[i];
+
+      for (PRInt32 i = 0; i < currentListeners.Count(); i++) {
+        
+        LOG(("About to send data to the wifi listeners\n"));
+        
+        nsCOMPtr<nsIWifiListener> proxy;
+        nsCOMPtr<nsIProxyObjectManager> proxyObjMgr = do_GetService("@mozilla.org/xpcomproxy;1");
+        proxyObjMgr->GetProxyForObject(NS_PROXY_TO_MAIN_THREAD,
+                                       NS_GET_IID(nsIWifiListener),
+                                       currentListeners[i],
+                                       NS_PROXY_SYNC | NS_PROXY_ALWAYS,
+                                       getter_AddRefs(proxy));
+        if (!proxy) {
+          LOG(("There is no proxy available.  this should never happen\n"));
+        }
+        else
+        {
+          nsresult rv = proxy->OnChange(result, resultCount);
+          LOG( ("... sent %d\n", rv));
+        }
+      }
+
+      nsMemory::Free(result);
+    }
+
+    // wait for some reasonable amount of time.  pref?
+    LOG(("waiting on monitor\n"));
+    
+    nsAutoMonitor mon(mMonitor);
+    mon.Wait(PR_SecondsToInterval(60));
+  }
+  while (mKeepGoing == PR_TRUE);
+  
+  return NS_OK;
+}
+
+nsresult
+nsWifiMonitor::DoScanOld()
 {
   void *apple_80211_library = dlopen(
       "/System/Library/PrivateFrameworks/Apple80211.framework/Apple80211",
@@ -73,7 +153,11 @@ nsWifiMonitor::DoScan()
     return NS_ERROR_NOT_AVAILABLE;
   }
 
-  if ((*WirelessAttach_function_)(&wifi_context_, 0) != noErr) {
+  WIErr err = 0;
+
+  err = (*WirelessAttach_function_)(&wifi_context_, 0);
+  if (err != noErr) {
+    printf("Error: WirelessAttach: %d\n", (int) err);
     dlclose(apple_80211_library);
     return NS_ERROR_FAILURE;
   }
@@ -188,3 +272,15 @@ nsWifiMonitor::DoScan()
   
   return NS_OK;
 }
+
+nsresult
+nsWifiMonitor::DoScan()
+{
+  nsresult rv = DoScanWithCoreWLAN();
+
+  // we can remove this once we stop caring about 10.5.
+  if (NS_FAILED(rv))
+    rv = DoScanOld();
+
+  return rv;
+}

netwerk/wifi/src/osx_corewlan.mm

@@ -0,0 +1,115 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Geolocation.
+ *
+ * The Initial Developer of the Original Code is Mozilla Corporation
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Doug Turner <dougt@meer.net>  (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#import <Cocoa/Cocoa.h>
+
+#include <mach-o/dyld.h>
+#include <dlfcn.h>
+#include <unistd.h>
+
+#include <objc/objc.h>
+#include <objc/objc-runtime.h>
+
+#include "nsAutoPtr.h"
+#include "nsCOMArray.h"
+#include "nsWifiMonitor.h"
+#include "nsWifiAccessPoint.h"
+
+BOOL UsingSnowLeopard() {
+  static PRInt32 gOSXVersion = 0x0;
+  if (gOSXVersion == 0x0) {
+    Gestalt(gestaltSystemVersion, (SInt32*)&gOSXVersion);
+  }
+  return (gOSXVersion >= 0x00001060);
+}
+
+nsresult
+GetAccessPointsFromWLAN(nsCOMArray<nsWifiAccessPoint> &accessPoints)
+{
+  if (!UsingSnowLeopard())
+    return NS_ERROR_NOT_AVAILABLE;
+
+  NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+  void *corewlan_library = dlopen("/System/Library/Frameworks/CoreWLAN.framework/CoreWLAN",
+                                  RTLD_LAZY);
+  if (!corewlan_library)
+    return NS_ERROR_NOT_AVAILABLE;
+  
+  accessPoints.Clear();
+  
+  id anObject;
+  NSError *err = nil;
+  NSDictionary *params = nil;
+
+  // We do this the hard way because we want to be able to run on pre-10.6.  When we drop
+  // this requirement, this objective-c magic goes away.
+
+  // dynamically call: [CWInterface interface];
+  Class CWI_class = objc_getClass("CWInterface");
+  if (!CWI_class) {
+    dlclose(corewlan_library);
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  SEL interfaceSel = sel_registerName("interface");
+  id interface = objc_msgSend(CWI_class, interfaceSel);
+
+  // call [interface scanForNetworksWithParameters:params err:&err]
+  SEL scanSel = sel_registerName("scanForNetworksWithParameters:error:");
+  id scanResult = objc_msgSend(interface, scanSel, params, err);
+
+  NSArray* scan = [NSMutableArray arrayWithArray:scanResult];
+  NSEnumerator *enumerator = [scan objectEnumerator];
+  
+  while (anObject = [enumerator nextObject]) {
+ 
+    nsWifiAccessPoint* ap = new nsWifiAccessPoint();
+    if (!ap)
+      continue;
+ 
+
+    NSData* data = [anObject bssidData];
+    ap->setMac((unsigned char*)[data bytes]);
+    ap->setSignal([[anObject rssi] intValue]);
+    ap->setSSID([[anObject ssid] UTF8String], 32);
+    
+    accessPoints.AppendObject(ap);
+  }
+
+  dlclose(corewlan_library);
+  return NS_OK;
+}