1 files changed, 111 insertions, 16 deletions

diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
index 3206833d34..6ba950494f 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -67,9 +67,13 @@
 #include <private/qt_cocoa_helpers_mac_p.h>
 #include "private/qcore_mac_p.h"
 
-@interface QNSListener : NSObject
+#include <net/if.h>
+#include <ifaddrs.h>
+
+
+@interface QT_MANGLE_NAMESPACE(QNSListener) : NSObject
 {
-    NSNotificationCenter *center;
+    NSNotificationCenter *notificationCenter;
     CWInterface *currentInterface;
     QCoreWlanEngine *engine;
     NSLock *locker;
@@ -83,16 +87,16 @@
 
 @end
 
-@implementation QNSListener
+@implementation QT_MANGLE_NAMESPACE(QNSListener)
 @synthesize engine;
 
 - (id) init
 {
     [locker lock];
     QMacCocoaAutoReleasePool pool;
-    center = [NSNotificationCenter defaultCenter];
+    notificationCenter = [NSNotificationCenter defaultCenter];
     currentInterface = [CWInterface interfaceWithName:nil];
-    [center addObserver:self selector:@selector(notificationHandler:) name:kCWPowerDidChangeNotification object:nil];
+    [notificationCenter addObserver:self selector:@selector(notificationHandler:) name:kCWPowerDidChangeNotification object:nil];
     [locker unlock];
     return self;
 }
@@ -113,7 +117,7 @@
 -(void)remove
 {
     [locker lock];
-    [center removeObserver:self];
+    [notificationCenter removeObserver:self];
     [locker unlock];
 }
 
@@ -123,7 +127,7 @@
 }
 @end
 
-QNSListener *listener = 0;
+QT_MANGLE_NAMESPACE(QNSListener) *listener = 0;
 
 QT_BEGIN_NAMESPACE
 
@@ -157,7 +161,7 @@ void QScanThread::quit()
 
 void QScanThread::run()
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    QMacCocoaAutoReleasePool pool;
     QStringList found;
     mutex.lock();
     CWInterface *currentInterface = [CWInterface interfaceWithName:qt_mac_QStringToNSString(interfaceName)];
@@ -167,6 +171,7 @@ void QScanThread::run()
         NSError *err = nil;
         NSDictionary *parametersDict =  [NSDictionary dictionaryWithObjectsAndKeys:
                                    [NSNumber numberWithBool:YES], kCWScanKeyMerge,
+                                   [NSNumber numberWithInt:kCWScanTypeFast], kCWScanKeyScanType,
                                    [NSNumber numberWithInteger:100], kCWScanKeyRestTime, nil];
 
         NSArray* apArray = [currentInterface scanForNetworksWithParameters:parametersDict error:&err];
@@ -204,11 +209,9 @@ void QScanThread::run()
 
                 found.append(foundNetwork(id, networkSsid, state, interfaceName, purpose));
 
-            } //end row
-//            [parametersDict release];
-
-        } //end error
-    } // endwifi power
+            }
+        }
+    }
     // add known configurations that are not around.
     QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
     while (i.hasNext()) {
@@ -248,7 +251,6 @@ void QScanThread::run()
         }
     }
     emit networksChanged();
-    [pool release];
 }
 
 QStringList QScanThread::foundNetwork(const QString &id, const QString &name, const QNetworkConfiguration::StateFlags state, const QString &interfaceName, const QNetworkConfiguration::Purpose purpose)
@@ -295,6 +297,9 @@ void QScanThread::getUserConfigurations()
     for(uint row=0; row < [wifiInterfaces count]; row++ ) {
 
         CWInterface *wifiInterface = [CWInterface interfaceWithName: [wifiInterfaces objectAtIndex:row]];
+        if ( ![wifiInterface power] )
+            continue;
+
         NSString *nsInterfaceName = [wifiInterface name];
 // add user configured system networks
         SCDynamicStoreRef dynRef = SCDynamicStoreCreate(kCFAllocatorSystemDefault, (CFStringRef)@"Qt corewlan", nil, nil);
@@ -426,9 +431,10 @@ QCoreWlanEngine::~QCoreWlanEngine()
 void QCoreWlanEngine::initialize()
 {
     QMutexLocker locker(&mutex);
+    QMacCocoaAutoReleasePool pool;
 
     if([[CWInterface supportedInterfaces] count] > 0 && !listener) {
-        listener = [[QNSListener alloc] init];
+        listener = [[QT_MANGLE_NAMESPACE(QNSListener) alloc] init];
         listener.engine = this;
         hasWifi = true;
     } else {
@@ -659,7 +665,6 @@ bool QCoreWlanEngine::isWifiReady(const QString &wifiDeviceName)
 QNetworkSession::State QCoreWlanEngine::sessionStateForId(const QString &id)
 {
     QMutexLocker locker(&mutex);
-
     QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(id);
 
     if (!ptr)
@@ -784,6 +789,11 @@ void QCoreWlanEngine::networksChanged()
                 changed = true;
             }
 
+            if (ptr->bearer != cpPriv->bearer) {
+                ptr->bearer = cpPriv->bearer;
+                changed = true;
+            }
+
             if (ptr->state != cpPriv->state) {
                 ptr->state = cpPriv->state;
                 changed = true;
@@ -823,5 +833,90 @@ void QCoreWlanEngine::networksChanged()
 
 }
 
+quint64 QCoreWlanEngine::bytesWritten(const QString &id)
+{
+    QMutexLocker locker(&mutex);
+    const QString interfaceStr = getInterfaceFromId(id);
+    return getBytes(interfaceStr,false);
+}
+
+quint64 QCoreWlanEngine::bytesReceived(const QString &id)
+{
+    QMutexLocker locker(&mutex);
+    const QString interfaceStr = getInterfaceFromId(id);
+    return getBytes(interfaceStr,true);
+}
+
+quint64 QCoreWlanEngine::startTime(const QString &id)
+{
+    QMutexLocker locker(&mutex);
+    QMacCocoaAutoReleasePool pool;
+    quint64 timestamp = 0;
+
+    NSString *filePath = @"/Library/Preferences/SystemConfiguration/com.apple.airport.preferences.plist";
+    NSDictionary* plistDict = [[[NSDictionary alloc] initWithContentsOfFile:filePath] autorelease];
+    NSString *input = @"KnownNetworks";
+    NSString *timeStampStr = @"_timeStamp";
+
+    NSString *ssidStr = @"SSID_STR";
+
+    for (id key in plistDict) {
+        if ([input isEqualToString:key]) {
+
+            NSDictionary *knownNetworksDict = [plistDict objectForKey:key];
+            for (id networkKey in knownNetworksDict) {
+                bool isFound = false;
+                NSDictionary *itemDict = [knownNetworksDict objectForKey:networkKey];
+                NSInteger dictSize = [itemDict count];
+                id objects[dictSize];
+                id keys[dictSize];
+
+                [itemDict getObjects:objects andKeys:keys];
+                bool ok = false;
+                for(int i = 0; i < dictSize; i++) {
+                    if([ssidStr isEqualToString:keys[i]]) {
+                        const QString ident = QString::number(qHash(QLatin1String("corewlan:") + qt_mac_NSStringToQString(objects[i])));
+                        if(ident == id) {
+                            ok = true;
+                        }
+                    }
+                    if(ok && [timeStampStr isEqualToString:keys[i]]) {
+                        timestamp = (quint64)[objects[i] timeIntervalSince1970];
+                        isFound = true;
+                        break;
+                    }
+                }
+                if(isFound)
+                    break;
+            }
+        }
+    }
+    return timestamp;
+}
+
+quint64 QCoreWlanEngine::getBytes(const QString &interfaceName, bool b)
+{
+    struct ifaddrs *ifAddressList, *ifAddress;
+    struct if_data *if_data;
+
+    quint64 bytes = 0;
+    ifAddressList = nil;
+    if(getifaddrs(&ifAddressList) == 0) {
+        for(ifAddress = ifAddressList; ifAddress; ifAddress = ifAddress->ifa_next) {
+            if(interfaceName == ifAddress->ifa_name) {
+                if_data = (struct if_data*)ifAddress->ifa_data;
+                if(b) {
+                    bytes = if_data->ifi_ibytes;
+                    break;
+                } else {
+                    bytes = if_data->ifi_obytes;
+                    break;
+                }
+            }
+        }
+        freeifaddrs(ifAddressList);
+    }
+    return bytes;
+}
 
 QT_END_NAMESPACE