[kismac] [binaervarianz] r186 - in branches/usb-drivers: KisMAC.xcodeproj Resources/Nibs/English.lproj Resources/Nibs/English.lproj/GPSDialog.nib Resources/Nibs/English.lproj/MainMenu.nib Resources/Nibs/English.lproj/PrefsSounds.nib Sources/Controller Sources/Core Sources/Crypto Sources/Support Sources/WindowControllers

  • From: svn@xxxxxxxxxxxxxxxx
  • To: kismac@xxxxxxxxxxxxx
  • Date: Fri, 08 Sep 2006 05:33:35 +0200

Author: gkruse
Date: 2006-09-08 05:33:13 +0200 (Fri, 08 Sep 2006)
New Revision: 186

Added:
   branches/usb-drivers/Resources/Nibs/English.lproj/GPSDialog.nib/
   branches/usb-drivers/Resources/Nibs/English.lproj/GPSDialog.nib/classes.nib
   branches/usb-drivers/Resources/Nibs/English.lproj/GPSDialog.nib/info.nib
   
branches/usb-drivers/Resources/Nibs/English.lproj/GPSDialog.nib/keyedobjects.nib
   branches/usb-drivers/Sources/WindowControllers/GPSInfoController.h
   branches/usb-drivers/Sources/WindowControllers/GPSInfoController.m
Removed:
   branches/usb-drivers/Resources/Nibs/English.lproj/GPSDialog.nib/classes.nib
   branches/usb-drivers/Resources/Nibs/English.lproj/GPSDialog.nib/info.nib
   
branches/usb-drivers/Resources/Nibs/English.lproj/GPSDialog.nib/keyedobjects.nib
Modified:
   branches/usb-drivers/KisMAC.xcodeproj/project.pbxproj
   branches/usb-drivers/Resources/Nibs/English.lproj/MainMenu.nib/classes.nib
   branches/usb-drivers/Resources/Nibs/English.lproj/MainMenu.nib/info.nib
   
branches/usb-drivers/Resources/Nibs/English.lproj/MainMenu.nib/keyedobjects.nib
   branches/usb-drivers/Resources/Nibs/English.lproj/PrefsSounds.nib/info.nib
   branches/usb-drivers/Resources/Nibs/English.lproj/PrefsSounds.nib/objects.nib
   branches/usb-drivers/Sources/Controller/ScanController.h
   branches/usb-drivers/Sources/Controller/ScanControllerMenus.m
   branches/usb-drivers/Sources/Core/80211b.h
   branches/usb-drivers/Sources/Core/WaveHelper.h
   branches/usb-drivers/Sources/Core/WaveHelper.m
   branches/usb-drivers/Sources/Core/WaveNet.mm
   branches/usb-drivers/Sources/Core/WaveStorageController.m
   branches/usb-drivers/Sources/Crypto/WaveNetWPACrack.m
   branches/usb-drivers/Sources/Support/GPSController.m
   branches/usb-drivers/Sources/WindowControllers/DecryptController.m
Log:
Merge changes from trunk

Modified: branches/usb-drivers/KisMAC.xcodeproj/project.pbxproj
===================================================================
--- branches/usb-drivers/KisMAC.xcodeproj/project.pbxproj       2006-09-04 
06:30:28 UTC (rev 185)
+++ branches/usb-drivers/KisMAC.xcodeproj/project.pbxproj       2006-09-08 
03:33:13 UTC (rev 186)
@@ -466,6 +466,9 @@
                6C541AAC0A72003000B58A95 /* growl-wpa-challenge.png in 
Resources */ = {isa = PBXBuildFile; fileRef = 6C541AA90A72002F00B58A95 /* 
growl-wpa-challenge.png */; };
                6C541AAD0A72003000B58A95 /* growl-wpa-response.png in Resources 
*/ = {isa = PBXBuildFile; fileRef = 6C541AAA0A72002F00B58A95 /* 
growl-wpa-response.png */; };
                6C71721F0AA17A5A00CD6879 /* rt2570.h in Headers */ = {isa = 
PBXBuildFile; fileRef = 6C71721E0AA17A5A00CD6879 /* rt2570.h */; };
+               6C87C31A0AB1168100182BC6 /* GPSInfoController.h in Headers */ = 
{isa = PBXBuildFile; fileRef = 6C87C3180AB1168100182BC6 /* GPSInfoController.h 
*/; };
+               6C87C31B0AB1168100182BC6 /* GPSInfoController.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 6C87C3190AB1168100182BC6 /* GPSInfoController.m 
*/; };
+               6C87C3260AB1170200182BC6 /* GPSDialog.nib in Resources */ = 
{isa = PBXBuildFile; fileRef = 6C87C3240AB1170200182BC6 /* GPSDialog.nib */; };
                6CA3BCCB09B2A58F00DCB407 /* Accelerate.framework in Frameworks 
*/ = {isa = PBXBuildFile; fileRef = 6CA3BCCA09B2A58F00DCB407 /* 
Accelerate.framework */; };
                6CE20615C5B043AF00A26C3A /* IntersilJack.h in Headers */ = {isa 
= PBXBuildFile; fileRef = 6CE2060FC5B043AF00A26C3A /* IntersilJack.h */; };
                6CE20616C5B043AF00A26C3A /* IntersilJack.mm in Sources */ = 
{isa = PBXBuildFile; fileRef = 6CE20610C5B043AF00A26C3A /* IntersilJack.mm */; 
};
@@ -818,6 +821,9 @@
                6C541AA90A72002F00B58A95 /* growl-wpa-challenge.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = 
"growl-wpa-challenge.png"; sourceTree = "<group>"; };
                6C541AAA0A72002F00B58A95 /* growl-wpa-response.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = 
"growl-wpa-response.png"; sourceTree = "<group>"; };
                6C71721E0AA17A5A00CD6879 /* rt2570.h */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = 
rt2570.h; path = USBJack/rt2570.h; sourceTree = "<group>"; };
+               6C87C3180AB1168100182BC6 /* GPSInfoController.h */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = 
GPSInfoController.h; sourceTree = "<group>"; };
+               6C87C3190AB1168100182BC6 /* GPSInfoController.m */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; 
path = GPSInfoController.m; sourceTree = "<group>"; };
+               6C87C3250AB1170200182BC6 /* English */ = {isa = 
PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = 
English.lproj/GPSDialog.nib; sourceTree = "<group>"; };
                6CA3BCCA09B2A58F00DCB407 /* Accelerate.framework */ = {isa = 
PBXFileReference; lastKnownFileType = wrapper.framework; name = 
Accelerate.framework; path = /System/Library/Frameworks/Accelerate.framework; 
sourceTree = "<absolute>"; };
                6CE2060FC5B043AF00A26C3A /* IntersilJack.h */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = 
IntersilJack.h; path = USBJack/IntersilJack.h; sourceTree = "<group>"; };
                6CE20610C5B043AF00A26C3A /* IntersilJack.mm */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; 
name = IntersilJack.mm; path = USBJack/IntersilJack.mm; sourceTree = "<group>"; 
};
@@ -1249,6 +1255,8 @@
                                002E7DF606A86C6F00C9D931 /* 
DownloadMapController.m */,
                                002E7DF706A86C6F00C9D931 /* ImportController.h 
*/,
                                002E7DF806A86C6F00C9D931 /* ImportController.m 
*/,
+                               6C87C3180AB1168100182BC6 /* GPSInfoController.h 
*/,
+                               6C87C3190AB1168100182BC6 /* GPSInfoController.m 
*/,
                                0035342406A5DD8500AB4577 /* WayPoint.h */,
                                0035342506A5DD8500AB4577 /* WayPoint.m */,
                        );
@@ -1296,6 +1304,7 @@
                00F57C1606A886350035AE2F /* Nibs */ = {
                        isa = PBXGroup;
                        children = (
+                               6C87C3240AB1170200182BC6 /* GPSDialog.nib */,
                                6C1D31C209F37BE10005A9F8 /* PrefsAdvanced.nib 
*/,
                                00F57C1706A886350035AE2F /* Crack.nib */,
                                00F57C1906A886350035AE2F /* CrashReporter.nib 
*/,
@@ -1646,6 +1655,7 @@
                                6CE20619C5B043AF00A26C3A /* USBJack.h in 
Headers */,
                                6CE206E8C5B0502200A26C3A /* RalinkJack.h in 
Headers */,
                                6C71721F0AA17A5A00CD6879 /* rt2570.h in Headers 
*/,
+                               6C87C31A0AB1168100182BC6 /* GPSInfoController.h 
in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -1844,6 +1854,7 @@
                                6C541AAB0A72002F00B58A95 /* 
growl-ap-revealed.png in Resources */,
                                6C541AAC0A72003000B58A95 /* 
growl-wpa-challenge.png in Resources */,
                                6C541AAD0A72003000B58A95 /* 
growl-wpa-response.png in Resources */,
+                               6C87C3260AB1170200182BC6 /* GPSDialog.nib in 
Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -2037,6 +2048,7 @@
                                6CE20616C5B043AF00A26C3A /* IntersilJack.mm in 
Sources */,
                                6CE2061AC5B043AF00A26C3A /* USBJack.mm in 
Sources */,
                                6CE206E9C5B0502200A26C3A /* RalinkJack.mm in 
Sources */,
+                               6C87C31B0AB1168100182BC6 /* GPSInfoController.m 
in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -2232,6 +2244,14 @@
                        path = ../../Sources/WaveDrivers;
                        sourceTree = "<group>";
                };
+               6C87C3240AB1170200182BC6 /* GPSDialog.nib */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               6C87C3250AB1170200182BC6 /* English */,
+                       );
+                       name = GPSDialog.nib;
+                       sourceTree = "<group>";
+               };
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */

Copied: branches/usb-drivers/Resources/Nibs/English.lproj/GPSDialog.nib (from 
rev 170, trunk/Resources/Nibs/English.lproj/GPSDialog.nib)

Deleted: 
branches/usb-drivers/Resources/Nibs/English.lproj/GPSDialog.nib/classes.nib
===================================================================
--- trunk/Resources/Nibs/English.lproj/GPSDialog.nib/classes.nib        
2006-08-26 18:29:34 UTC (rev 170)
+++ branches/usb-drivers/Resources/Nibs/English.lproj/GPSDialog.nib/classes.nib 
2006-09-08 03:33:13 UTC (rev 186)
@@ -1,24 +0,0 @@
-{
-    IBClasses = (
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-            ACTIONS = {updateSpeed = id; }; 
-            CLASS = GPSInfoController; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                "_fix_indicator" = NSLevelIndicator; 
-                "_fix_type" = NSTextField; 
-                "_hdop_indicator" = NSLevelIndicator; 
-                "_lat_field" = NSTextField; 
-                "_lon_field" = NSTextField; 
-                "_sats_indicator" = NSLevelIndicator; 
-                "_speedType" = NSPopUpButton; 
-                "_statusField" = NSTextField; 
-                "_vel_field" = NSTextField; 
-            }; 
-            SUPERCLASS = NSWindowController; 
-        }, 
-        {CLASS = NSLevelIndicator; LANGUAGE = ObjC; SUPERCLASS = NSControl; }
-    ); 
-    IBVersion = 1; 
-}
\ No newline at end of file

Copied: 
branches/usb-drivers/Resources/Nibs/English.lproj/GPSDialog.nib/classes.nib 
(from rev 170, trunk/Resources/Nibs/English.lproj/GPSDialog.nib/classes.nib)

Deleted: 
branches/usb-drivers/Resources/Nibs/English.lproj/GPSDialog.nib/info.nib
===================================================================
--- trunk/Resources/Nibs/English.lproj/GPSDialog.nib/info.nib   2006-08-26 
18:29:34 UTC (rev 170)
+++ branches/usb-drivers/Resources/Nibs/English.lproj/GPSDialog.nib/info.nib    
2006-09-08 03:33:13 UTC (rev 186)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" 
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
-<plist version="1.0">
-<dict>
-       <key>IBDocumentLocation</key>
-       <string>189 53 356 240 0 0 1024 746 </string>
-       <key>IBFramework Version</key>
-       <string>446.1</string>
-       <key>IBOpenObjects</key>
-       <array>
-               <integer>5</integer>
-       </array>
-       <key>IBSystem Version</key>
-       <string>8J135</string>
-</dict>
-</plist>

Copied: 
branches/usb-drivers/Resources/Nibs/English.lproj/GPSDialog.nib/info.nib (from 
rev 170, trunk/Resources/Nibs/English.lproj/GPSDialog.nib/info.nib)

Deleted: 
branches/usb-drivers/Resources/Nibs/English.lproj/GPSDialog.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Copied: 
branches/usb-drivers/Resources/Nibs/English.lproj/GPSDialog.nib/keyedobjects.nib
 (from rev 170, 
trunk/Resources/Nibs/English.lproj/GPSDialog.nib/keyedobjects.nib)

Modified: 
branches/usb-drivers/Resources/Nibs/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- branches/usb-drivers/Resources/Nibs/English.lproj/MainMenu.nib/classes.nib  
2006-09-04 06:30:28 UTC (rev 185)
+++ branches/usb-drivers/Resources/Nibs/English.lproj/MainMenu.nib/classes.nib  
2006-09-08 03:33:13 UTC (rev 186)
@@ -26,6 +26,7 @@
             SUPERCLASS = NSScrollView; 
         }, 
         {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {CLASS = GPSInfoController; LANGUAGE = ObjC; SUPERCLASS = 
NSWindowController; }, 
         {
             ACTIONS = {commentChanged = id; showNet = id; }; 
             CLASS = InfoController; 
@@ -116,6 +117,7 @@
                 debugSaveStressTest = id; 
                 debugTestWPAHashingFunction = id; 
                 decryptPCAPFile = id; 
+                displayGPSInfo = id; 
                 exportJPEG = id; 
                 exportKMLFile = id; 
                 exportMacstumbler = id; 
@@ -139,6 +141,7 @@
                 showAllNetArea = id; 
                 showContextHelp = id; 
                 showCurNetArea = id; 
+                showGPS = id; 
                 showInfo = id; 
                 showNetHierarch = id; 
                 showPrefs = id; 
@@ -171,6 +174,7 @@
                 "_searchTypeMenu" = NSPopUpButton; 
                 "_showAllNetsInMap" = NSMenuItem; 
                 "_showDetails" = NSMenuItem; 
+                "_showGPSDetails" = NSMenuItem; 
                 "_showHierarch" = NSMenuItem; 
                 "_showMap" = NSMenuItem; 
                 "_showNetInMap" = NSMenuItem; 

Modified: 
branches/usb-drivers/Resources/Nibs/English.lproj/MainMenu.nib/info.nib
===================================================================
--- branches/usb-drivers/Resources/Nibs/English.lproj/MainMenu.nib/info.nib     
2006-09-04 06:30:28 UTC (rev 185)
+++ branches/usb-drivers/Resources/Nibs/English.lproj/MainMenu.nib/info.nib     
2006-09-08 03:33:13 UTC (rev 186)
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>230 99 612 460 0 0 1280 832 </string>
+       <string>7 -10 612 460 0 0 1024 746 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>1199</key>
@@ -17,9 +17,9 @@
                <key>1290</key>
                <string>352 338 576 461 0 0 1280 832 </string>
                <key>1446</key>
-               <string>655 569 185 263 0 0 1280 832 </string>
+               <string>502 483 185 263 0 0 1024 746 </string>
                <key>29</key>
-               <string>180 788 530 44 0 0 1280 832 </string>
+               <string>118 702 530 44 0 0 1024 746 </string>
                <key>501</key>
                <string>521 414 237 309 0 0 1280 832 </string>
                <key>719</key>
@@ -34,9 +34,9 @@
        </array>
        <key>IBOpenObjects</key>
        <array>
+               <integer>21</integer>
                <integer>29</integer>
                <integer>1446</integer>
-               <integer>21</integer>
        </array>
        <key>IBSystem Version</key>
        <string>8J135</string>

Modified: 
branches/usb-drivers/Resources/Nibs/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Modified: 
branches/usb-drivers/Resources/Nibs/English.lproj/PrefsSounds.nib/info.nib
===================================================================
--- branches/usb-drivers/Resources/Nibs/English.lproj/PrefsSounds.nib/info.nib  
2006-09-04 06:30:28 UTC (rev 185)
+++ branches/usb-drivers/Resources/Nibs/English.lproj/PrefsSounds.nib/info.nib  
2006-09-08 03:33:13 UTC (rev 186)
@@ -3,19 +3,19 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>134 -11 356 240 0 0 1024 746 </string>
+       <string>185 -7 356 240 0 0 1280 832 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>109</key>
-               <string>538 214 459 265 0 0 1024 746 </string>
+               <string>410 423 459 265 0 0 1280 832 </string>
        </dict>
        <key>IBFramework Version</key>
-       <string>443.0</string>
+       <string>446.1</string>
        <key>IBOpenObjects</key>
        <array>
                <integer>109</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>8I127</string>
+       <string>8J135</string>
 </dict>
 </plist>

Modified: 
branches/usb-drivers/Resources/Nibs/English.lproj/PrefsSounds.nib/objects.nib
===================================================================
(Binary files differ)

Modified: branches/usb-drivers/Sources/Controller/ScanController.h
===================================================================
--- branches/usb-drivers/Sources/Controller/ScanController.h    2006-09-04 
06:30:28 UTC (rev 185)
+++ branches/usb-drivers/Sources/Controller/ScanController.h    2006-09-08 
03:33:13 UTC (rev 186)
@@ -30,6 +30,7 @@
 #import "ScanHierarch.h"
 #import "PrefsController.h"
 #import "GrowlController.h"
+#import "GPSInfoController.h"
 //sleep studd
 #include <mach/mach_port.h>
 #include <mach/mach_interface.h>
@@ -147,11 +148,13 @@
     IBOutlet NSMenuItem         *_showMap;
     IBOutlet NSMenuItem         *_showDetails;
     IBOutlet NSMenuItem         *_showHierarch;
+       IBOutlet NSMenuItem                     *_showGPSDetails;
     
     IBOutlet NSPopUpButton      *_trafficTimePopUp;
     IBOutlet NSPopUpButton      *_trafficModePopUp;
     IBOutlet NSDrawer           *_netHierarchDrawer;
     IBOutlet SpinChannel        *_channelProg;
+       GPSInfoController* _g;
 }
 
 - (IBAction)updateNetworkTable:(id)sender complete:(bool)complete;
@@ -211,5 +214,4 @@
 - (IBAction)debugExportTrafficView:(id)sender;
 void NotifySleep( void * refCon, io_service_t service,
                       natural_t messageType, void * messageArgument );
-
 @end

Modified: branches/usb-drivers/Sources/Controller/ScanControllerMenus.m
===================================================================
--- branches/usb-drivers/Sources/Controller/ScanControllerMenus.m       
2006-09-04 06:30:28 UTC (rev 185)
+++ branches/usb-drivers/Sources/Controller/ScanControllerMenus.m       
2006-09-08 03:33:13 UTC (rev 186)
@@ -30,6 +30,7 @@
 #import "KisMACNotifications.h"
 #import "../WindowControllers/DownloadMapController.h"
 #import "DecryptController.h"
+#import "GPSInfoController.h"
 #import "HTTPStream.h"
 #import "../Crypto/WPA.h"
 #import "TrafficController.h"
@@ -709,6 +710,23 @@
     [[NSApp keyWindow] performClose:sender];
 }
 
+- (IBAction)displayGPSInfo:(id)sender {
+       
+       if ([_showGPSDetails state]==NSOffState) {
+               _g = [[GPSInfoController alloc] 
initWithWindowNibName:@"GPSDialog"];
+               [_g setShowMenu:_showGPSDetails];
+               [_showGPSDetails setState:NSOnState];
+               [_g showWindow:sender];
+               [WaveHelper setGPSInfoController:_g];
+          } else {
+               [_showGPSDetails setState:NSOffState];
+               [_g close];
+               [_g release];
+               [WaveHelper setGPSInfoController:NULL];
+          }
+       
+}
+
 #pragma mark -
 #pragma mark HELP MENU
 #pragma mark -

Modified: branches/usb-drivers/Sources/Core/80211b.h
===================================================================
--- branches/usb-drivers/Sources/Core/80211b.h  2006-09-04 06:30:28 UTC (rev 
185)
+++ branches/usb-drivers/Sources/Core/80211b.h  2006-09-08 03:33:13 UTC (rev 
186)
@@ -208,21 +208,21 @@
 
 #define WPA_EXT_IV_PRESENT              0x20
 
-#define WPA_FLAG_REQUEST                0x0800
-#define WPA_FLAG_ERROR                  0x0400
-#define WPA_FLAG_SECURE                 0x0200
-#define WPA_FLAG_MIC                    0x0100
-#define WPA_FLAG_ACK                    0x0080
-#define WPA_FLAG_INSTALL                0x0040
-#define WPA_FLAG_KEYID                  0x0030
-#define WPA_FLAG_KEYTYPE                0x0008
-#define WPA_FLAG_KEYCIPHER              0x0007
+#define WPA_FLAG_REQUEST                OSSwapBigToHostConstInt16(0x0800)
+#define WPA_FLAG_ERROR                  OSSwapBigToHostConstInt16(0x0400)
+#define WPA_FLAG_SECURE                 OSSwapBigToHostConstInt16(0x0200)
+#define WPA_FLAG_MIC                    OSSwapBigToHostConstInt16(0x0100)
+#define WPA_FLAG_ACK                    OSSwapBigToHostConstInt16(0x0080)
+#define WPA_FLAG_INSTALL                OSSwapBigToHostConstInt16(0x0040)
+#define WPA_FLAG_KEYID                  OSSwapBigToHostConstInt16(0x0030)
+#define WPA_FLAG_KEYTYPE                OSSwapBigToHostConstInt16(0x0008)
+#define WPA_FLAG_KEYCIPHER              OSSwapBigToHostConstInt16(0x0007)
 
-#define WPA_FLAG_KEYTYPE_PAIRWISE       0x0008
-#define WPA_FLAG_KEYTYPE_GROUPWISE      0x0000
+#define WPA_FLAG_KEYTYPE_PAIRWISE       OSSwapBigToHostConstInt16(0x0008)
+#define WPA_FLAG_KEYTYPE_GROUPWISE      OSSwapBigToHostConstInt16(0x0000)
 
-#define WPA_FLAG_KEYCIPHER_HMAC_MD5     0x0001
-#define WPA_FLAG_KEYCIPHER_AES_CBC      0x0002
+#define WPA_FLAG_KEYCIPHER_HMAC_MD5     OSSwapBigToHostConstInt16(0x0001)
+#define WPA_FLAG_KEYCIPHER_AES_CBC      OSSwapBigToHostConstInt16(0x0002)
 
 #define WPA_NONCE_LENGTH                32
 #define WPA_EAPOL_LENGTH                99

Modified: branches/usb-drivers/Sources/Core/WaveHelper.h
===================================================================
--- branches/usb-drivers/Sources/Core/WaveHelper.h      2006-09-04 06:30:28 UTC 
(rev 185)
+++ branches/usb-drivers/Sources/Core/WaveHelper.h      2006-09-08 03:33:13 UTC 
(rev 186)
@@ -52,6 +52,7 @@
 @class MapView;
 @class ImportController;
 @class GPSController;
+@class GPSInfoController;
 @class WaveDriver;
 @class Trace;
 
@@ -90,6 +91,9 @@
 + (GPSController*) gpsController;
 + (void) initGPSControllerWithDevice:(NSString*)device;
 
++ (void) setGPSInfoController:(GPSInfoController*)GPSController;
++ (GPSInfoController*) GPSInfoController;
+
 + (MapView*) mapView;
 + (void) setMapView:(MapView*)mv;
 + (Trace*) trace;

Modified: branches/usb-drivers/Sources/Core/WaveHelper.m
===================================================================
--- branches/usb-drivers/Sources/Core/WaveHelper.m      2006-09-04 06:30:28 UTC 
(rev 185)
+++ branches/usb-drivers/Sources/Core/WaveHelper.m      2006-09-08 03:33:13 UTC 
(rev 186)
@@ -38,6 +38,7 @@
 
 #import "WaveContainer.h"
 #import "GPSController.h"
+#import "GPSInfoController.h"
 #import "ImportController.h"
 
 /*
@@ -75,6 +76,7 @@
 static Trace *_trace;
 static ImportController *_im;
 static ScanController *_scanController;
+static GPSInfoController *_gc;
 
 //converts a byte count to a human readable string
 + (NSString*) bytesToString:(float) bytes {
@@ -439,6 +441,14 @@
     _scanController=scanController;
 }
 
++ (GPSInfoController*) GPSInfoController {
+       return _gc;
+}
+
++ (void) setGPSInfoController:(GPSInfoController*)GPSController {
+    _gc=GPSController;
+}
+
 + (GPSController*) gpsController {
     return aGPSController;
 }

Modified: branches/usb-drivers/Sources/Core/WaveNet.mm
===================================================================
--- branches/usb-drivers/Sources/Core/WaveNet.mm        2006-09-04 06:30:28 UTC 
(rev 185)
+++ branches/usb-drivers/Sources/Core/WaveNet.mm        2006-09-08 03:33:13 UTC 
(rev 186)
@@ -606,7 +606,6 @@
        if (isHidden) {
                if (_SSID!=Nil) return; //we might have the real ssid already
                [WaveHelper secureReplace:&_SSID withObject:@""];
-               NSLog(@"_ssid = %@, newSSID=%@, isHidden = %i, 
updatedSSID=%i",_SSID,newSSID, isHidden, updatedSSID);
        } else {
                [WaveHelper secureReplace:&_SSID withObject:newSSID];
                if (updatedSSID) {

Modified: branches/usb-drivers/Sources/Core/WaveStorageController.m
===================================================================
--- branches/usb-drivers/Sources/Core/WaveStorageController.m   2006-09-04 
06:30:28 UTC (rev 185)
+++ branches/usb-drivers/Sources/Core/WaveStorageController.m   2006-09-08 
03:33:13 UTC (rev 186)
@@ -270,6 +270,11 @@
         fgets(databuf, 1023, fd);
         //databuf[strlen(databuf) - 1] = '\0';
         
+        if (strncmp(databuf,"NetS",4)) {
+            NSLog(@"Binary Netstumbler files are not yet supported.");
+            return NO;
+        }
+        
         if (strncmp(databuf, "# $DateGMT: ", 12)==0) {
             if (sscanf(databuf, "# $DateGMT: %d-%d-%d", &year, &day, &month) 
== 3) {
                 date = [NSString stringWithFormat:@"%.4d-%.2d-%.2d", year, 
day, month];

Modified: branches/usb-drivers/Sources/Crypto/WaveNetWPACrack.m
===================================================================
--- branches/usb-drivers/Sources/Crypto/WaveNetWPACrack.m       2006-09-04 
06:30:28 UTC (rev 185)
+++ branches/usb-drivers/Sources/Crypto/WaveNetWPACrack.m       2006-09-08 
03:33:13 UTC (rev 186)
@@ -54,12 +54,18 @@
 
 /* blk0() and blk() perform the initial expand. */
 /* I got the idea of expanding during the round function from SSLeay */
+#if BYTE_ORDER == BIG_ENDIAN
 #define blk0(i) buffer[i]
+#else
+#define blk0(i) (buffer[i] = (rol(buffer[i], 24) & 0xFF00FF00) | \
+       (rol(buffer[i], 8) & 0x00FF00FF))
+#endif
 
 #define blk(i) (buffer[i & 15] = rol(buffer[(i + 13) & 15] ^ \
        buffer[(i + 8) & 15] ^ buffer[(i + 2) & 15] ^ buffer[i & 15], 1))
 
 /* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
+//there are some intel asm versions of these we should use from cowpatty
 #define R0(v,w,x,y,z,i) \
        z += ((w & (x ^ y)) ^ y) + blk0(i) + 0x5A827999 + rol(v, 5); \
        w = rol(w, 30);

Modified: branches/usb-drivers/Sources/Support/GPSController.m
===================================================================
--- branches/usb-drivers/Sources/Support/GPSController.m        2006-09-04 
06:30:28 UTC (rev 185)
+++ branches/usb-drivers/Sources/Support/GPSController.m        2006-09-08 
03:33:13 UTC (rev 186)
@@ -29,6 +29,7 @@
 #import "WaveHelper.h"
 #import "KisMACNotifications.h"
 #import "Trace.h"
+#import "GPSInfoController.h"
 
 #include <stdio.h>
 #include <fcntl.h>
@@ -473,6 +474,13 @@
         }
     }
     
+    GPSInfoController *asdf = [WaveHelper GPSInfoController];
+       
+       if (asdf != NULL)
+       {
+               [asdf updateDataNS:_ns.coordinates EW:_ew.coordinates 
ELV:_elev.coordinates numSats:_numsat HDOP:_hdop VEL:_velkt];
+       }
+    
     [date release];
     [subpool release];
 
@@ -580,11 +588,16 @@
                [[WaveHelper trace] cut];
        }
 
+    GPSInfoController *asdf = [WaveHelper GPSInfoController];
+       
+       if (asdf != NULL)
+       {
+               [asdf updateDataNS:_ns.coordinates EW:_ew.coordinates 
ELV:_elev.coordinates numSats:_numsat HDOP:_hdop VEL:_velkt];
+       }
     
     [date release];
     [subpool release];
-
-    return YES;
+       return YES;
 }
 
 - (void) continousParse:(int) fd {

Modified: branches/usb-drivers/Sources/WindowControllers/DecryptController.m
===================================================================
--- branches/usb-drivers/Sources/WindowControllers/DecryptController.m  
2006-09-04 06:30:28 UTC (rev 185)
+++ branches/usb-drivers/Sources/WindowControllers/DecryptController.m  
2006-09-08 03:33:13 UTC (rev 186)
@@ -309,7 +309,6 @@
 - (BOOL)windowShouldClose:(id)sender {
     // Set up our timer to periodically call the fade: method.
     [[NSTimer scheduledTimerWithTimeInterval:0.05 target:self 
selector:@selector(fade:) userInfo:nil repeats:YES] retain];
-    
     return NO;
 }
 

Copied: branches/usb-drivers/Sources/WindowControllers/GPSInfoController.h 
(from rev 170, trunk/Sources/WindowControllers/GPSInfoController.h)

Copied: branches/usb-drivers/Sources/WindowControllers/GPSInfoController.m 
(from rev 170, trunk/Sources/WindowControllers/GPSInfoController.m)


Other related posts:

  • » [kismac] [binaervarianz] r186 - in branches/usb-drivers: KisMAC.xcodeproj Resources/Nibs/English.lproj Resources/Nibs/English.lproj/GPSDialog.nib Resources/Nibs/English.lproj/MainMenu.nib Resources/Nibs/English.lproj/PrefsSounds.nib Sources/Controller Sources/Core Sources/Crypto Sources/Support Sources/WindowControllers