[kismac] [binaervarianz] r221 - in branches/usb-drivers: KisMAC.xcodeproj Resources/Nibs/English.lproj/PrefsAdvanced.nib Resources/Strings/English.lproj Sources/Controller Sources/Core Sources/Preferences/PreferencePanes Sources/WaveDrivers
- From: svn@xxxxxxxxxxxxxxxx
- To: kismac@xxxxxxxxxxxxx
- Date: Mon, 29 Jan 2007 22:35:36 +0100
Author: gkruse
Date: 2007-01-29 22:35:15 +0100 (Mon, 29 Jan 2007)
New Revision: 221
Added:
branches/usb-drivers/Sources/WaveDrivers/WaveDriverKismet.h
branches/usb-drivers/Sources/WaveDrivers/WaveDriverKismet.m
Modified:
branches/usb-drivers/KisMAC.xcodeproj/project.pbxproj
branches/usb-drivers/Resources/Nibs/English.lproj/PrefsAdvanced.nib/classes.nib
branches/usb-drivers/Resources/Nibs/English.lproj/PrefsAdvanced.nib/info.nib
branches/usb-drivers/Resources/Nibs/English.lproj/PrefsAdvanced.nib/objects.nib
branches/usb-drivers/Resources/Strings/English.lproj/InfoPlist.strings.templ
branches/usb-drivers/Sources/Controller/ScanController.m
branches/usb-drivers/Sources/Core/80211b.h
branches/usb-drivers/Sources/Core/WaveNet.mm
branches/usb-drivers/Sources/Core/WaveScanner.mm
branches/usb-drivers/Sources/Preferences/PreferencePanes/PrefsAdvanced.h
branches/usb-drivers/Sources/Preferences/PreferencePanes/PrefsAdvanced.m
branches/usb-drivers/Sources/Preferences/PreferencePanes/PrefsDriver.m
branches/usb-drivers/Sources/WaveDrivers/WaveDriver.m
Log:
Merge 217-220 from head
Modified: branches/usb-drivers/KisMAC.xcodeproj/project.pbxproj
===================================================================
--- branches/usb-drivers/KisMAC.xcodeproj/project.pbxproj 2007-01-29
21:31:33 UTC (rev 220)
+++ branches/usb-drivers/KisMAC.xcodeproj/project.pbxproj 2007-01-29
21:35:15 UTC (rev 221)
@@ -480,6 +480,8 @@
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 */; };
+ 6CF9EE6E0B6E9D2A00F54524 /* WaveDriverKismet.h in Headers */ =
{isa = PBXBuildFile; fileRef = 6CF9EE6C0B6E9D2A00F54524 /* WaveDriverKismet.h
*/; };
+ 6CF9EE6F0B6E9D2A00F54524 /* WaveDriverKismet.m in Sources */ =
{isa = PBXBuildFile; fileRef = 6CF9EE6D0B6E9D2A00F54524 /* WaveDriverKismet.m
*/; };
87CEBA8209AEF03700AEB0B8 /* GrowlController.h in Headers */ =
{isa = PBXBuildFile; fileRef = 87CEBA8009AEF03700AEB0B8 /* GrowlController.h
*/; };
87CEBA8309AEF03700AEB0B8 /* GrowlController.m in Sources */ =
{isa = PBXBuildFile; fileRef = 87CEBA8109AEF03700AEB0B8 /* GrowlController.m
*/; };
8D1107280486CEB800E47090 /* KisMAC_Prefix.pch in Headers */ =
{isa = PBXBuildFile; fileRef = 32CA4F630368D1EE00C91783 /* KisMAC_Prefix.pch
*/; };
@@ -837,6 +839,8 @@
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>"; };
+ 6CF9EE6C0B6E9D2A00F54524 /* WaveDriverKismet.h */ = {isa =
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path =
WaveDriverKismet.h; sourceTree = "<group>"; };
+ 6CF9EE6D0B6E9D2A00F54524 /* WaveDriverKismet.m */ = {isa =
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc;
path = WaveDriverKismet.m; sourceTree = "<group>"; };
87CEBA8009AEF03700AEB0B8 /* GrowlController.h */ = {isa =
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path =
GrowlController.h; sourceTree = "<group>"; };
87CEBA8109AEF03700AEB0B8 /* GrowlController.m */ = {isa =
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc;
path = GrowlController.m; sourceTree = "<group>"; };
8D1107320486CEB800E47090 /* KisMAC.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = KisMAC.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1222,6 +1226,8 @@
0035340E06A5DD8500AB4577 /* WaveDrivers */ = {
isa = PBXGroup;
children = (
+ 6CF9EE6C0B6E9D2A00F54524 /* WaveDriverKismet.h
*/,
+ 6CF9EE6D0B6E9D2A00F54524 /* WaveDriverKismet.m
*/,
0035340F06A5DD8500AB4577 /* WaveDriver.h */,
0035341006A5DD8500AB4577 /* WaveDriver.m */,
0035341106A5DD8500AB4577 /* WaveDriverAironet.h
*/,
@@ -1663,6 +1669,7 @@
6C83902A0AE09EFB00B7654B /* RT73Jack.h in
Headers */,
6C83902C0AE09EFB00B7654B /* structs.h in
Headers */,
6C83902D0AE09EFB00B7654B /* USBJack.h in
Headers */,
+ 6CF9EE6E0B6E9D2A00F54524 /* WaveDriverKismet.h
in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2057,6 +2064,7 @@
6C8390270AE09EFB00B7654B /* RalinkJack.mm in
Sources */,
6C83902B0AE09EFB00B7654B /* RT73Jack.mm in
Sources */,
6C83902E0AE09EFB00B7654B /* USBJack.mm in
Sources */,
+ 6CF9EE6F0B6E9D2A00F54524 /* WaveDriverKismet.m
in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified:
branches/usb-drivers/Resources/Nibs/English.lproj/PrefsAdvanced.nib/classes.nib
===================================================================
---
branches/usb-drivers/Resources/Nibs/English.lproj/PrefsAdvanced.nib/classes.nib
2007-01-29 21:31:33 UTC (rev 220)
+++
branches/usb-drivers/Resources/Nibs/English.lproj/PrefsAdvanced.nib/classes.nib
2007-01-29 21:35:15 UTC (rev 221)
@@ -10,6 +10,8 @@
"bf_interval" = id;
bpfdevice = id;
bpfloc = id;
+ kismetserverip = id;
+ kismetserverport = id;
"pr_interval" = id;
};
SUPERCLASS = PrefsClient;
Modified:
branches/usb-drivers/Resources/Nibs/English.lproj/PrefsAdvanced.nib/info.nib
===================================================================
---
branches/usb-drivers/Resources/Nibs/English.lproj/PrefsAdvanced.nib/info.nib
2007-01-29 21:31:33 UTC (rev 220)
+++
branches/usb-drivers/Resources/Nibs/English.lproj/PrefsAdvanced.nib/info.nib
2007-01-29 21:35:15 UTC (rev 221)
@@ -3,19 +3,19 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>440 82 356 240 0 0 1280 832 </string>
+ <string>621 52 356 240 0 0 1024 746 </string>
<key>IBEditorPositions</key>
<dict>
<key>109</key>
- <string>392 329 496 454 0 0 1280 832 </string>
+ <string>83 159 501 569 0 0 1024 746 </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>8L127</string>
</dict>
</plist>
Modified:
branches/usb-drivers/Resources/Nibs/English.lproj/PrefsAdvanced.nib/objects.nib
===================================================================
(Binary files differ)
Modified:
branches/usb-drivers/Resources/Strings/English.lproj/InfoPlist.strings.templ
===================================================================
(Binary files differ)
Modified: branches/usb-drivers/Sources/Controller/ScanController.m
===================================================================
--- branches/usb-drivers/Sources/Controller/ScanController.m 2007-01-29
21:31:33 UTC (rev 220)
+++ branches/usb-drivers/Sources/Controller/ScanController.m 2007-01-29
21:35:15 UTC (rev 221)
@@ -103,6 +103,8 @@
@"wlt1", @"bpfdevice",
@"/dev/bpf0", @"bpfloc",
[NSNumber numberWithInt:100], @"pr_interval",
+ @"127.0.0.1",@"kismetserverip",
+ [NSNumber numberWithInt:2501],@"kismetserverport",
nil];
[[NSUserDefaults standardUserDefaults] registerDefaults:registrationDict];
Modified: branches/usb-drivers/Sources/Core/80211b.h
===================================================================
--- branches/usb-drivers/Sources/Core/80211b.h 2007-01-29 21:31:33 UTC (rev
220)
+++ branches/usb-drivers/Sources/Core/80211b.h 2007-01-29 21:35:15 UTC (rev
221)
@@ -191,6 +191,7 @@
#define IEEE80211_CAPINFO_CF_POLLABLE_LE 0x0004
#define IEEE80211_CAPINFO_CF_POLLREQ_LE 0x0008
#define IEEE80211_CAPINFO_PRIVACY_LE 0x0010
+#define IEEE80211_CAPINFO_PROBE_REQ_LE 0xF100 // this isn't a real flag
#define IEEE80211_ELEMID_SSID 0
#define IEEE80211_ELEMID_RATES 1
Modified: branches/usb-drivers/Sources/Core/WaveNet.mm
===================================================================
--- branches/usb-drivers/Sources/Core/WaveNet.mm 2007-01-29 21:31:33 UTC
(rev 220)
+++ branches/usb-drivers/Sources/Core/WaveNet.mm 2007-01-29 21:35:15 UTC
(rev 221)
@@ -1080,6 +1080,10 @@
} else if (flags & IEEE80211_CAPINFO_IBSS_LE) {
_type = networkTypeAdHoc;
}
+
+ if (flags & IEEE80211_CAPINFO_PROBE_REQ_LE) {
+ _type = networkTypeProbe;
+ }
[_dataLock lock];
[self updateSSID:[info objectForKey:@"name"] withSound:YES];
Modified: branches/usb-drivers/Sources/Core/WaveScanner.mm
===================================================================
--- branches/usb-drivers/Sources/Core/WaveScanner.mm 2007-01-29 21:31:33 UTC
(rev 220)
+++ branches/usb-drivers/Sources/Core/WaveScanner.mm 2007-01-29 21:35:15 UTC
(rev 221)
@@ -301,6 +301,7 @@
[_hopTimer invalidate];
_hopTimer=Nil;
}
+
}
return YES;
}
Modified:
branches/usb-drivers/Sources/Preferences/PreferencePanes/PrefsAdvanced.h
===================================================================
--- branches/usb-drivers/Sources/Preferences/PreferencePanes/PrefsAdvanced.h
2007-01-29 21:31:33 UTC (rev 220)
+++ branches/usb-drivers/Sources/Preferences/PreferencePanes/PrefsAdvanced.h
2007-01-29 21:35:15 UTC (rev 221)
@@ -16,6 +16,8 @@
IBOutlet id bpfdevice; // capture device
IBOutlet id bpfloc; // bpf location
IBOutlet id pr_interval; //deauthenticate interval
+ IBOutlet id kismetserverip; // Kismet server IP
+ IBOutlet id kismetserverport; // Kismet server port
}
-(IBAction)setDefaults:(id)sender;
Modified:
branches/usb-drivers/Sources/Preferences/PreferencePanes/PrefsAdvanced.m
===================================================================
--- branches/usb-drivers/Sources/Preferences/PreferencePanes/PrefsAdvanced.m
2007-01-29 21:31:33 UTC (rev 220)
+++ branches/usb-drivers/Sources/Preferences/PreferencePanes/PrefsAdvanced.m
2007-01-29 21:35:15 UTC (rev 221)
@@ -16,6 +16,8 @@
[bpfdevice setStringValue:[controller objectForKey:@"bpfdevice"]];
[bpfloc setStringValue:[controller objectForKey:@"bpfloc"]];
[pr_interval setIntValue:[[controller objectForKey:@"pr_interval"]
intValue]];
+ [kismetserverip setStringValue:[controller
objectForKey:@"kismetserverip"]];
+ [kismetserverport setIntValue:[[controller
objectForKey:@"kismetserverport"] intValue]];
}
-(BOOL)updateDictionary {
@@ -24,6 +26,8 @@
[controller setObject:[bpfdevice stringValue] forKey:@"bpfdevice"];
[controller setObject:[bpfloc stringValue] forKey:@"bpfloc"];
[controller setObject:[NSNumber numberWithInt:[pr_interval intValue]]
forKey:@"pr_interval"];
+ [controller setObject:[kismetserverip stringValue]
forKey:@"kismetserverip"];
+ [controller setObject:[NSNumber numberWithInt:[kismetserverport
intValue]] forKey:@"kismetserverport"];
return YES;
}
@@ -38,6 +42,10 @@
[controller setObject:[bpfloc stringValue] forKey:@"bpfloc"];
} else if(sender == pr_interval) {
[controller setObject:[NSNumber numberWithInt:[pr_interval intValue]]
forKey:@"pr_interval"];
+ } else if(sender == kismetserverip) {
+ [controller setObject:[kismetserverip stringValue]
forKey:@"kismetserverip"];
+ } else if(sender == kismetserverport) {
+ [controller setObject:[NSNumber numberWithInt:[kismetserverport
intValue]] forKey:@"kismetserverport"];
} else {
NSLog(@"Error: Invalid sender(%@) in setValueForSender:",sender);
}
@@ -49,6 +57,8 @@
[bpfdevice setStringValue:@"wlt1"];
[bpfloc setStringValue:@"/dev/bpf0"];
[pr_interval setIntValue:100];
+ [kismetserverip setStringValue:@"127.0.0.1"];
+ [kismetserverport setIntValue:2501];
}
@end
\ No newline at end of file
Modified: branches/usb-drivers/Sources/Preferences/PreferencePanes/PrefsDriver.m
===================================================================
--- branches/usb-drivers/Sources/Preferences/PreferencePanes/PrefsDriver.m
2007-01-29 21:31:33 UTC (rev 220)
+++ branches/usb-drivers/Sources/Preferences/PreferencePanes/PrefsDriver.m
2007-01-29 21:35:15 UTC (rev 221)
@@ -281,7 +281,7 @@
nil]];
[controller setObject:drivers forKey:@"ActiveDrivers"];
- if (([_driver indexOfSelectedItem] == 1) && ![_aeForever state] &&
![WaveHelper isServiceAvailable:"AirPort_Athr5424"]) {
+ if (([_driver indexOfSelectedItem] == 2) && ![_aeForever state] &&
![WaveHelper isServiceAvailable:"AirPort_Athr5424"]) {
// user has chosen Airport Extreme - STRONGLY suggest enabling
persistent passive mode
result = NSRunAlertPanel(NSLocalizedString(@"Please enable
persistent Airport Extreme passive.", "Persistent dialog title"),
NSLocalizedString(@"Airport Extreme passive may not work without persistent
passive support enabled. Some users have reported errors and even system
crashes when attempting to use without persistent passive support. Enable
persistent passive support now?", "Persistent dialog description"),
Modified: branches/usb-drivers/Sources/WaveDrivers/WaveDriver.m
===================================================================
--- branches/usb-drivers/Sources/WaveDrivers/WaveDriver.m 2007-01-29
21:31:33 UTC (rev 220)
+++ branches/usb-drivers/Sources/WaveDrivers/WaveDriver.m 2007-01-29
21:35:15 UTC (rev 221)
@@ -26,7 +26,7 @@
#import "WaveDriverAirport.h"
#import "WaveHelper.h"
-char WaveDrivers [][30] = { "WaveDriverAirport", "WaveDriverAirportExtreme",
"WaveDriverViha", "WaveDriverAtheros", "WaveDriverAironet",
"WaveDriverMacJack", "WaveDriverPrismGT", "WaveDriverUSBIntersil", "\0" };
+char WaveDrivers [][30] = { "WaveDriverAirport", "WaveDriverKismet",
"WaveDriverAirportExtreme", "WaveDriverViha", "WaveDriverAtheros",
"WaveDriverAironet", "WaveDriverMacJack", "WaveDriverPrismGT",
"WaveDriverUSBIntersil", "\0" };
@implementation WaveDriver
Copied: branches/usb-drivers/Sources/WaveDrivers/WaveDriverKismet.h (from rev
220, trunk/Sources/WaveDrivers/WaveDriverKismet.h)
Copied: branches/usb-drivers/Sources/WaveDrivers/WaveDriverKismet.m (from rev
220, trunk/Sources/WaveDrivers/WaveDriverKismet.m)
Other related posts:
- » [kismac] [binaervarianz] r221 - in branches/usb-drivers: KisMAC.xcodeproj Resources/Nibs/English.lproj/PrefsAdvanced.nib Resources/Strings/English.lproj Sources/Controller Sources/Core Sources/Preferences/PreferencePanes Sources/WaveDrivers
