Menu
▾
▴
open1x-commits — The list that SCM commits are E-mailed to.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(206) |
Nov
(5) |
Dec
(73) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(163) |
Feb
(58) |
Mar
(21) |
Apr
(73) |
May
(50) |
Jun
(90) |
Jul
(40) |
Aug
|
Sep
(11) |
Oct
(38) |
Nov
(54) |
Dec
(37) |
| 2009 |
Jan
(45) |
Feb
(32) |
Mar
(45) |
Apr
(32) |
May
(44) |
Jun
(11) |
Jul
(9) |
Aug
(3) |
Sep
(6) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <che...@us...> - 2010-01-29 03:08:15
|
Revision: 710
http://open1x.svn.sourceforge.net/open1x/?rev=710&view=rev
Author: chessing
Date: 2010-01-29 03:08:06 +0000 (Fri, 29 Jan 2010)
Log Message:
-----------
Changed the color of the icon for "can't find the engine" from grey to black so it is easier to see on Windows XP.
Modified Paths:
--------------
trunk/xsupplicant/src/ipc_callout.c
trunk/xsupplicant-ui/Skins/Default/icons/prod_no_engine.png
Added Paths:
-----------
trunk/xsupplicant-ui/Skins/Default/icons/prod_grey.png
Modified: trunk/xsupplicant/src/ipc_callout.c
===================================================================
--- trunk/xsupplicant/src/ipc_callout.c 2009-09-12 06:57:37 UTC (rev 709)
+++ trunk/xsupplicant/src/ipc_callout.c 2010-01-29 03:08:06 UTC (rev 710)
@@ -5790,8 +5790,7 @@
}
sprintf((char *)&res, "%d", cur->strength);
- if (xmlNewChild
- (t, NULL, (xmlChar *) "Signal_Strength",
+ if (xmlNewChild(t, NULL, (xmlChar *) "Signal_Strength",
(xmlChar *) res) == NULL) {
xmlFreeNode(n);
return ipc_callout_create_error(NULL,
Added: trunk/xsupplicant-ui/Skins/Default/icons/prod_grey.png
===================================================================
(Binary files differ)
Property changes on: trunk/xsupplicant-ui/Skins/Default/icons/prod_grey.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/xsupplicant-ui/Skins/Default/icons/prod_no_engine.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gal...@us...> - 2009-09-12 06:57:45
|
Revision: 709
http://open1x.svn.sourceforge.net/open1x/?rev=709&view=rev
Author: galimorerpg
Date: 2009-09-12 06:57:37 +0000 (Sat, 12 Sep 2009)
Log Message:
-----------
A few cleanups.
Modified Paths:
--------------
trunk/xsupplicant/src/platform/linux/cardif_linux.c
Modified: trunk/xsupplicant/src/platform/linux/cardif_linux.c
===================================================================
--- trunk/xsupplicant/src/platform/linux/cardif_linux.c 2009-09-12 05:44:27 UTC (rev 708)
+++ trunk/xsupplicant/src/platform/linux/cardif_linux.c 2009-09-12 06:57:37 UTC (rev 709)
@@ -534,8 +534,6 @@
**/
int cardif_disassociate(context * ctx, int reason_code)
{
- wireless_ctx *wctx = NULL;
- wctx = (wireless_ctx *) ctx->intTypeData;
if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE))
return XEMALLOC;
@@ -568,6 +566,9 @@
if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE))
return XEMALLOC;
+ if (!xsup_assert((ctx->sockData != NULL), "ctx->sockData != NULL", FALSE))
+ return XEMALLOC;
+
sockData = ctx->sockData;
return sockData->sockInt;
@@ -909,31 +910,31 @@
* we should return an error.
*
******************************************/
-int cardif_GetBSSID(context * thisint, char *bssid_dest)
+int cardif_GetBSSID(context * ctx, char *bssid_dest)
{
- if (!xsup_assert((thisint != NULL), "thisint != NULL", FALSE))
+ if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE))
return XEMALLOC;
if (!xsup_assert((bssid_dest != NULL), "bssid_dest != NULL", FALSE))
return XEMALLOC;
if (wireless == NULL)
- return -1;
+ return XEMALLOC;
- if (thisint == NULL) {
+ if (ctx == NULL) {
debug_printf(DEBUG_NORMAL,
"Invalid interface data structure passed to %s!\n",
__FUNCTION__);
- return -1;
+ return XEMALLOC;
}
if (bssid_dest == NULL) {
debug_printf(DEBUG_NORMAL, "Invalid bssid_dest in %s!\n",
__FUNCTION__);
- return -1;
+ return XEMALLOC;
}
- return wireless->get_bssid(thisint, bssid_dest);
+ return wireless->get_bssid(ctx, bssid_dest);
}
/**
@@ -1334,7 +1335,7 @@
**/
int cardif_wep_associate(context * ctx, int zeros)
{
- wireless_ctx *wctx;
+ wireless_ctx *wctx = NULL;
if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE))
return XEMALLOC;
@@ -2436,17 +2437,17 @@
}
-int cardif_validate_connection(context * intdata)
+int cardif_validate_connection(context * ctx)
{
wireless_ctx *wctx = NULL;
struct found_ssids *working = NULL;
uint16_t abilities = 0;
int retVal = FALSE;
- if (!xsup_assert((intdata != NULL), "intdata != NULL ", FALSE))
+ if (!xsup_assert((ctx != NULL), "ctx != NULL ", FALSE))
return FALSE;
- wctx = (wireless_ctx *) intdata->intTypeData;
+ wctx = (wireless_ctx *) ctx->intTypeData;
if (!xsup_assert((wctx != NULL), "wctx != NULL ", FALSE))
return FALSE;
@@ -2457,24 +2458,24 @@
abilities = config_ssid_get_ssid_abilities(wctx);
- if(intdata->conn == NULL) {
+ if(ctx->conn == NULL) {
debug_printf(DEBUG_NORMAL, "Connection data is null in %s:%d.\n", __FUNCTION__, __LINE__);
return retVal;
}
- switch (intdata->conn->association.auth_type) {
+ switch (ctx->conn->association.auth_type) {
case AUTH_NONE:
debug_printf(DEBUG_NORMAL, "Checking AUTH_NONE.\n");
- if ((abilities & ABIL_ENC) && (intdata->conn->association.association_type == ASSOC_OPEN)) {
- if (intdata->conn->association.txkey != 0) {
+ if ((abilities & ABIL_ENC) && (ctx->conn->association.association_type == ASSOC_OPEN)) {
+ if (ctx->conn->association.txkey != 0) {
debug_printf(DEBUG_NORMAL,
"WEP Connection \n");
retVal = TRUE;
}
} else if ((abilities == 0)
- && (intdata->conn->association.txkey == 0)) {
- if (intdata->conn->association.txkey == 0) {
+ && (ctx->conn->association.txkey == 0)) {
+ if (ctx->conn->association.txkey == 0) {
debug_printf(DEBUG_NORMAL,
"OPEN Connection \n");
retVal = TRUE;
@@ -2512,9 +2513,9 @@
debug_printf(DEBUG_NORMAL,
" WPA_DOT1X connection with WPA2\n");
retVal = TRUE;
- } else if ((abilities & ABIL_ENC) && (intdata->prof != NULL) && (intdata->conn->association.association_type == ASSOC_OPEN) &&
+ } else if ((abilities & ABIL_ENC) && (ctx->prof != NULL) && (ctx->conn->association.association_type == ASSOC_OPEN) &&
!(abilities & ABIL_RSN_DOT1X ) && !(abilities & ABIL_WPA_DOT1X)) {
- //if (intdata->prof->name != NULL) {
+ //if (ctx->prof->name != NULL) {
debug_printf(DEBUG_NORMAL,
"DYNAMIC WEP Connection \n");
retVal = TRUE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gal...@us...> - 2009-09-12 05:44:34
|
Revision: 708
http://open1x.svn.sourceforge.net/open1x/?rev=708&view=rev
Author: galimorerpg
Date: 2009-09-12 05:44:27 +0000 (Sat, 12 Sep 2009)
Log Message:
-----------
Remove wctx assignment, since it's invalid. The interface hasn't been initialized yet, and wctx gets set later.
Modified Paths:
--------------
trunk/xsupplicant/src/platform/linux/cardif_linux.c
Modified: trunk/xsupplicant/src/platform/linux/cardif_linux.c
===================================================================
--- trunk/xsupplicant/src/platform/linux/cardif_linux.c 2009-09-12 05:35:52 UTC (rev 707)
+++ trunk/xsupplicant/src/platform/linux/cardif_linux.c 2009-09-12 05:44:27 UTC (rev 708)
@@ -307,8 +307,6 @@
if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE))
return XEMALLOC;
- wctx = (wireless_ctx *) ctx->intTypeData;
-
// Get the information about the global settings from the config file.
globals = config_get_globals();
@@ -423,7 +421,7 @@
ctx->intType = ETH_802_11_INT;
if (context_create_wireless_ctx
- ((wireless_ctx **) & ctx->intTypeData, 0) != XENONE) {
+ ((wireless_ctx **)&ctx->intTypeData, 0) != XENONE) {
debug_printf(DEBUG_NORMAL,
"Couldn't create wireless context for "
"interface!\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gal...@us...> - 2009-09-12 05:35:59
|
Revision: 707
http://open1x.svn.sourceforge.net/open1x/?rev=707&view=rev
Author: galimorerpg
Date: 2009-09-12 05:35:52 +0000 (Sat, 12 Sep 2009)
Log Message:
-----------
Don't initialize wctx until we know that ctx isn't NULL.
Modified Paths:
--------------
trunk/xsupplicant/src/platform/linux/cardif_linux.c
Modified: trunk/xsupplicant/src/platform/linux/cardif_linux.c
===================================================================
--- trunk/xsupplicant/src/platform/linux/cardif_linux.c 2009-09-11 06:19:25 UTC (rev 706)
+++ trunk/xsupplicant/src/platform/linux/cardif_linux.c 2009-09-12 05:35:52 UTC (rev 707)
@@ -303,11 +303,12 @@
int retval;
struct config_globals *globals;
wireless_ctx *wctx = NULL;
- wctx = (wireless_ctx *) ctx->intTypeData;
if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE))
return XEMALLOC;
+ wctx = (wireless_ctx *) ctx->intTypeData;
+
// Get the information about the global settings from the config file.
globals = config_get_globals();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gal...@us...> - 2009-09-11 06:19:32
|
Revision: 706
http://open1x.svn.sourceforge.net/open1x/?rev=706&view=rev
Author: galimorerpg
Date: 2009-09-11 06:19:25 +0000 (Fri, 11 Sep 2009)
Log Message:
-----------
Fix build problem related to pdb fix.
Modified Paths:
--------------
trunk/xsupplicant/vs2005/libxsupconfig/libxsupconfig.vcproj
Modified: trunk/xsupplicant/vs2005/libxsupconfig/libxsupconfig.vcproj
===================================================================
--- trunk/xsupplicant/vs2005/libxsupconfig/libxsupconfig.vcproj 2009-09-11 05:35:58 UTC (rev 705)
+++ trunk/xsupplicant/vs2005/libxsupconfig/libxsupconfig.vcproj 2009-09-11 06:19:25 UTC (rev 706)
@@ -51,7 +51,7 @@
RuntimeLibrary="3"
ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
ErrorReporting="0"
/>
<Tool
@@ -262,7 +262,7 @@
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
RuntimeLibrary="2"
ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -469,7 +469,7 @@
RuntimeLibrary="3"
ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
ErrorReporting="0"
/>
<Tool
@@ -680,7 +680,7 @@
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
RuntimeLibrary="2"
ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -884,7 +884,7 @@
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
RuntimeLibrary="2"
ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1094,7 +1094,7 @@
ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
ErrorReporting="0"
/>
<Tool
@@ -1310,7 +1310,7 @@
RuntimeLibrary="3"
ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
ErrorReporting="0"
/>
<Tool
@@ -1525,7 +1525,7 @@
RuntimeLibrary="3"
ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
ErrorReporting="0"
/>
<Tool
@@ -1738,7 +1738,7 @@
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
RuntimeLibrary="2"
ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1947,7 +1947,7 @@
RuntimeLibrary="3"
ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
ErrorReporting="0"
/>
<Tool
@@ -2163,7 +2163,7 @@
RuntimeLibrary="3"
ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
ErrorReporting="0"
/>
<Tool
@@ -2376,7 +2376,7 @@
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
RuntimeLibrary="2"
ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gal...@us...> - 2009-09-11 05:36:07
|
Revision: 705
http://open1x.svn.sourceforge.net/open1x/?rev=705&view=rev
Author: galimorerpg
Date: 2009-09-11 05:35:58 +0000 (Fri, 11 Sep 2009)
Log Message:
-----------
Fixes PDB creation.
Modified Paths:
--------------
trunk/xsupplicant/vs2005/Xsupplicant/Xsupplicant.vcproj
trunk/xsupplicant/vs2005/ipcevents/ipcevents.vcproj
trunk/xsupplicant/vs2005/ipctest/ipctest.vcproj
trunk/xsupplicant/vs2005/libcrashdump/libcrashdump.vcproj
trunk/xsupplicant/vs2005/liblist/liblist.vcproj
trunk/xsupplicant/vs2005/libsupdetect/libsupdetect.vcproj
trunk/xsupplicant/vs2005/libxsupconfcheck/libxsupconfcheck.vcproj
trunk/xsupplicant/vs2005/libxsupconfig/libxsupconfig.vcproj
trunk/xsupplicant/vs2005/libxsupconfwrite/libxsupconfwrite.vcproj
trunk/xsupplicant/vs2005/libxsupgui/libxsupgui.vcproj
Modified: trunk/xsupplicant/vs2005/Xsupplicant/Xsupplicant.vcproj
===================================================================
--- trunk/xsupplicant/vs2005/Xsupplicant/Xsupplicant.vcproj 2009-09-01 15:10:37 UTC (rev 704)
+++ trunk/xsupplicant/vs2005/Xsupplicant/Xsupplicant.vcproj 2009-09-11 05:35:58 UTC (rev 705)
@@ -358,6 +358,7 @@
AdditionalDependencies="libeay32.lib ssleay32.lib ws2_32.lib wbemuuid.lib crypt32.lib libsupdetect.lib liblist.lib"
AdditionalLibraryDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib";"..\..\..\libtnc-1.10\vs2005\libtnc\Release";"..\..\..\openssl-0.9.8d.win32\lib";"$(OutDir)""
IgnoreAllDefaultLibraries="false"
+ GenerateDebugInformation="true"
TargetMachine="0"
/>
<Tool
@@ -1029,6 +1030,7 @@
AdditionalLibraryDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib";"..\..\..\libtnc-1.10\vs2005\libtnc\Release";"..\..\..\openssl-0.9.8d.win32\lib";$(OutDir)"
IgnoreAllDefaultLibraries="false"
IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
TargetMachine="0"
/>
<Tool
@@ -1246,6 +1248,7 @@
OutputFile="$(OutDir)\$(ProjectName)_service.exe"
AdditionalLibraryDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib";"..\..\..\libtnc-1.10\vs2005\libtnc\Release";"..\..\..\openssl-0.9.8d.win32\lib";$(OutDir)"
IgnoreAllDefaultLibraries="false"
+ GenerateDebugInformation="true"
TargetMachine="0"
/>
<Tool
@@ -1918,6 +1921,7 @@
OutputFile="$(OutDir)\$(ProjectName)_service.exe"
AdditionalLibraryDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib";"..\..\..\libtnc-1.10\vs2005\libtnc\Release";"..\..\..\openssl-0.9.8d.win32\lib";$(OutDir)"
IgnoreAllDefaultLibraries="false"
+ GenerateDebugInformation="true"
TargetMachine="0"
/>
<Tool
@@ -2597,6 +2601,7 @@
OutputFile="$(OutDir)\$(ProjectName)_service.exe"
AdditionalLibraryDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib";"..\..\..\libtnc-1.10\vs2005\libtnc\Release";"..\..\..\openssl-0.9.8d.win32\lib";$(OutDir)"
IgnoreAllDefaultLibraries="false"
+ GenerateDebugInformation="true"
TargetMachine="0"
/>
<Tool
Modified: trunk/xsupplicant/vs2005/ipcevents/ipcevents.vcproj
===================================================================
--- trunk/xsupplicant/vs2005/ipcevents/ipcevents.vcproj 2009-09-01 15:10:37 UTC (rev 704)
+++ trunk/xsupplicant/vs2005/ipcevents/ipcevents.vcproj 2009-09-11 05:35:58 UTC (rev 705)
@@ -46,6 +46,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -259,6 +260,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -462,6 +464,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -675,6 +678,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -880,6 +884,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1083,6 +1088,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -1303,6 +1309,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -1517,6 +1524,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -1736,6 +1744,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1939,6 +1948,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -2159,6 +2169,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -2378,6 +2389,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Modified: trunk/xsupplicant/vs2005/ipctest/ipctest.vcproj
===================================================================
--- trunk/xsupplicant/vs2005/ipctest/ipctest.vcproj 2009-09-01 15:10:37 UTC (rev 704)
+++ trunk/xsupplicant/vs2005/ipctest/ipctest.vcproj 2009-09-11 05:35:58 UTC (rev 705)
@@ -47,6 +47,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -266,6 +267,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -469,6 +471,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -688,6 +691,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -890,6 +894,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1093,6 +1098,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -1313,6 +1319,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -1533,6 +1540,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -1752,6 +1760,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1955,6 +1964,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -2175,6 +2185,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -2394,6 +2405,7 @@
AdditionalIncludeDirectories=""$(ICONVDIR)\include";"$(LIBXML2DIR)\include";..\..\lib\libxsupgui;..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Modified: trunk/xsupplicant/vs2005/libcrashdump/libcrashdump.vcproj
===================================================================
--- trunk/xsupplicant/vs2005/libcrashdump/libcrashdump.vcproj 2009-09-01 15:10:37 UTC (rev 704)
+++ trunk/xsupplicant/vs2005/libcrashdump/libcrashdump.vcproj 2009-09-11 05:35:58 UTC (rev 705)
@@ -44,7 +44,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- ProgramDataBaseFileName="$(IntDir)\libcrashdump\vc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
@@ -105,6 +105,7 @@
AdditionalIncludeDirectories="$(ZLIBDIR)\include"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -167,6 +168,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
@@ -227,6 +229,7 @@
AdditionalIncludeDirectories="$(ZLIBDIR)\include"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -289,6 +292,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
@@ -351,6 +355,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
@@ -411,6 +416,7 @@
AdditionalIncludeDirectories="$(ZLIBDIR)\include"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
Modified: trunk/xsupplicant/vs2005/liblist/liblist.vcproj
===================================================================
--- trunk/xsupplicant/vs2005/liblist/liblist.vcproj 2009-09-01 15:10:37 UTC (rev 704)
+++ trunk/xsupplicant/vs2005/liblist/liblist.vcproj 2009-09-11 05:35:58 UTC (rev 705)
@@ -50,7 +50,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- ProgramDataBaseFileName="$(IntDir)\liblist\vc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -249,6 +249,7 @@
AdditionalIncludeDirectories="..\.."
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -447,6 +448,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -647,6 +649,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -845,6 +848,7 @@
AdditionalIncludeDirectories="..\.."
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -1043,6 +1047,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -1243,6 +1248,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -1441,6 +1447,7 @@
AdditionalIncludeDirectories="..\.."
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
Modified: trunk/xsupplicant/vs2005/libsupdetect/libsupdetect.vcproj
===================================================================
--- trunk/xsupplicant/vs2005/libsupdetect/libsupdetect.vcproj 2009-09-01 15:10:37 UTC (rev 704)
+++ trunk/xsupplicant/vs2005/libsupdetect/libsupdetect.vcproj 2009-09-11 05:35:58 UTC (rev 705)
@@ -50,7 +50,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- ProgramDataBaseFileName="$(IntDir)\libxsupdetect\vc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -249,6 +249,7 @@
AdditionalIncludeDirectories="..\.."
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -447,6 +448,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -647,6 +649,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -845,6 +848,7 @@
AdditionalIncludeDirectories="..\.."
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -1043,6 +1047,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -1243,6 +1248,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -1441,6 +1447,7 @@
AdditionalIncludeDirectories="..\.."
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
Modified: trunk/xsupplicant/vs2005/libxsupconfcheck/libxsupconfcheck.vcproj
===================================================================
--- trunk/xsupplicant/vs2005/libxsupconfcheck/libxsupconfcheck.vcproj 2009-09-01 15:10:37 UTC (rev 704)
+++ trunk/xsupplicant/vs2005/libxsupconfcheck/libxsupconfcheck.vcproj 2009-09-11 05:35:58 UTC (rev 705)
@@ -50,7 +50,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- ProgramDataBaseFileName="$(IntDir)\libxsupconfcheck\vc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -247,6 +247,7 @@
AdditionalIncludeDirectories="..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -445,6 +446,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
@@ -644,6 +646,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
@@ -840,6 +843,7 @@
AdditionalIncludeDirectories="..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -1038,6 +1042,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
@@ -1236,6 +1241,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
@@ -1432,6 +1438,7 @@
AdditionalIncludeDirectories="..\..;..\..\lib"
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
Modified: trunk/xsupplicant/vs2005/libxsupconfig/libxsupconfig.vcproj
===================================================================
--- trunk/xsupplicant/vs2005/libxsupconfig/libxsupconfig.vcproj 2009-09-01 15:10:37 UTC (rev 704)
+++ trunk/xsupplicant/vs2005/libxsupconfig/libxsupconfig.vcproj 2009-09-11 05:35:58 UTC (rev 705)
@@ -49,9 +49,9 @@
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
- ProgramDataBaseFileName="$(IntDir)\libxsupconfigvc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
ErrorReporting="0"
/>
<Tool
@@ -261,7 +261,8 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include";"$(OPENSSLDIR)\include""
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
RuntimeLibrary="2"
- ProgramDataBaseFileName="$(IntDir)\libxsupconfigvc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -466,9 +467,9 @@
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
- ProgramDataBaseFileName="$(IntDir)\libxsupconfigvc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
ErrorReporting="0"
/>
<Tool
@@ -678,7 +679,8 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include";"$(OPENSSLDIR)\include""
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
RuntimeLibrary="2"
- ProgramDataBaseFileName="$(IntDir)\libxsupconfigvc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -881,7 +883,8 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include";"$(OPENSSLDIR)\include""
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
RuntimeLibrary="2"
- ProgramDataBaseFileName="$(IntDir)\libxsupconfigvc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1088,10 +1091,10 @@
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
- ProgramDataBaseFileName="$(IntDir)\libxsupconfig\vc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
ErrorReporting="0"
/>
<Tool
@@ -1305,9 +1308,9 @@
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
- ProgramDataBaseFileName="$(IntDir)\libxsupconfigvc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
ErrorReporting="0"
/>
<Tool
@@ -1520,9 +1523,9 @@
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
- ProgramDataBaseFileName="$(IntDir)\libxsupconfigvc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
ErrorReporting="0"
/>
<Tool
@@ -1734,7 +1737,8 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include";"$(OPENSSLDIR)\include""
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
RuntimeLibrary="2"
- ProgramDataBaseFileName="$(IntDir)\libxsupconfigvc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1941,9 +1945,9 @@
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
- ProgramDataBaseFileName="$(IntDir)\libxsupconfigvc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
ErrorReporting="0"
/>
<Tool
@@ -2157,9 +2161,9 @@
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
- ProgramDataBaseFileName="$(IntDir)\libxsupconfigvc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
ErrorReporting="0"
/>
<Tool
@@ -2371,7 +2375,8 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include";"$(OPENSSLDIR)\include""
PreprocessorDefinitions="WINDOWS;ssize_t=long;EXTERNAL_USE"
RuntimeLibrary="2"
- ProgramDataBaseFileName="$(IntDir)\libxsupconfigvc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Modified: trunk/xsupplicant/vs2005/libxsupconfwrite/libxsupconfwrite.vcproj
===================================================================
--- trunk/xsupplicant/vs2005/libxsupconfwrite/libxsupconfwrite.vcproj 2009-09-01 15:10:37 UTC (rev 704)
+++ trunk/xsupplicant/vs2005/libxsupconfwrite/libxsupconfwrite.vcproj 2009-09-11 05:35:58 UTC (rev 705)
@@ -46,6 +46,7 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
DebugInformationFormat="3"
/>
@@ -246,6 +247,7 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -437,6 +439,7 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
DebugInformationFormat="3"
/>
@@ -637,6 +640,7 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -828,6 +832,7 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1022,7 +1027,7 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
- ProgramDataBaseFileName="$(IntDir)\libxsupconfigwrite\vc80.pdb"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -1226,6 +1231,7 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
DebugInformationFormat="3"
/>
@@ -1427,6 +1433,7 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
DebugInformationFormat="3"
/>
@@ -1629,6 +1636,7 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1823,6 +1831,7 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
DebugInformationFormat="3"
/>
@@ -2026,6 +2035,7 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
BrowseInformation="0"
DebugInformationFormat="3"
/>
@@ -2228,6 +2238,7 @@
AdditionalIncludeDirectories="..\..\lib;..\..;"$(ICONVDIR)\include";"$(LIBXML2DIR)\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="2"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Modified: trunk/xsupplicant/vs2005/libxsupgui/libxsupgui.vcproj
===================================================================
--- trunk/xsupplicant/vs2005/libxsupgui/libxsupgui.vcproj 2009-09-01 15:10:37 UTC (rev 704)
+++ trunk/xsupplicant/vs2005/libxsupgui/libxsupgui.vcproj 2009-09-11 05:35:58 UTC (rev 705)
@@ -177,6 +177,7 @@
AdditionalIncludeDirectories=""..\..\..\iconv-1.9.2.win32\include";"..\..\..\libxml2-2.6.27.win32\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -366,6 +367,7 @@
ExecutionBucket="7"
AdditionalIncludeDirectories=""..\..\..\iconv-1.9.2.win32\include";"..\..\..\libxml2-2.6.27.win32\include""
PreprocessorDefinitions="WINDOWS"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -562,6 +564,7 @@
AdditionalIncludeDirectories=""..\..\..\iconv-1.9.2.win32\include";"..\..\..\libxml2-2.6.27.win32\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -751,6 +754,7 @@
ExecutionBucket="7"
AdditionalIncludeDirectories=""..\..\..\iconv-1.9.2.win32\include";"..\..\..\libxml2-2.6.27.win32\include""
PreprocessorDefinitions="WINDOWS"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -940,6 +944,7 @@
ExecutionBucket="7"
AdditionalIncludeDirectories=""..\..\..\iconv-1.9.2.win32\include";"..\..\..\libxml2-2.6.27.win32\include""
PreprocessorDefinitions="WINDOWS"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
EnableFloatingPointEmulation="false"
/>
<Tool
@@ -1140,6 +1145,7 @@
AdditionalIncludeDirectories=""..\..\..\iconv-1.9.2.win32\include";"..\..\..\libxml2-2.6.27.win32\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
EnableFloatingPointEmulation="false"
/>
@@ -1338,6 +1344,7 @@
AdditionalIncludeDirectories=""..\..\..\iconv-1.9.2.win32\include";"..\..\..\libxml2-2.6.27.win32\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
/>
<Tool
@@ -1536,6 +1543,7 @@
AdditionalIncludeDirectories=""..\..\..\iconv-1.9.2.win32\include";"..\..\..\libxml2-2.6.27.win32\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
EnableFloatingPointEmulation="false"
/>
@@ -1727,6 +1735,7 @@
ExecutionBucket="7"
AdditionalIncludeDirectories=""..\..\..\iconv-1.9.2.win32\include";"..\..\..\libxml2-2.6.27.win32\include""
PreprocessorDefinitions="WINDOWS"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
EnableFloatingPointEmulation="false"
/>
<Tool
@@ -1925,6 +1934,7 @@
AdditionalIncludeDirectories=""..\..\..\iconv-1.9.2.win32\include";"..\..\..\libxml2-2.6.27.win32\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
EnableFloatingPointEmulation="false"
/>
@@ -2124,6 +2134,7 @@
AdditionalIncludeDirectories=""..\..\..\iconv-1.9.2.win32\include";"..\..\..\libxml2-2.6.27.win32\include""
PreprocessorDefinitions="WINDOWS"
RuntimeLibrary="3"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
DebugInformationFormat="3"
EnableFloatingPointEmulation="false"
/>
@@ -2315,6 +2326,7 @@
ExecutionBucket="7"
AdditionalIncludeDirectories=""..\..\..\iconv-1.9.2.win32\include";"..\..\..\libxml2-2.6.27.win32\include""
PreprocessorDefinitions="WINDOWS"
+ ProgramDataBaseFileName="$(TargetDir)$(TargetName).pdb"
EnableFloatingPointEmulation="false"
/>
<Tool
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-09-01 15:10:49
|
Revision: 704
http://open1x.svn.sourceforge.net/open1x/?rev=704&view=rev
Author: chessing
Date: 2009-09-01 15:10:37 +0000 (Tue, 01 Sep 2009)
Log Message:
-----------
Edited build script to use a newer version of libxml.
Modified Paths:
--------------
trunk/xsupplicant-build/windows/scripts/build_open1x.bat
Modified: trunk/xsupplicant-build/windows/scripts/build_open1x.bat
===================================================================
--- trunk/xsupplicant-build/windows/scripts/build_open1x.bat 2009-08-14 02:14:41 UTC (rev 703)
+++ trunk/xsupplicant-build/windows/scripts/build_open1x.bat 2009-09-01 15:10:37 UTC (rev 704)
@@ -59,7 +59,7 @@
set MSPLATFORMSDK=%MSPLATFORMSDK%
if [%LIBXML2DIR%]==[] (
- set LIBXML2DIR=%OPEN1X_LIBRARY_ROOT%\libxml2-2.6.30+.win32
+ set LIBXML2DIR=%OPEN1X_LIBRARY_ROOT%\libxml2-2.7.3.win32
)
if [%ICONVDIR%]==[] (
set ICONVDIR=%OPEN1X_LIBRARY_ROOT%\iconv-1.9.2.win32
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-08-14 02:14:57
|
Revision: 703
http://open1x.svn.sourceforge.net/open1x/?rev=703&view=rev
Author: chessing
Date: 2009-08-14 02:14:41 +0000 (Fri, 14 Aug 2009)
Log Message:
-----------
Bug 2832441 - fixed.
Bug 2482600 - fixed.
Modified Paths:
--------------
trunk/xsupplicant/lib/libxsupconfig/xsupconfig_parse_globals.c
trunk/xsupplicant/lib/libxsupconfig/xsupconfig_structs.h
trunk/xsupplicant/lib/libxsupconfwrite/xsupconfwrite_globals.c
trunk/xsupplicant/src/platform/windows/cardif_windows_events.c
trunk/xsupplicant/src/xsup_driver.c
Modified: trunk/xsupplicant/lib/libxsupconfig/xsupconfig_parse_globals.c
===================================================================
--- trunk/xsupplicant/lib/libxsupconfig/xsupconfig_parse_globals.c 2009-08-08 19:39:33 UTC (rev 702)
+++ trunk/xsupplicant/lib/libxsupconfig/xsupconfig_parse_globals.c 2009-08-14 02:14:41 UTC (rev 703)
@@ -310,6 +310,42 @@
return myglobals;
}
+/**
+ * \brief Enable/disable forcing reprompting of user credentials when a wired link drops.
+ **/
+void *xsupconfig_parse_wired_link_reprompt(void **attr, uint8_t config_type,
+ xmlNodePtr node)
+{
+ struct config_globals *myglobals = NULL;
+ uint8_t result = 0;
+ char *value = NULL;
+
+ value = (char *)xmlNodeGetContent(node);
+
+#ifdef PARSE_DEBUG
+ printf("Wired reprompt on link drop : %s\n", value);
+#endif
+
+ myglobals = (*attr);
+
+ result = xsupconfig_common_yesno(value);
+
+ if (result == 1) {
+ SET_FLAG(myglobals->flags, CONFIG_GLOBALS_REPROMPT_WIRED);
+ } else if (result == 0) {
+ UNSET_FLAG(myglobals->flags, CONFIG_GLOBALS_REPROMPT_WIRED);
+ } else {
+ xsupconfig_common_log
+ ("Unknown value for Wired_Link_Drop_Reprompt. (Line %ld) Using default "
+ "of 'NO'.\n", xsupconfig_parse_get_line_num());
+ UNSET_FLAG(myglobals->flags, CONFIG_GLOBALS_REPROMPT_WIRED);
+ }
+
+ xmlFree(value);
+
+ return myglobals;
+}
+
void *xsupconfig_parse_ipc_group(void **attr, uint8_t config_type,
xmlNodePtr node)
{
@@ -1195,5 +1231,8 @@
{"Allow_Machine_Authentication_to_Remain", NULL, FALSE,
OPTION_GLOBAL_CONFIG_ONLY, &xsupconfig_parse_allow_ma_remain}
,
+ {"Wired_Link_Drop_Reprompt", NULL, FALSE,
+ OPTION_GLOBAL_CONFIG_ONLY, &xsupconfig_parse_wired_link_reprompt}
+ ,
{NULL, NULL, FALSE, 0, NULL}
};
Modified: trunk/xsupplicant/lib/libxsupconfig/xsupconfig_structs.h
===================================================================
--- trunk/xsupplicant/lib/libxsupconfig/xsupconfig_structs.h 2009-08-08 19:39:33 UTC (rev 702)
+++ trunk/xsupplicant/lib/libxsupconfig/xsupconfig_structs.h 2009-08-14 02:14:41 UTC (rev 703)
@@ -304,6 +304,7 @@
#define CONFIG_GLOBALS_WIRELESS_ONLY BIT(11) // Only manage wireless interfaces.
#define CONFIG_GLOBALS_INT_CTRL BIT(12) // Should we allow the underlying OS to control the interfaces?
#define CONFIG_GLOBALS_ALLOW_MA_REMAIN BIT(13) // Should we allow a machine authentication to remain connected even after a user has logged on?
+#define CONFIG_GLOBALS_REPROMPT_WIRED BIT(14) // When link drops on a wired interface, should we force the user to enter their credentials again?
#define LOGGING_NONE 0 // Don't log anything.
#define LOGGING_FILE 1 // Log to a file. (Default)
Modified: trunk/xsupplicant/lib/libxsupconfwrite/xsupconfwrite_globals.c
===================================================================
--- trunk/xsupplicant/lib/libxsupconfwrite/xsupconfwrite_globals.c 2009-08-08 19:39:33 UTC (rev 702)
+++ trunk/xsupplicant/lib/libxsupconfwrite/xsupconfwrite_globals.c 2009-08-14 02:14:41 UTC (rev 703)
@@ -232,6 +232,13 @@
return NULL;
}
+ if (xsupconfwrite_common_write_bool(globalnode, "Wired_Link_Drop_Reprompt",
+ TEST_FLAG(conf_globals->flags, CONFIG_GLOBALS_REPROMPT_WIRED),
+ FALSE, write_all, FALSE) == NULL) {
+ xmlFreeNode(globalnode);
+ return NULL;
+ }
+
if (xsupconfwrite_common_write_bool(globalnode, "Disconnect_at_Logoff",
TEST_FLAG(conf_globals->flags, CONFIG_GLOBALS_DISCONNECT_AT_LOGOFF),
TRUE, write_all, FALSE) == NULL) {
Modified: trunk/xsupplicant/src/platform/windows/cardif_windows_events.c
===================================================================
--- trunk/xsupplicant/src/platform/windows/cardif_windows_events.c 2009-08-08 19:39:33 UTC (rev 702)
+++ trunk/xsupplicant/src/platform/windows/cardif_windows_events.c 2009-08-14 02:14:41 UTC (rev 703)
@@ -141,6 +141,7 @@
void cardif_windows_events_delay_link_up_thread(void *ctxptr)
{
context * ctx = NULL;
+ config_globals *globals = NULL;
if (!xsup_assert((ctxptr != NULL), "ctxptr != NULL", FALSE))
{
@@ -161,6 +162,23 @@
return;
}
+ globals = config_get_globals();
+ if (TEST_FLAG(globals->flags, CONFIG_GLOBALS_REPROMPT_WIRED))
+ {
+ // We want to flush our credentials on this interface.
+ if (ctx->prof != NULL) {
+ debug_printf(DEBUG_NORMAL,
+ "Flushing credentials on '%s' per the configuration file.\n",
+ ctx->desc);
+ FREE(ctx->prof->temp_username);
+ FREE(ctx->prof->temp_password);
+ // Ask the UI to give us new credentials.
+ ipc_events_ui(ctx, IPC_EVENT_8021X_FAILED,
+ ctx->conn_name);
+ }
+ }
+
+
debug_printf(DEBUG_INT, "Enabling wired port.\n");
debug_printf(DEBUG_NORMAL, "Interface '%s' now has link.\n",
ctx->desc);
Modified: trunk/xsupplicant/src/xsup_driver.c
===================================================================
--- trunk/xsupplicant/src/xsup_driver.c 2009-08-08 19:39:33 UTC (rev 702)
+++ trunk/xsupplicant/src/xsup_driver.c 2009-08-14 02:14:41 UTC (rev 703)
@@ -652,6 +652,7 @@
// A second file is implicitly generated by the crash dumper, so we need to add that to the
// list too.
crashdump_add_file("\\xsupengine-" BUILDNUM ".dmp.log", 1);
+
#elif LINUX
crash_handler_install("/tmp/xsupengine-" BUILDNUM ".txt");
crashdump_add_file("/tmp/xsupengine-" BUILDNUM ".txt", 1);
@@ -659,6 +660,9 @@
#warning You need to implement crash dump handling for your platform.
#endif
+ crashdump_add_file("\\xsupui-" BUILDNUM ".dmp", 1);
+ crashdump_add_file("\\xsupui-" BUILDNUM ".dmp.log", 1);
+
#ifdef BUILD_SERVICE
win_svc_init();
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-08-08 19:39:42
|
Revision: 702
http://open1x.svn.sourceforge.net/open1x/?rev=702&view=rev
Author: chessing
Date: 2009-08-08 19:39:33 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
Bug 2832420 - fixed.
Modified Paths:
--------------
trunk/xsupplicant/lib/libxsupconfig/xsupconfig_defaults.c
trunk/xsupplicant/lib/libxsupconfwrite/xsupconfwrite_globals.c
Modified: trunk/xsupplicant/lib/libxsupconfig/xsupconfig_defaults.c
===================================================================
--- trunk/xsupplicant/lib/libxsupconfig/xsupconfig_defaults.c 2009-08-05 03:48:31 UTC (rev 701)
+++ trunk/xsupplicant/lib/libxsupconfig/xsupconfig_defaults.c 2009-08-08 19:39:33 UTC (rev 702)
@@ -45,6 +45,7 @@
toset->size_to_roll = LOG_SIZE_TO_ROLL; // Roll logs when they reach 10 megs.
toset->dead_connection_timeout = DEAD_CONN_TIMEOUT;
toset->logtype = LOGGING_FILE;
+ toset->destination = DEST_MULTICAST;
#ifndef WINDOWS
pathptr = (char *)malloc(15);
if (pathptr != NULL) {
Modified: trunk/xsupplicant/lib/libxsupconfwrite/xsupconfwrite_globals.c
===================================================================
--- trunk/xsupplicant/lib/libxsupconfwrite/xsupconfwrite_globals.c 2009-08-05 03:48:31 UTC (rev 701)
+++ trunk/xsupplicant/lib/libxsupconfwrite/xsupconfwrite_globals.c 2009-08-08 19:39:33 UTC (rev 702)
@@ -378,7 +378,7 @@
return NULL;
}
- if ((write_all == TRUE) || (conf_globals->destination != DEST_AUTO)) {
+ if ((write_all == TRUE) || (conf_globals->destination != DEST_MULTICAST)) {
switch (conf_globals->destination) {
default:
case DEST_AUTO:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-08-05 03:48:42
|
Revision: 701
http://open1x.svn.sourceforge.net/open1x/?rev=701&view=rev
Author: chessing
Date: 2009-08-05 03:48:31 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
Bug 2820869 fixed.
Modified Paths:
--------------
trunk/xsupplicant-ui/xsupptray/WizardPages.cpp
Modified: trunk/xsupplicant-ui/xsupptray/WizardPages.cpp
===================================================================
--- trunk/xsupplicant-ui/xsupptray/WizardPages.cpp 2009-07-15 20:53:37 UTC (rev 700)
+++ trunk/xsupplicant-ui/xsupptray/WizardPages.cpp 2009-08-05 03:48:31 UTC (rev 701)
@@ -4178,7 +4178,7 @@
{
m_curData = data;
- if ((m_curData.m_username == "") && (m_curData.m_password == ""))
+ if ((m_curData.m_username.isEmpty()) && (m_curData.m_password.isEmpty()))
{
if (m_pRadioButtonPrompt != NULL)
m_pRadioButtonPrompt->setChecked(true);
@@ -4226,8 +4226,8 @@
if (m_pUsernameEdit != NULL)
m_pUsernameEdit->setEnabled(true);
- if ((m_curData.m_eapProtocol != ConnectionWizardData::eap_tls)
- || !((m_curData.m_eapProtocol == ConnectionWizardData::eap_peap)
+ if ((m_curData.m_eapProtocol == ConnectionWizardData::eap_tls)
+ || ((m_curData.m_eapProtocol == ConnectionWizardData::eap_peap)
&& (m_curData.m_innerPEAPProtocol == ConnectionWizardData::inner_eap_gtc)))
{
if (m_pPasswordLabel != NULL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-07-15 20:53:51
|
Revision: 700
http://open1x.svn.sourceforge.net/open1x/?rev=700&view=rev
Author: chessing
Date: 2009-07-15 20:53:37 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
Bug 2820870 fixed.
Modified Paths:
--------------
trunk/xsupplicant/src/xsup_debug.c
trunk/xsupplicant/src/xsup_driver.c
Modified: trunk/xsupplicant/src/xsup_debug.c
===================================================================
--- trunk/xsupplicant/src/xsup_debug.c 2009-07-12 01:20:23 UTC (rev 699)
+++ trunk/xsupplicant/src/xsup_debug.c 2009-07-15 20:53:37 UTC (rev 700)
@@ -372,8 +372,7 @@
}
#ifdef WINDOWS
if (strlen(temp) != 0) {
- if (globals->logpath[strlen(globals->logpath) - 1] ==
- '\\') {
+ if (globals->logpath[strlen(globals->logpath) - 1] == '\\') {
sprintf(full_filename, "%s%s_%s.%s",
globals->logpath, DEFAULT_LOG_NAME,
temp, DEFAULT_LOG_EXT);
@@ -383,8 +382,7 @@
temp, DEFAULT_LOG_EXT);
}
} else {
- if (globals->logpath[strlen(globals->logpath) - 1] ==
- '\\') {
+ if (globals->logpath[strlen(globals->logpath) - 1] == '\\') {
sprintf(full_filename, "%s%s.%s",
globals->logpath, DEFAULT_LOG_NAME,
DEFAULT_LOG_EXT);
@@ -569,15 +567,9 @@
if ((newpath == NULL) || (strlen(newpath) == 0)) {
// Turn off the log file if we are using it.
-/* if (logfile != NULL)
- {
- debug_printf(DEBUG_NORMAL, "Logging to a file has been disabled.\n");
- fclose(logfile);
- FREE(active_logpath);
- } */
-
return TRUE;
}
+
// If we aren't logging to a file right now, then it doesn't matter if the logpath changed.
if (logfile == NULL)
return TRUE;
@@ -1312,7 +1304,7 @@
}
vsnprintf((char *)&temp, TEMP_LOG_BUF_SIZE - 2, fmt, ap);
-
+
tdstring = xsup_debug_system_time();
if (tdstring != NULL) {
_snprintf((char *)&fullstr, TEMP_LOG_BUF_SIZE - 2,
@@ -1334,8 +1326,7 @@
}
}
- if (Strcat
- ((char *)&dumpstr, TEMP_LOG_BUF_SIZE,
+ if (Strcat((char *)&dumpstr, TEMP_LOG_BUF_SIZE,
(char *)&fullstr) != 0) {
fprintf(stderr, "Refusing to overflow the string!\n");
return;
@@ -1348,9 +1339,9 @@
va_end(ap);
return;
}
- if (logfile != NULL)
- ufprintf(logfile, dumpstr, level);
+ ufprintf(logfile, dumpstr, level);
+
va_end(ap);
}
}
Modified: trunk/xsupplicant/src/xsup_driver.c
===================================================================
--- trunk/xsupplicant/src/xsup_driver.c 2009-07-12 01:20:23 UTC (rev 699)
+++ trunk/xsupplicant/src/xsup_driver.c 2009-07-15 20:53:37 UTC (rev 700)
@@ -791,6 +791,10 @@
// Otherwise, keep going.
}
+ else
+ {
+ printf("Starting XSupplicant v. %s.%s\n", VERSION, BUILDNUM);
+ }
retval = xsup_driver_basic_init(config, xdaemon);
if (retval < 0) {
@@ -812,6 +816,7 @@
#endif
return -1;
}
+
// When we quit, cleanup. For Windows, we handle this a different way. That method is
// set up in the event_core_init() call for Windows.
#ifndef WINDOWS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-07-12 01:20:26
|
Revision: 699
http://open1x.svn.sourceforge.net/open1x/?rev=699&view=rev
Author: chessing
Date: 2009-07-12 01:20:23 +0000 (Sun, 12 Jul 2009)
Log Message:
-----------
Bug 2819863 fixed.
Modified Paths:
--------------
trunk/xsupplicant-ui/xsupptray/ConnectionWizardData.cpp
trunk/xsupplicant-ui/xsupptray/WizardPages.cpp
Modified: trunk/xsupplicant-ui/xsupptray/ConnectionWizardData.cpp
===================================================================
--- trunk/xsupplicant-ui/xsupptray/ConnectionWizardData.cpp 2009-07-10 22:06:30 UTC (rev 698)
+++ trunk/xsupplicant-ui/xsupptray/ConnectionWizardData.cpp 2009-07-12 01:20:23 UTC (rev 699)
@@ -455,7 +455,8 @@
return false;
if (m_eapProtocol == ConnectionWizardData::eap_tls) {
- // We don't want to set the outer username here because it is the only username. (So we want to prompt.)
+ this->toProfileOuterIdentity(pProfile);
+
if (pProfile->method == NULL)
{
pProfile->method = (struct config_eap_method *)malloc(sizeof(struct config_eap_method));
Modified: trunk/xsupplicant-ui/xsupptray/WizardPages.cpp
===================================================================
--- trunk/xsupplicant-ui/xsupptray/WizardPages.cpp 2009-07-10 22:06:30 UTC (rev 698)
+++ trunk/xsupplicant-ui/xsupptray/WizardPages.cpp 2009-07-12 01:20:23 UTC (rev 699)
@@ -4195,6 +4195,26 @@
if (m_pPasswordEdit != NULL)
m_pPasswordEdit->setEnabled(false);
}
+ else if ((m_curData.m_eapProtocol == ConnectionWizardData::eap_tls) &&
+ (!m_curData.m_outerIdentity.isEmpty()))
+ {
+ if (m_pRadioButtonStore != NULL)
+ m_pRadioButtonStore->setChecked(true);
+
+ if (m_pUsernameLabel != NULL)
+ m_pUsernameLabel->setEnabled(true);
+
+ if (m_pUsernameEdit != NULL)
+ m_pUsernameEdit->setEnabled(true);
+
+ m_pUsernameEdit->setText(m_curData.m_outerIdentity);
+
+ if (m_pPasswordLabel != NULL)
+ m_pPasswordLabel->setEnabled(false);
+
+ if (m_pPasswordEdit != NULL)
+ m_pPasswordEdit->setEnabled(false);
+ }
else
{
if (m_pRadioButtonStore != NULL)
@@ -4249,8 +4269,16 @@
if ((m_pRadioButtonStore != NULL)
&& (m_pRadioButtonStore->isChecked()))
{
- if ((m_curData.m_eapProtocol != ConnectionWizardData::eap_tls)
- || !((m_curData.m_eapProtocol == ConnectionWizardData::eap_peap)
+ if (m_curData.m_eapProtocol == ConnectionWizardData::eap_tls)
+ {
+ if (m_pUsernameEdit->text() == "")
+ {
+ QMessageBox::critical(this, tr("Error"),
+ tr("You need to provide a username, or select the 'Prompt for credentials' option."));
+ return false;
+ }
+ }
+ else if (!((m_curData.m_eapProtocol == ConnectionWizardData::eap_peap)
&& (m_curData.m_innerPEAPProtocol == ConnectionWizardData::inner_eap_gtc)))
{
// We need to make sure that we have values stored.
@@ -4302,8 +4330,14 @@
if (m_pUsernameEdit != NULL)
m_pUsernameEdit->setEnabled(true);
- if ((m_curData.m_eapProtocol != ConnectionWizardData::eap_tls)
- || !((m_curData.m_eapProtocol == ConnectionWizardData::eap_peap)
+ if (m_curData.m_eapProtocol == ConnectionWizardData::eap_tls)
+ {
+ if (m_pPasswordLabel != NULL)
+ m_pPasswordLabel->setEnabled(false);
+
+ if (m_pPasswordEdit != NULL)
+ m_pPasswordLabel->setEnabled(false);
+ } else if (!((m_curData.m_eapProtocol == ConnectionWizardData::eap_peap)
&& (m_curData.m_innerPEAPProtocol == ConnectionWizardData::inner_eap_gtc)))
{
if (m_pPasswordLabel != NULL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-07-10 22:06:43
|
Revision: 698
http://open1x.svn.sourceforge.net/open1x/?rev=698&view=rev
Author: chessing
Date: 2009-07-10 22:06:30 +0000 (Fri, 10 Jul 2009)
Log Message:
-----------
Bug 2819846 fixed.
Modified Paths:
--------------
trunk/xsupplicant-ui/xsupptray/XSupCalls.cpp
Modified: trunk/xsupplicant-ui/xsupptray/XSupCalls.cpp
===================================================================
--- trunk/xsupplicant-ui/xsupptray/XSupCalls.cpp 2009-07-10 22:02:43 UTC (rev 697)
+++ trunk/xsupplicant-ui/xsupptray/XSupCalls.cpp 2009-07-10 22:06:30 UTC (rev 698)
@@ -3309,13 +3309,10 @@
return false;
}
#else
-#warning FIX!
- /*
- if (supdetect_numinstance(exeName) >= 2)
- {
- return false;
- }
- */
+ if (supdetect_numinstances(exeName) >= 2)
+ {
+ return false;
+ }
#endif
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-07-10 22:02:44
|
Revision: 697
http://open1x.svn.sourceforge.net/open1x/?rev=697&view=rev
Author: chessing
Date: 2009-07-10 22:02:43 +0000 (Fri, 10 Jul 2009)
Log Message:
-----------
Some work on 2683931
Modified Paths:
--------------
trunk/xsupplicant/src/event_core.c
Modified: trunk/xsupplicant/src/event_core.c
===================================================================
--- trunk/xsupplicant/src/event_core.c 2009-07-10 21:47:21 UTC (rev 696)
+++ trunk/xsupplicant/src/event_core.c 2009-07-10 22:02:43 UTC (rev 697)
@@ -298,16 +298,15 @@
}
#ifdef USE_DIRECT_RADIUS
- if (cardif_radius_eap_sm(ctx) == TRUE) {
+ if (cardif_radius_eap_sm(events[i].ctx) == TRUE) {
debug_printf(DEBUG_NORMAL, "Got a fake ID request!\n");
- result = cardif_get_socket(ctx);
+ result = cardif_get_socket(events[i].ctx);
for (i = 0; i < MAX_EVENTS; i++) {
if (events[i].socket == result) {
if (events[i].func_to_call) {
- events[i].func_to_call(ctx,
- events
- [i].socket);
+ events[i].func_to_call(events[i].ctx,
+ events[i].socket);
}
}
}
@@ -430,8 +429,7 @@
active_ctx = NULL;
}
#ifdef USE_DIRECT_RADIUS
- // XXX This is broken!
- statemachine_run(ctx);
+ statemachine_run(events[i].ctx);
#endif
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-07-10 21:47:33
|
Revision: 696
http://open1x.svn.sourceforge.net/open1x/?rev=696&view=rev
Author: chessing
Date: 2009-07-10 21:47:21 +0000 (Fri, 10 Jul 2009)
Log Message:
-----------
Bug 2793306 - fixed.
Modified Paths:
--------------
trunk/xsupplicant/src/eap_types/md5/eapmd5.c
trunk/xsupplicant/src/eap_types/psk/eappsk.c
trunk/xsupplicant/src/eap_types/tls/eaptls.c
Modified: trunk/xsupplicant/src/eap_types/md5/eapmd5.c
===================================================================
--- trunk/xsupplicant/src/eap_types/md5/eapmd5.c 2009-07-10 21:15:48 UTC (rev 695)
+++ trunk/xsupplicant/src/eap_types/md5/eapmd5.c 2009-07-10 21:47:21 UTC (rev 696)
@@ -104,12 +104,6 @@
return;
}
- if (myeap->eap_identifier == 0) {
- debug_printf(DEBUG_NORMAL, "Invalid EAP identifier!\n");
- eap_type_common_fail(eapdata);
- return;
- }
-
if (ntohs(myeap->eap_length) < (17 + sizeof(struct eap_header))) {
debug_printf(DEBUG_NORMAL,
"Not enough data for valid EAP method.\n");
Modified: trunk/xsupplicant/src/eap_types/psk/eappsk.c
===================================================================
--- trunk/xsupplicant/src/eap_types/psk/eappsk.c 2009-07-10 21:15:48 UTC (rev 695)
+++ trunk/xsupplicant/src/eap_types/psk/eappsk.c 2009-07-10 21:47:21 UTC (rev 696)
@@ -112,13 +112,6 @@
return;
}
- if (myeap->eap_identifier == 0)
- {
- debug_printf(DEBUG_NORMAL, "Invalid EAP identifier!\n");
- eap_type_common_fail(eapdata);
- return;
- }
-
pskconf = (struct config_pwd_only *)eapdata->eap_conf_data;
if (pskconf == NULL)
{
Modified: trunk/xsupplicant/src/eap_types/tls/eaptls.c
===================================================================
--- trunk/xsupplicant/src/eap_types/tls/eaptls.c 2009-07-10 21:15:48 UTC (rev 695)
+++ trunk/xsupplicant/src/eap_types/tls/eaptls.c 2009-07-10 21:47:21 UTC (rev 696)
@@ -212,12 +212,6 @@
return;
}
- if (myeap->eap_identifier == 0) {
- debug_printf(DEBUG_NORMAL, "Invalid EAP identifier!\n");
- eap_type_common_fail(eapdata);
- return;
- }
-
if (ntohs(myeap->eap_length) < (1 + sizeof(struct eap_header))) {
debug_printf(DEBUG_NORMAL,
"Not enough data for valid EAP method.\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-07-10 21:16:08
|
Revision: 695
http://open1x.svn.sourceforge.net/open1x/?rev=695&view=rev
Author: chessing
Date: 2009-07-10 21:15:48 +0000 (Fri, 10 Jul 2009)
Log Message:
-----------
Fixed the installer scripts for building on x64.
Modified Paths:
--------------
trunk/xsupplicant-build/linux/installer/xsupplicant.xml
Modified: trunk/xsupplicant-build/linux/installer/xsupplicant.xml
===================================================================
--- trunk/xsupplicant-build/linux/installer/xsupplicant.xml 2009-07-08 22:24:19 UTC (rev 694)
+++ trunk/xsupplicant-build/linux/installer/xsupplicant.xml 2009-07-10 21:15:48 UTC (rev 695)
@@ -56,7 +56,6 @@
<path>/opt/xsupplicant</path>
</deleteFile>
</postUninstallationActionList>
- <a2555a>1</a2555a>
<allowComponentSelection>1</allowComponentSelection>
<compressionAlgorithm>lzma</compressionAlgorithm>
<enableRollback>1</enableRollback>
@@ -147,6 +146,46 @@
</distributionFile>
</distributionFileList>
</folder>
+ <folder>
+ <description>Program Files</description>
+ <destination>${installdir}</destination>
+ <name>programfileslinuxx64</name>
+ <platforms>linux-x64</platforms>
+ <distributionFileList>
+ <distributionFile>
+ <origin>../../../xsupplicant_plugin_installer/src/xsupplicant_plugin_installer</origin>
+ </distributionFile>
+ <distributionFile>
+ <origin>../../../xsupplicant/src/xsupplicant</origin>
+ </distributionFile>
+ <distributionFile>
+ <origin>../../../xsupplicant-ui/build-debug/XSupplicantUI</origin>
+ </distributionFile>
+ <distributionFile>
+ <origin>../scripts/open1x.org.xsupplicant</origin>
+ </distributionFile>
+ <distributionDirectory>
+ <origin>../../../xsupplicant-ui/Skins</origin>
+ </distributionDirectory>
+ </distributionFileList>
+ </folder>
+ <folder>
+ <description>Modules</description>
+ <destination>${installdir}/Modules</destination>
+ <name>modulesx64</name>
+ <platforms>linux-x64</platforms>
+ <distributionFileList>
+ <distributionFile>
+ <origin>../../../xsupplicant/plugins/.libs/libbirddog.so</origin>
+ </distributionFile>
+ <distributionFile>
+ <origin>../../../xsupplicant/plugins/.libs/libbirddog.so.0</origin>
+ </distributionFile>
+ <distributionFile>
+ <origin>../../../xsupplicant/plugins/.libs/libbirddog.so.0.0.0</origin>
+ </distributionFile>
+ </distributionFileList>
+ </folder>
</folderList>
<startMenuShortcutList>
<startMenuShortcut>
@@ -196,6 +235,23 @@
</distributionFile>
</distributionFileList>
</folder>
+ <folder>
+ <description>Modules</description>
+ <destination>${installdir}/Modules</destination>
+ <name>modulesx64</name>
+ <platforms>linux-x64</platforms>
+ <distributionFileList>
+ <distributionFile>
+ <origin>../../../xsupplicant/plugins/SoftSIM2G/.libs/libsoftsim2g.so</origin>
+ </distributionFile>
+ <distributionFile>
+ <origin>../../../xsupplicant/plugins/SoftSIM2G/.libs/libsoftsim2g.so.0</origin>
+ </distributionFile>
+ <distributionFile>
+ <origin>../../../xsupplicant/plugins/SoftSIM2G/.libs/libsoftsim2g.so.0.0.0</origin>
+ </distributionFile>
+ </distributionFileList>
+ </folder>
</folderList>
<postInstallationActionList>
<runProgram>
@@ -240,6 +296,23 @@
</distributionFile>
</distributionFileList>
</folder>
+ <folder>
+ <description>Modules</description>
+ <destination>${installdir}/Modules</destination>
+ <name>modulesx64</name>
+ <platforms>linux-x64</platforms>
+ <distributionFileList>
+ <distributionFile>
+ <origin>../../../xsupplicant/plugins/SoftSIM3G/.libs/libsoftsim3g.so</origin>
+ </distributionFile>
+ <distributionFile>
+ <origin>../../../xsupplicant/plugins/SoftSIM3G/.libs/libsoftsim3g.so.0</origin>
+ </distributionFile>
+ <distributionFile>
+ <origin>../../../xsupplicant/plugins/SoftSIM3G/.libs/libsoftsim3g.so.0.0.0</origin>
+ </distributionFile>
+ </distributionFileList>
+ </folder>
</folderList>
<postInstallationActionList>
<runProgram>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-07-08 22:24:26
|
Revision: 694
http://open1x.svn.sourceforge.net/open1x/?rev=694&view=rev
Author: chessing
Date: 2009-07-08 22:24:19 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
Bug 2796264 fixed.
Modified Paths:
--------------
trunk/xsupplicant/lib/libxsupconfig/xsupconfig_parse_globals.c
trunk/xsupplicant/src/platform/windows/cardif_windows_events.c
Modified: trunk/xsupplicant/lib/libxsupconfig/xsupconfig_parse_globals.c
===================================================================
--- trunk/xsupplicant/lib/libxsupconfig/xsupconfig_parse_globals.c 2009-07-07 22:58:28 UTC (rev 693)
+++ trunk/xsupplicant/lib/libxsupconfig/xsupconfig_parse_globals.c 2009-07-08 22:24:19 UTC (rev 694)
@@ -129,8 +129,7 @@
conf_globals = malloc(sizeof(struct config_globals));
if (conf_globals == NULL) {
- printf
- ("Couldn't allocate memory to store global setting configuration!"
+ printf("Couldn't allocate memory to store global setting configuration!"
" (Line %ld)\n", xsupconfig_parse_get_line_num());
exit(1);
}
@@ -405,8 +404,7 @@
myglobals = (*attr);
if (xsupconfig_common_is_number(value) == 0) {
- xsupconfig_common_log
- ("Value assigned to Idle_While is not a number! (Line %ld) "
+ xsupconfig_common_log("Value assigned to Idle_While is not a number! (Line %ld) "
"Using default!\n", xsupconfig_parse_get_line_num());
} else {
myglobals->idleWhile_timeout = atoi(value);
@@ -495,8 +493,7 @@
myglobals = (*attr);
if (xsupconfig_common_is_number(value) == 0) {
- xsupconfig_common_log
- ("Invalid value for Stale_Key_Timeout. (Line %ld) Using "
+ xsupconfig_common_log("Invalid value for Stale_Key_Timeout. (Line %ld) Using "
"default!\n", xsupconfig_parse_get_line_num());
} else {
myglobals->stale_key_timeout = atoi(value);
@@ -522,8 +519,7 @@
myglobals = (*attr);
if (xsupconfig_common_is_number(value) == 0) {
- xsupconfig_common_log
- ("Invalid value for Max_Starts. (Line %ld) Using default!\n",
+ xsupconfig_common_log("Invalid value for Max_Starts. (Line %ld) Using default!\n",
xsupconfig_parse_get_line_num());
} else {
myglobals->max_starts = atoi(value);
@@ -556,8 +552,7 @@
} else if (result == 0) {
UNSET_FLAG(myglobals->flags, CONFIG_GLOBALS_ALLMULTI);
} else {
- xsupconfig_common_log
- ("Unknown value for Allmulti. (Line %ld) Using default of "
+ xsupconfig_common_log("Unknown value for Allmulti. (Line %ld) Using default of "
"'YES'.\n", xsupconfig_parse_get_line_num());
SET_FLAG(myglobals->flags, CONFIG_GLOBALS_ALLMULTI);
}
@@ -656,8 +651,7 @@
} else if (result == 0) {
UNSET_FLAG(myglobals->flags, CONFIG_GLOBALS_PASSIVE_SCAN);
} else {
- xsupconfig_common_log
- ("Unknown value for Passive_Scan. (Line %ld) Using default "
+ xsupconfig_common_log("Unknown value for Passive_Scan. (Line %ld) Using default "
"of 'YES'.\n", xsupconfig_parse_get_line_num());
SET_FLAG(myglobals->flags, CONFIG_GLOBALS_PASSIVE_SCAN);
}
@@ -682,8 +676,7 @@
myglobals = (*attr);
if (xsupconfig_common_is_number(value) == 0) {
- xsupconfig_common_log
- ("Value assigned to Passive_Timeout is not a number! (Line %ld)"
+ xsupconfig_common_log("Value assigned to Passive_Timeout is not a number! (Line %ld)"
" Using default!\n", xsupconfig_parse_get_line_num());
} else {
myglobals->passive_timeout = atoi(value);
@@ -709,8 +702,7 @@
myglobals = (*attr);
if (xsupconfig_common_is_number(value) == 0) {
- xsupconfig_common_log
- ("Value assigned to Association_Timeout is not a number! (Line "
+ xsupconfig_common_log("Value assigned to Association_Timeout is not a number! (Line "
"%ld) Using default!\n",
xsupconfig_parse_get_line_num());
} else {
@@ -737,8 +729,7 @@
myglobals = (*attr);
if (xsupconfig_common_is_number(value) == 0) {
- xsupconfig_common_log
- ("Value assigned to Scan_Timeout is not a number! (Line %ld)"
+ xsupconfig_common_log("Value assigned to Scan_Timeout is not a number! (Line %ld)"
" Using default!\n", xsupconfig_parse_get_line_num());
} else {
myglobals->active_timeout = atoi(value);
@@ -764,8 +755,7 @@
myglobals = (*attr);
if (xsupconfig_common_is_number(value) == 0) {
- xsupconfig_common_log
- ("Value assigned to Logs_To_Keep is not a number! (Line %ld)"
+ xsupconfig_common_log("Value assigned to Logs_To_Keep is not a number! (Line %ld)"
" Using default!\n", xsupconfig_parse_get_line_num());
myglobals->logs_to_keep = OLD_LOGS_TO_KEEP;
} else {
@@ -792,8 +782,7 @@
myglobals = (*attr);
if (xsupconfig_common_is_number(value) == 0) {
- xsupconfig_common_log
- ("Value assigned to Logs_To_Keep is not a number! (Line %ld)"
+ xsupconfig_common_log("Value assigned to Logs_To_Keep is not a number! (Line %ld)"
" Using default!\n", xsupconfig_parse_get_line_num());
myglobals->size_to_roll = LOG_SIZE_TO_ROLL;
} else {
@@ -820,8 +809,7 @@
myglobals = (*attr);
if (xsupconfig_common_is_number(value) == 0) {
- xsupconfig_common_log
- ("Value assigned to PMKSA_Age_Out is not a number! (Line %ld)"
+ xsupconfig_common_log("Value assigned to PMKSA_Age_Out is not a number! (Line %ld)"
" Using default!\n", xsupconfig_parse_get_line_num());
myglobals->pmksa_age_out = PMKSA_DEFAULT_AGEOUT_TIME;
} else {
@@ -848,8 +836,7 @@
myglobals = (*attr);
if (xsupconfig_common_is_number(value) == 0) {
- xsupconfig_common_log
- ("Value assigned to PMKSA_Refresh_Time is not a number! (Line %ld)"
+ xsupconfig_common_log("Value assigned to PMKSA_Refresh_Time is not a number! (Line %ld)"
" Using default!\n", xsupconfig_parse_get_line_num());
myglobals->pmksa_cache_check = PMKSA_CACHE_REFRESH;
} else {
@@ -883,8 +870,7 @@
} else if (result == 0) {
UNSET_FLAG(myglobals->flags, CONFIG_GLOBALS_EAP_HINTS);
} else {
- xsupconfig_common_log
- ("Unknown value for Use_EAP_Hints. (Line %ld) Using "
+ xsupconfig_common_log("Unknown value for Use_EAP_Hints. (Line %ld) Using "
"default of 'YES'.\n", xsupconfig_parse_get_line_num());
SET_FLAG(myglobals->flags, CONFIG_GLOBALS_EAP_HINTS);
}
@@ -943,8 +929,7 @@
UNSET_FLAG(myglobals->flags,
CONFIG_GLOBALS_DISCONNECT_AT_LOGOFF);
} else {
- xsupconfig_common_log
- ("Unknown value for Disconnect_at_Logoff. (Line %ld) Using "
+ xsupconfig_common_log("Unknown value for Disconnect_at_Logoff. (Line %ld) Using "
"default of 'YES'.\n", xsupconfig_parse_get_line_num());
SET_FLAG(myglobals->flags, CONFIG_GLOBALS_DISCONNECT_AT_LOGOFF);
}
@@ -976,8 +961,7 @@
} else if (result == 0) {
UNSET_FLAG(myglobals->flags, CONFIG_GLOBALS_DETECT_ON_STARTUP);
} else {
- xsupconfig_common_log
- ("Unknown value for Detect_on_startup. (Line %ld) Using "
+ xsupconfig_common_log("Unknown value for Detect_on_startup. (Line %ld) Using "
"default of 'YES'.\n", xsupconfig_parse_get_line_num());
SET_FLAG(myglobals->flags, CONFIG_GLOBALS_DETECT_ON_STARTUP);
}
@@ -1009,8 +993,7 @@
} else if (result == 0) {
UNSET_FLAG(myglobals->flags, CONFIG_GLOBALS_ROLL_LOGS);
} else {
- xsupconfig_common_log
- ("Unknown value for Roll_Logs. (Line %ld) Using "
+ xsupconfig_common_log("Unknown value for Roll_Logs. (Line %ld) Using "
"default of 'YES'.\n", xsupconfig_parse_get_line_num());
SET_FLAG(myglobals->flags, CONFIG_GLOBALS_ROLL_LOGS);
}
@@ -1042,8 +1025,7 @@
} else if (result == 0) {
UNSET_FLAG(myglobals->flags, CONFIG_GLOBALS_WIRELESS_ONLY);
} else {
- xsupconfig_common_log
- ("Unknown value for Wireless_Only. (Line %ld) Using "
+ xsupconfig_common_log("Unknown value for Wireless_Only. (Line %ld) Using "
"default of 'NO'.\n", xsupconfig_parse_get_line_num());
UNSET_FLAG(myglobals->flags, CONFIG_GLOBALS_WIRELESS_ONLY);
}
@@ -1074,8 +1056,7 @@
} else if (result == 0) {
UNSET_FLAG(myglobals->flags, CONFIG_GLOBALS_INT_CTRL);
} else {
- xsupconfig_common_log
- ("Unknown value for Control_Interfaces. (Line %ld) Using "
+ xsupconfig_common_log("Unknown value for Control_Interfaces. (Line %ld) Using "
"default of 'YES'.\n", xsupconfig_parse_get_line_num());
SET_FLAG(myglobals->flags, CONFIG_GLOBALS_INT_CTRL);
}
@@ -1100,8 +1081,7 @@
myglobals = (*attr);
if (xsupconfig_common_is_number(value) == 0) {
- xsupconfig_common_log
- ("Value assigned to Dead_Connection_Timeout is not a number! (Line %ld)"
+ xsupconfig_common_log("Value assigned to Dead_Connection_Timeout is not a number! (Line %ld)"
" Using default!\n", xsupconfig_parse_get_line_num());
myglobals->dead_connection_timeout = DEAD_CONN_TIMEOUT;
} else {
Modified: trunk/xsupplicant/src/platform/windows/cardif_windows_events.c
===================================================================
--- trunk/xsupplicant/src/platform/windows/cardif_windows_events.c 2009-07-07 22:58:28 UTC (rev 693)
+++ trunk/xsupplicant/src/platform/windows/cardif_windows_events.c 2009-07-08 22:24:19 UTC (rev 694)
@@ -195,7 +195,23 @@
void cardif_windows_check_unexpected_change(context * ctx, char *ssid)
{
wireless_ctx * wctx = NULL;
+ config_globals *globals = NULL;
+ if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE)) return;
+
+ globals = config_get_globals();
+ if (globals == NULL)
+ {
+ // We don't know, so bail out.
+ return;
+ }
+
+ if (!TEST_FLAG(globals->flags, CONFIG_GLOBALS_INT_CTRL))
+ {
+ // We aren't supposed to manage any interfaces, so ignore the event.
+ return;
+ }
+
if (!TEST_FLAG(ctx->flags, INT_IGNORE))
{
if ((ctx->conn == NULL) || ((ssid != NULL) && (strcmp(ctx->conn->ssid, ssid) != 0)))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-07-07 22:58:30
|
Revision: 693
http://open1x.svn.sourceforge.net/open1x/?rev=693&view=rev
Author: chessing
Date: 2009-07-07 22:58:28 +0000 (Tue, 07 Jul 2009)
Log Message:
-----------
More updates for the Linux installer.
Modified Paths:
--------------
trunk/xsupplicant-build/linux/installer/xsupplicant.xml
Modified: trunk/xsupplicant-build/linux/installer/xsupplicant.xml
===================================================================
--- trunk/xsupplicant-build/linux/installer/xsupplicant.xml 2009-07-07 02:13:59 UTC (rev 692)
+++ trunk/xsupplicant-build/linux/installer/xsupplicant.xml 2009-07-07 22:58:28 UTC (rev 693)
@@ -34,10 +34,9 @@
<programArguments>start</programArguments>
<workingDirectory>${installdir}</workingDirectory>
</runProgram>
- <showText>
- <text>Please disable any instances of wpa_supplicant or NetworkManager that may be running, or may be started after reboot. They will interfere with the operation of XSupplicant.</text>
- <title>Please Disable</title>
- </showText>
+ <showWarning>
+ <text>Please be sure that you have disabled wpa_supplicant, and Network Manager or XSupplicant will not work properly.</text>
+ </showWarning>
</postInstallationActionList>
<preUninstallationActionList>
<removeUnixService>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-07-07 02:14:03
|
Revision: 692
http://open1x.svn.sourceforge.net/open1x/?rev=692&view=rev
Author: chessing
Date: 2009-07-07 02:13:59 +0000 (Tue, 07 Jul 2009)
Log Message:
-----------
Updated the BitRock installer stuff for Linux. It will now prompt with a window indicating actions that must be completed following installation. Also removed an annoying error message that wasn't useful.
Modified Paths:
--------------
trunk/xsupplicant/lib/libxsupconfig/xsupconfig_parse.c
trunk/xsupplicant-build/linux/installer/xsupplicant.xml
Modified: trunk/xsupplicant/lib/libxsupconfig/xsupconfig_parse.c
===================================================================
--- trunk/xsupplicant/lib/libxsupconfig/xsupconfig_parse.c 2009-06-29 19:45:23 UTC (rev 691)
+++ trunk/xsupplicant/lib/libxsupconfig/xsupconfig_parse.c 2009-07-07 02:13:59 UTC (rev 692)
@@ -54,9 +54,8 @@
**/
xmlDocPtr loadConfig(char *filename)
{
- xmlDocPtr doc;
+ xmlDocPtr doc = NULL;
FILE *fp = NULL;
- char *errstr = NULL;
if (filename == NULL) {
printf("Unable to parse NULL file!\n");
@@ -67,19 +66,6 @@
if ((fp = fopen(filename, "r")) == NULL) {
printf("File %s can't be accessed\n", filename);
-#ifndef WINDOWS
- errstr = malloc(128);
- if (errstr == NULL)
- return NULL;
-
- sprintf(errstr,
- "File %s can't be opened. Do you have rights to it?",
- filename);
- error_prequeue_add(errstr);
- free(errstr);
- errstr = NULL;
-#endif
-
return NULL;
}
Modified: trunk/xsupplicant-build/linux/installer/xsupplicant.xml
===================================================================
--- trunk/xsupplicant-build/linux/installer/xsupplicant.xml 2009-06-29 19:45:23 UTC (rev 691)
+++ trunk/xsupplicant-build/linux/installer/xsupplicant.xml 2009-07-07 02:13:59 UTC (rev 692)
@@ -34,6 +34,10 @@
<programArguments>start</programArguments>
<workingDirectory>${installdir}</workingDirectory>
</runProgram>
+ <showText>
+ <text>Please disable any instances of wpa_supplicant or NetworkManager that may be running, or may be started after reboot. They will interfere with the operation of XSupplicant.</text>
+ <title>Please Disable</title>
+ </showText>
</postInstallationActionList>
<preUninstallationActionList>
<removeUnixService>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-06-29 19:45:25
|
Revision: 691
http://open1x.svn.sourceforge.net/open1x/?rev=691&view=rev
Author: chessing
Date: 2009-06-29 19:45:23 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
Small code clean ups.
Modified Paths:
--------------
trunk/xsupplicant/src/ipc_callout.c
trunk/xsupplicant-ui/xsupptray/xsupptray.vcproj
Modified: trunk/xsupplicant/src/ipc_callout.c
===================================================================
--- trunk/xsupplicant/src/ipc_callout.c 2009-06-18 17:20:09 UTC (rev 690)
+++ trunk/xsupplicant/src/ipc_callout.c 2009-06-29 19:45:23 UTC (rev 691)
@@ -592,12 +592,10 @@
debug_printf(DEBUG_NORMAL,
"Couldn't locate a handler for request '%s'!\n",
cur_node->name);
- if (ipc_callout_create_error
- (NULL, (char *)cur_node->name,
+ if (ipc_callout_create_error(NULL, (char *)cur_node->name,
IPC_ERROR_UNKNOWN_REQUEST,
&newChild) == 0) {
- if (xmlAddChild(newRoot, newChild) ==
- NULL) {
+ if (xmlAddChild(newRoot, newChild) == NULL) {
debug_printf(DEBUG_NORMAL,
"Couldn't add child node to response document!\n");
xmlFreeNode(newChild);
Modified: trunk/xsupplicant-ui/xsupptray/xsupptray.vcproj
===================================================================
--- trunk/xsupplicant-ui/xsupptray/xsupptray.vcproj 2009-06-18 17:20:09 UTC (rev 690)
+++ trunk/xsupplicant-ui/xsupptray/xsupptray.vcproj 2009-06-29 19:45:23 UTC (rev 691)
@@ -2139,7 +2139,7 @@
UniqueIdentifier="{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}"
>
<File
- RelativePath=".\debug\moc_AboutDlg.cpp"
+ RelativePath=".\release\moc_AboutDlg.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -2159,6 +2159,7 @@
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -2167,15 +2168,15 @@
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\release\moc_AboutDlg.cpp"
+ RelativePath=".\debug\moc_AboutDlg.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -2195,7 +2196,6 @@
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -2204,10 +2204,10 @@
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
@@ -2374,7 +2374,7 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\Release\moc_ConnectionInfoDlg.cpp"
+ RelativePath=".\Debug\moc_ConnectionInfoDlg.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -2382,8 +2382,8 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)3.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -2392,34 +2392,33 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)3.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)3.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)3.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\Debug\moc_ConnectionInfoDlg.cpp"
+ RelativePath=".\Debug With TNC\moc_ConnectionInfoDlg.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -2427,28 +2426,28 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug With TNC|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -2457,42 +2456,29 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\Debug With TNC\moc_ConnectionInfoDlg.cpp"
+ RelativePath=".\Release With TNC\moc_ConnectionInfoDlg.cpp"
>
<FileConfiguration
- Name="Release With TNC|Win32"
+ Name="Debug With TNC|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug With TNC|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
- />
- </FileConfiguration>
- <FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -2501,20 +2487,30 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\Release With TNC\moc_ConnectionInfoDlg.cpp"
+ RelativePath=".\Release\moc_ConnectionInfoDlg.cpp"
>
<FileConfiguration
+ Name="Release With TNC|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)3.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="Debug With TNC|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)3.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -2524,14 +2520,18 @@
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)3.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)3.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
</File>
@@ -2698,35 +2698,6 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\Release With TNC\moc_ConnectionWizard.cpp"
- >
- <FileConfiguration
- Name="Debug With TNC|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath=".\Release\moc_ConnectionWizard.cpp"
>
<FileConfiguration
@@ -2860,36 +2831,23 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\Debug With TNC\moc_ConnectMgrDlg.cpp"
+ RelativePath=".\Release With TNC\moc_ConnectionWizard.cpp"
>
<FileConfiguration
- Name="Release With TNC|Win32"
+ Name="Debug With TNC|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug With TNC|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
- />
- </FileConfiguration>
- <FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -2898,8 +2856,6 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
@@ -3022,23 +2978,36 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\release with tnc\moc_CreateTT.cpp"
+ RelativePath=".\Debug With TNC\moc_ConnectMgrDlg.cpp"
>
<FileConfiguration
- Name="Debug With TNC|Win32"
+ Name="Release With TNC|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
+ Name="Debug With TNC|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -3047,14 +3016,16 @@
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\debug with tnc\moc_CreateTT.cpp"
+ RelativePath=".\release with tnc\moc_CreateTT.cpp"
>
<FileConfiguration
- Name="Release With TNC|Win32"
+ Name="Debug With TNC|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -3080,7 +3051,7 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\Debug\moc_CreateTT.cpp"
+ RelativePath=".\debug with tnc\moc_CreateTT.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -3091,18 +3062,11 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug With TNC|Win32"
+ Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
@@ -3116,7 +3080,7 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\release\moc_CreateTT.cpp"
+ RelativePath=".\Debug\moc_CreateTT.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -3136,7 +3100,6 @@
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -3145,15 +3108,15 @@
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\Release\moc_CredentialsManager.cpp"
+ RelativePath=".\release\moc_CreateTT.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -3161,8 +3124,6 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)3.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -3171,8 +3132,6 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)3.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -3182,8 +3141,6 @@
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)3.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -3192,8 +3149,6 @@
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)3.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
</File>
@@ -3315,6 +3270,51 @@
</FileConfiguration>
</File>
<File
+ RelativePath=".\Release\moc_CredentialsManager.cpp"
+ >
+ <FileConfiguration
+ Name="Release With TNC|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)3.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug With TNC|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)3.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)3.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)3.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath=".\Release\moc_CredentialsPopUp.cpp"
>
<FileConfiguration
@@ -3477,7 +3477,7 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\release\moc_Emitter.cpp"
+ RelativePath=".\debug\moc_Emitter.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -3485,8 +3485,6 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -3495,34 +3493,27 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\debug\moc_Emitter.cpp"
+ RelativePath=".\release\moc_Emitter.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -3530,6 +3521,8 @@
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -3538,22 +3531,29 @@
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
</File>
@@ -3636,17 +3636,9 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\release\moc_FormLoader.cpp"
+ RelativePath=".\debug\moc_FormLoader.cpp"
>
<FileConfiguration
- Name="Release With TNC|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
Name="Debug With TNC|Win32"
ExcludedFromBuild="true"
>
@@ -3656,7 +3648,6 @@
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -3665,17 +3656,25 @@
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\debug\moc_FormLoader.cpp"
+ RelativePath=".\release\moc_FormLoader.cpp"
>
<FileConfiguration
+ Name="Release With TNC|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="Debug With TNC|Win32"
ExcludedFromBuild="true"
>
@@ -3685,6 +3684,7 @@
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -3693,15 +3693,15 @@
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\debug\moc_helpbrowser.cpp"
+ RelativePath=".\release\moc_helpbrowser.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -3709,6 +3709,8 @@
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -3717,27 +3719,34 @@
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\release\moc_helpbrowser.cpp"
+ RelativePath=".\debug\moc_helpbrowser.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -3745,8 +3754,6 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -3755,29 +3762,22 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
</File>
@@ -3913,67 +3913,67 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\release\moc_LoggingConsole.cpp"
+ RelativePath=".\debug\moc_LoggingConsole.cpp"
>
<FileConfiguration
- Name="Release With TNC|Win32"
- ExcludedFromBuild="true"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug With TNC|Win32"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\release\moc_LoggingConsole.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release With TNC|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\$(InputName)2.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug With TNC|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\$(InputName)2.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
- </File>
- <File
- RelativePath=".\debug\moc_LoggingConsole.cpp"
- >
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
</File>
@@ -4109,7 +4109,7 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\debug\moc_MessageClass.cpp"
+ RelativePath=".\release\moc_MessageClass.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -4117,6 +4117,8 @@
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -4125,27 +4127,34 @@
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\release\moc_MessageClass.cpp"
+ RelativePath=".\debug\moc_MessageClass.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -4153,8 +4162,6 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -4163,34 +4170,27 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\release\moc_MessageDlg.cpp"
+ RelativePath=".\debug\moc_MessageDlg.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -4198,67 +4198,67 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug With TNC|Win32"
- ExcludedFromBuild="true"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\release\moc_MessageDlg.cpp"
+ >
<FileConfiguration
- Name="Release|Win32"
+ Name="Release With TNC|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\$(InputName)2.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
- </File>
- <File
- RelativePath=".\debug\moc_MessageDlg.cpp"
- >
<FileConfiguration
- Name="Release With TNC|Win32"
+ Name="Debug With TNC|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
</File>
@@ -4341,7 +4341,7 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\release\moc_PluginWidget.cpp"
+ RelativePath=".\debug\moc_PluginWidget.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -4349,8 +4349,8 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)3.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -4359,33 +4359,33 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)3.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)3.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
+ UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)3.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\debug\moc_PluginWidget.cpp"
+ RelativePath=".\release\moc_PluginWidget.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -4393,8 +4393,8 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+ ObjectFile="$(IntDir)\$(InputName)3.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -4403,33 +4403,33 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+ ObjectFile="$(IntDir)\$(InputName)3.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+ ObjectFile="$(IntDir)\$(InputName)3.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+ UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)3.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\debug\moc_PreferredConnections.cpp"
+ RelativePath=".\release\moc_PreferredConnections.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -4437,6 +4437,8 @@
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -4445,27 +4447,34 @@
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\release\moc_PreferredConnections.cpp"
+ RelativePath=".\debug\moc_PreferredConnections.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -4473,8 +4482,6 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -4483,29 +4490,22 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
</File>
@@ -4672,35 +4672,6 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\release with tnc\moc_SSIDListDlg.cpp"
- >
- <FileConfiguration
- Name="Debug With TNC|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath=".\Debug\moc_SSIDListDlg.cpp"
>
<FileConfiguration
@@ -4834,7 +4805,7 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\release with tnc\moc_TableImageDelegate.cpp"
+ RelativePath=".\release with tnc\moc_SSIDListDlg.cpp"
>
<FileConfiguration
Name="Debug With TNC|Win32"
@@ -4859,7 +4830,6 @@
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
@@ -4968,6 +4938,36 @@
</FileConfiguration>
</File>
<File
+ RelativePath=".\release with tnc\moc_TableImageDelegate.cpp"
+ >
+ <FileConfiguration
+ Name="Debug With TNC|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath=".\Debug With TNC\moc_UIPlugins.cpp"
>
<FileConfiguration
@@ -5127,42 +5127,6 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\debug\moc_ViewLogDlg.cpp"
- >
- <FileConfiguration
- Name="Release With TNC|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug With TNC|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath=".\release\moc_ViewLogDlg.cpp"
>
<FileConfiguration
@@ -5208,15 +5172,14 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\release\moc_window.cpp"
+ RelativePath=".\debug\moc_ViewLogDlg.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -5225,29 +5188,22 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
@@ -5280,11 +5236,10 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\Debug With TNC\moc_WirelessNetworkMenu.cpp"
+ RelativePath=".\release\moc_window.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -5294,6 +5249,7 @@
</FileConfiguration>
<FileConfiguration
Name="Debug With TNC|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -5314,10 +5270,10 @@
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
@@ -5442,23 +5398,36 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\Release With TNC\moc_WirelessScanDlg.cpp"
+ RelativePath=".\Debug With TNC\moc_WirelessNetworkMenu.cpp"
>
<FileConfiguration
- Name="Debug With TNC|Win32"
+ Name="Release With TNC|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
+ Name="Debug With TNC|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -5467,30 +5436,20 @@
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\Release\moc_WirelessScanDlg.cpp"
+ RelativePath=".\Release With TNC\moc_WirelessScanDlg.cpp"
>
<FileConfiguration
- Name="Release With TNC|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)3.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
- />
- </FileConfiguration>
- <FileConfiguration
Name="Debug With TNC|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)3.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -5500,23 +5459,19 @@
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)3.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)3.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\Debug\moc_WirelessScanDlg.cpp"
+ RelativePath=".\Release\moc_WirelessScanDlg.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -5524,8 +5479,8 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+ ObjectFile="$(IntDir)\$(InputName)3.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -5534,33 +5489,34 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+ ObjectFile="$(IntDir)\$(InputName)3.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+ ObjectFile="$(IntDir)\$(InputName)3.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)2.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+ UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)3.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)3.xdc"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\Debug With TNC\moc_WirelessScanDlg.cpp"
+ RelativePath=".\Debug\moc_WirelessScanDlg.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -5568,28 +5524,28 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug With TNC|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -5598,13 +5554,13 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ ObjectFile="$(IntDir)\$(InputName)2.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\Debug With TNC\moc_WizardPages.cpp"
+ RelativePath=".\Debug With TNC\moc_WirelessScanDlg.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -5766,7 +5722,7 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\debug\moc_xsupcalls.cpp"
+ RelativePath=".\Debug With TNC\moc_WizardPages.cpp"
>
<FileConfiguration
Name="Release With TNC|Win32"
@@ -5774,22 +5730,28 @@
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug With TNC|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -5798,6 +5760,8 @@
>
<Tool
Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
@@ -5839,9 +5803,17 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\Release\qrc_xsupptray.cpp"
+ RelativePath=".\debug\moc_xsupcalls.cpp"
>
<FileConfiguration
+ Name="Release With TNC|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="Debug With TNC|Win32"
ExcludedFromBuild="true"
>
@@ -5851,7 +5823,6 @@
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -5860,10 +5831,10 @@
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
@@ -5895,6 +5866,35 @@
/>
</FileConfiguration>
</File>
+ <File
+ RelativePath=".\Release\qrc_xsupptray.cpp"
+ >
+ <FileConfiguration
+ Name="Debug With TNC|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ </File>
</Filter>
<Filter
Name="Resource Files"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-06-18 17:20:12
|
Revision: 690
http://open1x.svn.sourceforge.net/open1x/?rev=690&view=rev
Author: chessing
Date: 2009-06-18 17:20:09 +0000 (Thu, 18 Jun 2009)
Log Message:
-----------
Bug 2807969 fixed.
Modified Paths:
--------------
trunk/xsupplicant/configure.ac
trunk/xsupplicant/src/ipc_callout.c
trunk/xsupplicant/src/xsup_ipc.c
trunk/xsupplicant/src/xsup_ipc_win.c
trunk/xsupplicant-ui/Skins/Default/wizardPageDot1XInnerProtocol.ui
trunk/xsupplicant-ui/xsupptray/WizardPages.cpp
Modified: trunk/xsupplicant/configure.ac
===================================================================
--- trunk/xsupplicant/configure.ac 2009-06-16 17:05:16 UTC (rev 689)
+++ trunk/xsupplicant/configure.ac 2009-06-18 17:20:09 UTC (rev 690)
@@ -140,6 +140,11 @@
[enable_static_iwlib="yes" ],
[AC_MSG_ERROR("You must use --with-iwlib-lib-path and --with-iwlib-headers to use static Linux wireless library support.")])])
+AC_ARG_ENABLE(unsafe-dumps,
+ AS_HELP_STRING([--enable-unsafe-dumps],
+ [enable dumpping of data that may contain things such as passwords and private keys. (This is *REALLY* unsafe and should only be used for debugging!)]),
+ [AC_DEFINE(UNSAFE_DUMPS)])
+
AC_ARG_ENABLE(static-libxml,
AS_HELP_STRING([--enable-static-libxml],
[statically link libxml2 libraries]),
Modified: trunk/xsupplicant/src/ipc_callout.c
===================================================================
--- trunk/xsupplicant/src/ipc_callout.c 2009-06-16 17:05:16 UTC (rev 689)
+++ trunk/xsupplicant/src/ipc_callout.c 2009-06-18 17:20:09 UTC (rev 690)
@@ -1985,8 +1985,7 @@
switch (authtype) {
case AUTH_PSK:
- if (xmlNewChild
- (n, NULL, (xmlChar *) "Authentication",
+ if (xmlNewChild(n, NULL, (xmlChar *) "Authentication",
(xmlChar *) "PSK") == NULL) {
xmlFreeNode(n);
return ipc_callout_create_error(NULL,
@@ -1997,8 +1996,7 @@
break;
case AUTH_EAP:
- if (xmlNewChild
- (n, NULL, (xmlChar *) "Authentication",
+ if (xmlNewChild(n, NULL, (xmlChar *) "Authentication",
(xmlChar *) "EAP") == NULL) {
xmlFreeNode(n);
return ipc_callout_create_error(NULL,
@@ -2010,8 +2008,7 @@
case AUTH_NONE:
default:
- if (xmlNewChild
- (n, NULL, (xmlChar *) "Authentication",
+ if (xmlNewChild(n, NULL, (xmlChar *) "Authentication",
(xmlChar *) "NONE") == NULL) {
xmlFreeNode(n);
return ipc_callout_create_error(NULL,
Modified: trunk/xsupplicant/src/xsup_ipc.c
===================================================================
--- trunk/xsupplicant/src/xsup_ipc.c 2009-06-16 17:05:16 UTC (rev 689)
+++ trunk/xsupplicant/src/xsup_ipc.c 2009-06-18 17:20:09 UTC (rev 690)
@@ -418,8 +418,13 @@
memcpy(&frag[sizeof(ipc_header)], &tosend[offset],
frag_size);
- debug_hex_dump(DEBUG_IPC, frag,
- (frag_size + sizeof(ipc_header)));
+#ifdef UNSAFE_DUMPS // This could leave passwords in the log file, so only have it in debug builds!
+ debug_printf(DEBUG_IPC,
+ "Sending complete packet of %d byte(s).\n",
+ (tolen + sizeof(ipc_header)));
+ debug_hex_dump(DEBUG_IPC, (uint8_t *) frag,
+ (tolen + sizeof(ipc_header)));
+#endif
if (send(skfd, frag, (frag_size + sizeof(ipc_header)),
0) <= 0) {
@@ -523,6 +528,10 @@
return -1;
}
+#ifdef UNSAFE_DUMPS
+ debug_hex_dump(DEBUG_IPC, buf, result);
+#endif
+
retval = ipc_callout_process(buf, result, &resbuf, &resbufsize);
switch (retval) {
Modified: trunk/xsupplicant/src/xsup_ipc_win.c
===================================================================
--- trunk/xsupplicant/src/xsup_ipc_win.c 2009-06-16 17:05:16 UTC (rev 689)
+++ trunk/xsupplicant/src/xsup_ipc_win.c 2009-06-18 17:20:09 UTC (rev 690)
@@ -196,8 +196,7 @@
if (HasOverlappedIoCompleted(lovr) == TRUE) {
// And set up a read handler.
- if (ReadFile
- (pipes[i].hdl, &pipes[i].buffer, BUFSIZE,
+ if (ReadFile(pipes[i].hdl, &pipes[i].buffer, BUFSIZE,
(LPDWORD) & pipes[i].inbuf, lovr) == 0) {
resulterr = GetLastError();
@@ -284,8 +283,7 @@
#endif
// Process it.
- retval =
- ipc_callout_process(pipes[i].buffer, pipes[i].inbuf,
+ retval = ipc_callout_process(pipes[i].buffer, pipes[i].inbuf,
&result, &ressize);
switch (retval) {
case IPC_CHANGE_TO_EVENT_ONLY:
@@ -488,8 +486,7 @@
(tolen + sizeof(ipc_header)));
#endif
- if (WriteFile
- (pipehdl, frag, (tolen + sizeof(ipc_header)), &totalbytes,
+ if (WriteFile(pipehdl, frag, (tolen + sizeof(ipc_header)), &totalbytes,
NULL) == 0) {
debug_printf(DEBUG_NORMAL | DEBUG_IPC,
"Couldn't send response document to IPC client!\n");
Modified: trunk/xsupplicant-ui/Skins/Default/wizardPageDot1XInnerProtocol.ui
===================================================================
--- trunk/xsupplicant-ui/Skins/Default/wizardPageDot1XInnerProtocol.ui 2009-06-16 17:05:16 UTC (rev 689)
+++ trunk/xsupplicant-ui/Skins/Default/wizardPageDot1XInnerProtocol.ui 2009-06-18 17:20:09 UTC (rev 690)
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>Form</class>
- <widget class="QWidget" name="Form" >
- <property name="geometry" >
+ <widget class="QWidget" name="Form">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,87 +10,78 @@
<height>284</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>518</width>
<height>284</height>
</size>
</property>
- <property name="maximumSize" >
+ <property name="maximumSize">
<size>
<width>496</width>
<height>262</height>
</size>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QVBoxLayout" >
- <property name="spacing" >
+ <layout class="QVBoxLayout">
+ <property name="spacing">
<number>0</number>
</property>
- <property name="leftMargin" >
+ <property name="margin">
<number>0</number>
</property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
<item>
- <widget class="QFrame" name="frameOuterCosmetic" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <widget class="QFrame" name="frameOuterCosmetic">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>16</width>
<height>284</height>
</size>
</property>
- <property name="maximumSize" >
+ <property name="maximumSize">
<size>
<width>16777215</width>
<height>284</height>
</size>
</property>
- <property name="palette" >
+ <property name="palette">
<palette>
<active>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>127</red>
<green>157</green>
<blue>185</blue>
</color>
</brush>
</colorrole>
- <colorrole role="Base" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="Base">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
- <colorrole role="Window" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="Window">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
@@ -98,27 +90,27 @@
</colorrole>
</active>
<inactive>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>127</red>
<green>157</green>
<blue>185</blue>
</color>
</brush>
</colorrole>
- <colorrole role="Base" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="Base">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
- <colorrole role="Window" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="Window">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
@@ -127,27 +119,27 @@
</colorrole>
</inactive>
<disabled>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>127</red>
<green>127</green>
<blue>127</blue>
</color>
</brush>
</colorrole>
- <colorrole role="Base" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="Base">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
- <colorrole role="Window" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="Window">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
@@ -157,57 +149,48 @@
</disabled>
</palette>
</property>
- <property name="autoFillBackground" >
+ <property name="autoFillBackground">
<bool>true</bool>
</property>
- <property name="frameShape" >
+ <property name="frameShape">
<enum>QFrame::Box</enum>
</property>
- <property name="frameShadow" >
+ <property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
- <layout class="QVBoxLayout" >
- <property name="spacing" >
+ <layout class="QVBoxLayout">
+ <property name="spacing">
<number>10</number>
</property>
- <property name="leftMargin" >
+ <property name="margin">
<number>10</number>
</property>
- <property name="topMargin" >
- <number>10</number>
- </property>
- <property name="rightMargin" >
- <number>10</number>
- </property>
- <property name="bottomMargin" >
- <number>10</number>
- </property>
<item>
- <widget class="QFrame" name="frame" >
- <property name="palette" >
+ <widget class="QFrame" name="frame">
+ <property name="palette">
<palette>
<active>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>208</red>
<green>208</green>
<blue>191</blue>
</color>
</brush>
</colorrole>
- <colorrole role="Base" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="Base">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
- <colorrole role="Window" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="Window">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>236</red>
<green>234</green>
<blue>223</blue>
@@ -216,27 +199,27 @@
</colorrole>
</active>
<inactive>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>208</red>
<green>208</green>
<blue>191</blue>
</color>
</brush>
</colorrole>
- <colorrole role="Base" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="Base">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
- <colorrole role="Window" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="Window">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>236</red>
<green>234</green>
<blue>223</blue>
@@ -245,27 +228,27 @@
</colorrole>
</inactive>
<disabled>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>127</red>
<green>127</green>
<blue>127</blue>
</color>
</brush>
</colorrole>
- <colorrole role="Base" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="Base">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>236</red>
<green>234</green>
<blue>223</blue>
</color>
</brush>
</colorrole>
- <colorrole role="Window" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="Window">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>236</red>
<green>234</green>
<blue>223</blue>
@@ -275,24 +258,24 @@
</disabled>
</palette>
</property>
- <property name="autoFillBackground" >
+ <property name="autoFillBackground">
<bool>true</bool>
</property>
- <property name="frameShape" >
+ <property name="frameShape">
<enum>QFrame::Box</enum>
</property>
- <property name="frameShadow" >
+ <property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <widget class="QLabel" name="labelMessage" >
- <property name="palette" >
+ <widget class="QLabel" name="labelMessage">
+ <property name="palette">
<palette>
<active>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
@@ -301,9 +284,9 @@
</colorrole>
</active>
<inactive>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
@@ -312,9 +295,9 @@
</colorrole>
</inactive>
<disabled>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>118</red>
<green>116</green>
<blue>108</blue>
@@ -324,29 +307,29 @@
</disabled>
</palette>
</property>
- <property name="font" >
+ <property name="font">
<font>
<family>Arial</family>
<pointsize>9</pointsize>
</font>
</property>
- <property name="text" >
+ <property name="text">
<string>Enter your PEAP settings for 802.1X authentication below. The Outer Identity will be sent unencrypted.</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>21</height>
@@ -355,13 +338,13 @@
</spacer>
</item>
<item>
- <layout class="QGridLayout" >
- <item row="0" column="0" colspan="2" >
+ <layout class="QGridLayout">
+ <item row="0" column="0" colspan="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -369,14 +352,14 @@
</property>
</spacer>
</item>
- <item row="0" column="2" >
- <widget class="QLabel" name="labelOuterId" >
- <property name="palette" >
+ <item row="0" column="2">
+ <widget class="QLabel" name="labelOuterId">
+ <property name="palette">
<palette>
<active>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
@@ -385,9 +368,9 @@
</colorrole>
</active>
<inactive>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
@@ -396,9 +379,9 @@
</colorrole>
</inactive>
<disabled>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>127</red>
<green>127</green>
<blue>127</blue>
@@ -408,32 +391,32 @@
</disabled>
</palette>
</property>
- <property name="font" >
+ <property name="font">
<font>
<family>Arial</family>
<pointsize>9</pointsize>
</font>
</property>
- <property name="text" >
+ <property name="text">
<string>Outer Identity :</string>
</property>
</widget>
</item>
- <item row="0" column="3" >
- <widget class="QLineEdit" name="lineEdit" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <item row="0" column="3">
+ <widget class="QLineEdit" name="dataFieldOuterID">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>190</width>
<height>22</height>
</size>
</property>
- <property name="maximumSize" >
+ <property name="maximumSize">
<size>
<width>190</width>
<height>22</height>
@@ -441,14 +424,14 @@
</property>
</widget>
</item>
- <item row="0" column="4" >
- <widget class="QLabel" name="labelOptional" >
- <property name="palette" >
+ <item row="0" column="4">
+ <widget class="QLabel" name="labelOptional">
+ <property name="palette">
<palette>
<active>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
@@ -457,9 +440,9 @@
</colorrole>
</active>
<inactive>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
@@ -468,9 +451,9 @@
</colorrole>
</inactive>
<disabled>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>127</red>
<green>127</green>
<blue>127</blue>
@@ -480,23 +463,23 @@
</disabled>
</palette>
</property>
- <property name="font" >
+ <property name="font">
<font>
<family>Arial</family>
<pointsize>9</pointsize>
</font>
</property>
- <property name="text" >
+ <property name="text">
<string>(Optional)</string>
</property>
</widget>
</item>
- <item row="0" column="5" >
+ <item row="0" column="5">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -504,12 +487,12 @@
</property>
</spacer>
</item>
- <item row="1" column="0" >
+ <item row="1" column="0">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>16</width>
<height>20</height>
@@ -517,14 +500,14 @@
</property>
</spacer>
</item>
- <item row="1" column="1" colspan="2" >
- <widget class="QLabel" name="labelProtocol" >
- <property name="palette" >
+ <item row="1" column="1" colspan="2">
+ <widget class="QLabel" name="labelProtocol">
+ <property name="palette">
<palette>
<active>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
@@ -533,9 +516,9 @@
</colorrole>
</active>
<inactive>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
@@ -544,9 +527,9 @@
</colorrole>
</inactive>
<disabled>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>127</red>
<green>127</green>
<blue>127</blue>
@@ -556,26 +539,26 @@
</disabled>
</palette>
</property>
- <property name="font" >
+ <property name="font">
<font>
<family>Arial</family>
<pointsize>9</pointsize>
</font>
</property>
- <property name="text" >
+ <property name="text">
<string>Tunnel Protocol :</string>
</property>
</widget>
</item>
- <item row="1" column="3" >
- <widget class="QComboBox" name="comboBoxProtocol" >
- <property name="minimumSize" >
+ <item row="1" column="3">
+ <widget class="QComboBox" name="comboBoxProtocol">
+ <property name="minimumSize">
<size>
<width>190</width>
<height>22</height>
</size>
</property>
- <property name="maximumSize" >
+ <property name="maximumSize">
<size>
<width>190</width>
<height>22</height>
@@ -583,15 +566,15 @@
</property>
</widget>
</item>
- <item row="1" column="4" >
+ <item row="1" column="4">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>16</height>
@@ -599,12 +582,12 @@
</property>
</spacer>
</item>
- <item row="1" column="5" >
+ <item row="1" column="5">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -612,12 +595,12 @@
</property>
</spacer>
</item>
- <item row="2" column="0" colspan="2" >
+ <item row="2" column="0" colspan="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -625,15 +608,15 @@
</property>
</spacer>
</item>
- <item row="2" column="2" >
+ <item row="2" column="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>16</height>
@@ -641,14 +624,14 @@
</property>
</spacer>
</item>
- <item row="2" column="3" >
- <widget class="QCheckBox" name="checkBoxValidateCert" >
- <property name="palette" >
+ <item row="2" column="3">
+ <widget class="QCheckBox" name="checkBoxValidateCert">
+ <property name="palette">
<palette>
<active>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
@@ -657,9 +640,9 @@
</colorrole>
</active>
<inactive>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
@@ -668,9 +651,9 @@
</colorrole>
</inactive>
<disabled>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>127</red>
<green>127</green>
<blue>127</blue>
@@ -680,26 +663,26 @@
</disabled>
</palette>
</property>
- <property name="font" >
+ <property name="font">
<font>
<family>Arial</family>
<pointsize>9</pointsize>
</font>
</property>
- <property name="text" >
+ <property name="text">
<string>Validate Server Certificate</string>
</property>
</widget>
</item>
- <item row="2" column="4" >
+ <item row="2" column="4">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>16</height>
@@ -707,12 +690,12 @@
</property>
</spacer>
</item>
- <item row="2" column="5" >
+ <item row="2" column="5">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -720,12 +703,12 @@
</property>
</spacer>
</item>
- <item row="3" column="0" colspan="2" >
+ <item row="3" column="0" colspan="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -733,15 +716,15 @@
</property>
</spacer>
</item>
- <item row="3" column="2" >
+ <item row="3" column="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>16</height>
@@ -749,14 +732,14 @@
</property>
</spacer>
</item>
- <item row="3" column="3" >
- <widget class="QCheckBox" name="checkBoxSessionResume" >
- <property name="palette" >
+ <item row="3" column="3">
+ <widget class="QCheckBox" name="checkBoxSessionResume">
+ <property name="palette">
<palette>
<active>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
@@ -765,9 +748,9 @@
</colorrole>
</active>
<inactive>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
@@ -776,9 +759,9 @@
</colorrole>
</inactive>
<disabled>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
<red>127</red>
<green>127</green>
<blue>127</blue>
@@ -788,26 +771,26 @@
</disabled>
</palette>
</property>
- <property name="font" >
+ <property name="font">
<font>
<family>Arial</family>
<pointsize>9</pointsize>
</font>
</property>
- <property name="text" >
+ <property name="text">
<string>Use Session Resumption</string>
</property>
</widget>
</item>
- <item row="3" column="4" >
+ <item row="3" column="4">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>16</height>
@@ -815,12 +798,12 @@
</property>
</spacer>
</item>
- <item row="3" column="5" >
+ <item row="3" column="5">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -832,10 +815,10 @@
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
Modified: trunk/xsupplicant-ui/xsupptray/WizardPages.cpp
===================================================================
--- trunk/xsupplicant-ui/xsupptray/WizardPages.cpp 2009-06-16 17:05:16 UTC (rev 689)
+++ trunk/xsupplicant-ui/xsupptray/WizardPages.cpp 2009-06-18 17:20:09 UTC (rev 690)
@@ -68,8 +68,7 @@
bool WizardPageNetworkType::create(void)
{
- m_pRealForm =
- FormLoader::buildform("wizardPageNetworkType.ui", m_pParentWidget);
+ m_pRealForm = FormLoader::buildform("wizardPageNetworkType.ui", m_pParentWidget);
if (m_pRealForm == NULL)
@@ -77,26 +76,21 @@
// dynamically populate text
- QLabel * pMsgLabel =
- qFindChild < QLabel * >(m_pRealForm, "labelMessage");
+ QLabel * pMsgLabel = qFindChild < QLabel * >(m_pRealForm, "labelMessage");
if (pMsgLabel != NULL)
- pMsgLabel->
- setText(tr
- ("Please indicate the type of network you would like to connect to:"));
+ pMsgLabel->setText(tr("Please indicate the type of network you would like to connect to:"));
- m_pRadioButtonWired =
- qFindChild < QRadioButton * >(m_pRealForm, "radioWired");
+ m_pRadioButtonWired = qFindChild < QRadioButton * >(m_pRealForm, "radioWired");
if (m_pRadioButtonWired != NULL)
m_pRadioButtonWired->setText(tr("Wired"));
- m_pRadioButtonWireless =
- qFindChild < QRadioButton * >(m_pRealForm, "radioWireless");
+ m_pRadioButtonWireless = qFindChild < QRadioButton * >(m_pRealForm, "radioWireless");
if (m_pRadioButtonWireless != NULL)
@@ -295,8 +289,7 @@
bool WizardPageWiredSecurity::create(void)
{
- m_pRealForm =
- FormLoader::buildform("wizardPageWiredSecurity.ui",
+ m_pRealForm = FormLoader::buildform("wizardPageWiredSecurity.ui",
m_pParentWidget);
if (m_pRealForm == NULL)
@@ -2115,8 +2108,7 @@
bool WizardPageDot1XInnerProtocol::create(void)
{
- m_pRealForm =
- FormLoader::buildform("wizardPageDot1XInnerProtocol.ui",
+ m_pRealForm = FormLoader::buildform("wizardPageDot1XInnerProtocol.ui",
m_pParentWidget);
if (m_pRealForm == NULL)
@@ -2125,45 +2117,36 @@
// cache off pointers to objects
- m_pProtocol =
- qFindChild < QComboBox * >(m_pRealForm, "comboBoxProtocol");
+ m_pProtocol = qFindChild < QComboBox * >(m_pRealForm, "comboBoxProtocol");
- m_pOuterID =
- qFindChild < QLineEdit * >(m_pRealForm, "dataFieldOuterID");
+ m_pOuterID = qFindChild < QLineEdit * >(m_pRealForm, "dataFieldOuterID");
- m_pValidateCert =
- qFindChild < QCheckBox * >(m_pRealForm, "checkBoxValidateCert");
+ m_pValidateCert = qFindChild < QCheckBox * >(m_pRealForm, "checkBoxValidateCert");
// dynamically populate text
- QLabel * pMsgLabel =
- qFindChild < QLabel * >(m_pRealForm, "labelMessage");
+ QLabel * pMsgLabel = qFindChild < QLabel * >(m_pRealForm, "labelMessage");
if (pMsgLabel != NULL)
- pMsgLabel->
- setText(tr
- ("Enter your PEAP settings for 802.1X authentication below. The Outer Identity will be sent unencrypted."));
+ pMsgLabel->setText(tr("Enter your PEAP settings for 802.1X authentication below. The Outer Identity will be sent unencrypted."));
- QLabel * pProtocolLabel =
- qFindChild < QLabel * >(m_pRealForm, "labelProtocol");
+ QLabel * pProtocolLabel = qFindChild < QLabel * >(m_pRealForm, "labelProtocol");
if (pProtocolLabel != NULL)
pProtocolLabel->setText(tr("Tunnel Protocol:"));
- QLabel * pOuterIDLabel =
- qFindChild < QLabel * >(m_pRealForm, "labelOuterID");
+ QLabel * pOuterIDLabel = qFindChild < QLabel * >(m_pRealForm, "labelOuterID");
if (pOuterIDLabel != NULL)
pOuterIDLabel->setText(tr("Outer Identity:"));
- QLabel * pOptionalLabel =
- qFindChild < QLabel * >(m_pRealForm, "labelOptional");
+ QLabel * pOptionalLabel = qFindChild < QLabel * >(m_pRealForm, "labelOptional");
if (pOptionalLabel != NULL)
@@ -2192,13 +2175,11 @@
m_curData = data;
- m_pSessionResume =
- qFindChild < QCheckBox * >(m_pRealForm, "checkBoxSessionResume");
+ m_pSessionResume = qFindChild < QCheckBox * >(m_pRealForm, "checkBoxSessionResume");
// populate this label dynamically because the text references the outer protocol used
- QLabel * pMsgLabel =
- qFindChild < QLabel * >(m_pRealForm, "labelMessage");
+ QLabel * pMsgLabel = qFindChild < QLabel * >(m_pRealForm, "labelMessage");
if (pMsgLabel != NULL)
@@ -2208,30 +2189,23 @@
{
- pMsgLabel->
- setText(tr
- ("Enter your PEAP settings for 802.1X authentication below. The Outer Identity will be sent unencrypted."));
+ pMsgLabel->setText(tr("Enter your PEAP settings for 802.1X authentication below. The Outer Identity will be sent unencrypted."));
if (m_pSessionResume != NULL)
- m_pSessionResume->
- setText(tr("Use Fast Reconnect"));
+ m_pSessionResume->setText(tr("Use Fast Reconnect"));
}
- else if (m_curData.m_eapProtocol ==
- ConnectionWizardData::eap_ttls)
+ else if (m_curData.m_eapProtocol == ConnectionWizardData::eap_ttls)
{
- pMsgLabel->
- setText(tr
- ("Enter your TTLS settings for 802.1X authentication below. The Outer Identity will be sent unencrypted."));
+ pMsgLabel->setText(tr("Enter your TTLS settings for 802.1X authentication below. The Outer Identity will be sent unencrypted."));
if (m_pSessionResume != NULL)
- m_pSessionResume->
- setText(tr("Use Session Resumption"));
+ m_pSessionResume->setText(tr("Use Session Resumption"));
}
@@ -2268,13 +2242,11 @@
m_pProtocol->addItem("EAP-GTC");
- if (m_curData.m_innerPEAPProtocol ==
- ConnectionWizardData::inner_eap_mschapv2)
+ if (m_curData.m_innerPEAPProtocol == ConnectionWizardData::inner_eap_mschapv2)
m_pProtocol->setCurrentIndex(0);
- else if (m_curData.m_innerPEAPProtocol ==
- ConnectionWizardData::inner_eap_gtc)
+ else if (m_curData.m_innerPEAPProtocol == ConnectionWizardData::inner_eap_gtc)
m_pProtocol->setCurrentIndex(1);
@@ -2285,8 +2257,7 @@
} // error
}
- else if (m_curData.m_eapProtocol ==
- ConnectionWizardData::eap_ttls)
+ else if (m_curData.m_eapProtocol == ConnectionWizardData::eap_ttls)
{
@@ -2301,28 +2272,23 @@
m_pProtocol->addItem("EAP-MD5");
- if (m_curData.m_innerTTLSProtocol ==
- ConnectionWizardData::inner_pap)
+ if (m_curData.m_innerTTLSProtocol == ConnectionWizardData::inner_pap)
m_pProtocol->setCurrentIndex(0);
- else if (m_curData.m_innerTTLSProtocol ==
- ConnectionWizardData::inner_chap)
+ else if (m_curData.m_innerTTLSProtocol == ConnectionWizardData::inner_chap)
m_pProtocol->setCurrentIndex(1);
- else if (m_curData.m_innerTTLSProtocol ==
- ConnectionWizardData::inner_mschap)
+ else if (m_curData.m_innerTTLSProtocol == ConnectionWizardData::inner_mschap)
m_pProtocol->setCurrentIndex(2);
- else if (m_curData.m_innerTTLSProtocol ==
- ConnectionWizardData::inner_mschapv2)
+ else if (m_curData.m_innerTTLSProtocol == ConnectionWizardData::inner_mschapv2)
m_pProtocol->setCurrentIndex(3);
- else if (m_curData.m_innerTTLSProtocol ==
- ConnectionWizardData::inner_eap_md5)
+ else if (m_curData.m_innerTTLSProtocol == ConnectionWizardData::inner_eap_md5)
m_pProtocol->setCurrentIndex(4);
@@ -2343,10 +2309,8 @@
{
if (m_pOuterID != NULL)
-
m_curData.m_outerIdentity = m_pOuterID->text();
-
if (m_pValidateCert != NULL)
m_curData.m_validateCert = m_pValidateCert->isChecked();
@@ -2367,13 +2331,11 @@
if (m_pProtocol->currentIndex() == 0)
- m_curData.m_innerPEAPProtocol =
- ConnectionWizardData::inner_eap_mschapv2;
+ m_curData.m_innerPEAPProtocol = ConnectionWizardData::inner_eap_mschapv2;
else if (m_pProtocol->currentIndex() == 1)
- m_curData.m_innerPEAPProtocol =
- ConnectionWizardData::inner_eap_gtc;
+ m_curData.m_innerPEAPProtocol = ConnectionWizardData::inner_eap_gtc;
else
@@ -2382,35 +2344,29 @@
} // error
}
- else if (m_curData.m_eapProtocol ==
- ConnectionWizardData::eap_ttls)
+ else if (m_curData.m_eapProtocol == ConnectionWizardData::eap_ttls)
{
if (m_pProtocol->currentIndex() == 0)
- m_curData.m_innerTTLSProtocol =
- ConnectionWizardData::inner_pap;
+ m_curData.m_innerTTLSProtocol = ConnectionWizardData::inner_pap;
else if (m_pProtocol->currentIndex() == 1)
- m_curData.m_innerTTLSProtocol =
- ConnectionWizardData::inner_chap;
+ m_curData.m_innerTTLSProtocol = ConnectionWizardData::inner_chap;
else if (m_pProtocol->currentIndex() == 2)
- m_curData.m_innerTTLSProtocol =
- ConnectionWizardData::inner_mschap;
+ m_curData.m_innerTTLSProtocol = ConnectionWizardData::inner_mschap;
else if (m_pProtocol->currentIndex() == 3)
- m_curData.m_innerTTLSProtocol =
- ConnectionWizardData::inner_mschapv2;
+ m_curData.m_innerTTLSProtocol = ConnectionWizardData::inner_mschapv2;
else if (m_pProtocol->currentIndex() == 4)
- m_curData.m_innerTTLSProtocol =
- ConnectionWizardData::inner_eap_md5;
+ m_curData.m_innerTTLSProtocol = ConnectionWizardData::inner_eap_md5;
else
@@ -3112,8 +3068,7 @@
QMessageBox::warning(m_pRealForm,
tr("No Certificates Selected"),
- tr
- ("Please select at least one certificate to use for validation."));
+ tr("Please select at least one certificate to use for validation."));
return false;
@@ -3136,10 +3091,8 @@
{
QMessageBox::warning(m_pRealForm,
- tr
- ("Invalid Common Name String"),
- tr
- ("You must enter a valid common name string if common name verification is enabled."));
+ tr("Invalid Common Name String"),
+ tr("You must enter a valid common name string if common name verification is enabled."));
return false;
@@ -3151,10 +3104,8 @@
{
QMessageBox::warning(m_pRealForm,
- tr
- ("Invalid Common Name String"),
- tr
- ("Please input a valid common name string. Domain names must be of the form \"subdomain.domain\" or \"*.subdomain.domain\" if using wildcards."));
+ tr("Invalid Common Name String"),
+ tr("Please input a valid common name string. Domain names must be of the form \"subdomain.domain\" or \"*.subdomain.domain\" if using wildcards."));
return false;
@@ -3193,10 +3144,8 @@
{
QMessageBox::warning(m_pRealForm,
- tr
- ("Invalid Common Name String"),
- tr
- ("Please ensure each domain name you entered has 255 or fewer characters."));
+ tr("Invalid Common Name String"),
+ tr("Please ensure each domain name you entered has 255 or fewer characters."));
return false;
@@ -3449,8 +3398,7 @@
{
QMessageBox::warning(this, tr("Invalid Reader"),
- tr
- ("Please select a valid smart card reader. If none are listed, then you will be unable to use this EAP type."));
+ tr("Please select a valid smart card reader. If none are listed, then you will be unable to use this EAP type."));
return false;
@@ -3462,8 +3410,7 @@
{
QMessageBox::warning(this, tr("Invalid Reader"),
- tr
- ("Please select a valid smart card reader. If none are listed, then you will be unable to use this EAP type."));
+ tr("Please select a valid smart card reader. If none are listed, then you will be unable to use this EAP type."));
return false;
@@ -3792,8 +3739,7 @@
QMessageBox::warning(m_pRealForm,
tr("No Certificate Selected"),
- tr
- ("Please select a user certificate to use."));
+ tr("Please select a user certificate to use."));
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-06-16 17:05:43
|
Revision: 689
http://open1x.svn.sourceforge.net/open1x/?rev=689&view=rev
Author: chessing
Date: 2009-06-16 17:05:16 +0000 (Tue, 16 Jun 2009)
Log Message:
-----------
Code cleanups.
Modified Paths:
--------------
trunk/xsupplicant/src/eap_types/peap/eappeap.c
trunk/xsupplicant/src/eapol_key_type2.c
trunk/xsupplicant/src/ipc_callout.c
Modified: trunk/xsupplicant/src/eap_types/peap/eappeap.c
===================================================================
--- trunk/xsupplicant/src/eap_types/peap/eappeap.c 2009-06-15 03:24:12 UTC (rev 688)
+++ trunk/xsupplicant/src/eap_types/peap/eappeap.c 2009-06-16 17:05:16 UTC (rev 689)
@@ -462,16 +462,14 @@
case PEAP_VERSION0:
debug_printf(DEBUG_AUTHTYPES,
"Setting Key Constant for PEAP v0!\n");
- mytls_vars->sessionkeyconst =
- (uint8_t *) _strdup(PEAP_SESSION_KEY_CONST);
+ mytls_vars->sessionkeyconst = (uint8_t *) _strdup(PEAP_SESSION_KEY_CONST);
mytls_vars->sessionkeylen = PEAP_SESSION_KEY_CONST_SIZE;
break;
case PEAP_VERSION1:
debug_printf(DEBUG_AUTHTYPES,
"Setting Key Constant for PEAP v1!\n");
- mytls_vars->sessionkeyconst =
- (uint8_t *) _strdup(PEAPv1_SESSION_KEY_CONST);
+ mytls_vars->sessionkeyconst = (uint8_t *) _strdup(PEAPv1_SESSION_KEY_CONST);
mytls_vars->sessionkeylen = PEAPv1_SESSION_KEY_CONST_SIZE;
break;
@@ -543,14 +541,13 @@
************************************************************************/
uint8_t *eappeap_getKey(eap_type_data * eapdata)
{
- struct tls_vars *mytls_vars;
- uint8_t *keydata;
+ struct tls_vars *mytls_vars = NULL;
+ uint8_t *keydata = NULL;
if (!xsup_assert((eapdata != NULL), "eapdata != NULL", FALSE))
return NULL;
- if (!xsup_assert
- ((eapdata->eap_data != NULL), "eapdata->eap_data != NULL", FALSE))
+ if (!xsup_assert((eapdata->eap_data != NULL), "eapdata->eap_data != NULL", FALSE))
return NULL;
mytls_vars = (struct tls_vars *)eapdata->eap_data;
Modified: trunk/xsupplicant/src/eapol_key_type2.c
===================================================================
--- trunk/xsupplicant/src/eapol_key_type2.c 2009-06-15 03:24:12 UTC (rev 688)
+++ trunk/xsupplicant/src/eapol_key_type2.c 2009-06-16 17:05:16 UTC (rev 689)
@@ -946,7 +946,7 @@
// Build the response.
len = sizeof(struct wpa2_key_packet);
- intdata->send_size = len + OFFSET_TO_EAPOL + 4;
+ ctx->send_size = len + OFFSET_TO_EAPOL + 4;
value16 = (version | WPA2_KEY_MIC_FLAG | WPA2_SECURE_FLAG);
value16 = htons(value16);
@@ -1029,59 +1029,56 @@
wctx = ctx->intTypeData;
- inkeydata = (struct wpa2_key_packet *)&intdata->recvframe[OFFSET_TO_EAPOL + 4];
- outkeydata = (struct wpa2_key_packet *)&intdata->sendframe[OFFSET_TO_EAPOL + 4];
+ inkeydata = (struct wpa2_key_packet *)&ctx->recvframe[OFFSET_TO_EAPOL + 4];
+ outkeydata = (struct wpa2_key_packet *)&ctx->sendframe[OFFSET_TO_EAPOL + 4];
if ((memcmp(inkeydata->key_replay_counter, wctx->replay_counter, 8) <=
0) && (memcmp(inkeydata->key_replay_counter, zeros, 8) != 0)) {
debug_printf(DEBUG_NORMAL,
"Invalid replay counter! Discarding!\n");
- intdata->recv_size = 0;
+ ctx->recv_size = 0;
return;
}
// Clear everything out.
- memset(&intdata->sendframe[OFFSET_TO_EAPOL + 4], 0x00,
+ memset(&ctx->sendframe[OFFSET_TO_EAPOL + 4], 0x00,
sizeof(struct wpa2_key_packet));
RAND_bytes((uint8_t *) & outkeydata->key_nonce[0], 32);
- FREE(intdata->statemachine->SNonce);
+ FREE(ctx->statemachine->SNonce);
- intdata->statemachine->SNonce = (uint8_t *) Malloc(32);
- if (intdata->statemachine->SNonce == NULL) {
+ ctx->statemachine->SNonce = (uint8_t *) Malloc(32);
+ if (ctx->statemachine->SNonce == NULL) {
debug_printf(DEBUG_NORMAL,
"Couldn't allocate memory for SNonce in "
"%s at %d!\n", __FUNCTION__, __LINE__);
- ipc_events_malloc_failed(intdata);
+ ipc_events_malloc_failed(ctx);
return;
}
- memcpy(intdata->statemachine->SNonce, (char *)&outkeydata->key_nonce[0],
+ memcpy(ctx->statemachine->SNonce, (char *)&outkeydata->key_nonce[0],
32);
value16 = ntohs(inkeydata->key_material_len);
- version =
- ntohs((uint16_t) (*inkeydata->key_information)) | WPA2_KEYTYPE_MASK;
+ version = ntohs((uint16_t) (*inkeydata->key_information)) | WPA2_KEYTYPE_MASK;
// Check the IE field to see if we have any KDEs to parse.
// We can discard the result field because the only thing we can possibly expect is a PMKID KDE, and
// if it isn't there, then it is okay.
- if (eapol_key_type2_process_keydata
- (intdata, inkeydata->keydata, value16, ntohs(inkeydata->key_length),
+ if (eapol_key_type2_process_keydata(ctx, inkeydata->keydata, value16, ntohs(inkeydata->key_length),
inkeydata->key_rsc, version, FALSE) != XENONE) {
return;
}
// Calculate the PTK.
- FREE(intdata->statemachine->PTK);
+ FREE(ctx->statemachine->PTK);
- intdata->statemachine->PTK =
- (uint8_t *) eapol_key_type2_gen_ptk(intdata,
+ ctx->statemachine->PTK = (uint8_t *) eapol_key_type2_gen_ptk(ctx,
(char *)&inkeydata->key_nonce);
- if (intdata->statemachine->PTK == NULL) {
+ if (ctx->statemachine->PTK == NULL) {
debug_printf(DEBUG_NORMAL,
"Unable to generate the PTK for interface '%s'!\n",
- intdata->desc);
+ ctx->desc);
return;
}
@@ -1100,17 +1097,17 @@
memcpy(&outkeydata->key_information, &keyflags, 2);
len = sizeof(struct wpa2_key_packet);
- intdata->send_size = len + OFFSET_TO_EAPOL + 4;
+ ctx->send_size = len + OFFSET_TO_EAPOL + 4;
outkeydata->key_length = inkeydata->key_length;
memcpy(&outkeydata->key_replay_counter, &inkeydata->key_replay_counter,
8);
- if (cardif_get_wpa2_ie(intdata, wpa_ie, &ielen) < 0) {
+ if (cardif_get_wpa2_ie(ctx, wpa_ie, &ielen) < 0) {
debug_printf(DEBUG_NORMAL,
"Couldn't locate WPA2 information element!\n");
- intdata->send_size = 0;
+ ctx->send_size = 0;
return;
}
@@ -1118,25 +1115,25 @@
wctx->okc = 0;
#endif
- memcpy(&intdata->sendframe
+ memcpy(&ctx->sendframe
[OFFSET_TO_EAPOL + 4 + sizeof(struct wpa2_key_packet)], &wpa_ie,
ielen);
value16 = ielen;
value16 = htons(value16);
- intdata->send_size += ielen;
+ ctx->send_size += ielen;
outkeydata->key_material_len = value16;
- eapol_build_header(intdata, EAPOL_KEY,
- (intdata->send_size - OFFSET_TO_EAPOL - 4),
- (char *)intdata->sendframe);
+ eapol_build_header(ctx, EAPOL_KEY,
+ (ctx->send_size - OFFSET_TO_EAPOL - 4),
+ (char *)ctx->sendframe);
- memcpy(key, intdata->statemachine->PTK, 16);
- mic_wpa_populate((char *)intdata->sendframe, intdata->send_size + 4,
+ memcpy(key, ctx->statemachine->PTK, 16);
+ mic_wpa_populate((char *)ctx->sendframe, ctx->send_size + 4,
key, 16);
// Dump what we built.
- eapol_key_type2_dump(intdata, (char *)intdata->sendframe);
+ eapol_key_type2_dump(ctx, (char *)ctx->sendframe);
}
/**
Modified: trunk/xsupplicant/src/ipc_callout.c
===================================================================
--- trunk/xsupplicant/src/ipc_callout.c 2009-06-15 03:24:12 UTC (rev 688)
+++ trunk/xsupplicant/src/ipc_callout.c 2009-06-16 17:05:16 UTC (rev 689)
@@ -2041,8 +2041,7 @@
outnode);
}
} else if ((conn != NULL) && (conn->association.psk == NULL)) {
- if (xmlNewChild
- (n, NULL, (xmlChar *) "Password",
+ if (xmlNewChild(n, NULL, (xmlChar *) "Password",
(xmlChar *) conn->association.psk_hex) == NULL) {
xmlFreeNode(n);
return ipc_callout_create_error(NULL,
@@ -2051,8 +2050,7 @@
outnode);
}
} else {
- if (xmlNewChild
- (n, NULL, (xmlChar *) "Password",
+ if (xmlNewChild(n, NULL, (xmlChar *) "Password",
(xmlChar *) conn->association.psk) == NULL) {
xmlFreeNode(n);
return ipc_callout_create_error(NULL,
@@ -2064,6 +2062,8 @@
} else {
username = config_get_inner_user_from_profile(prof->method);
if (username == NULL) {
+ if (prof->identity != NULL)
+ {
username = _strdup(prof->identity);
if (username != NULL) {
xsup_common_upcase(username);
@@ -2076,10 +2076,10 @@
username = prof->identity;
}
}
+ }
}
- if (xmlNewChild
- (n, NULL, (xmlChar *) "Username",
+ if (xmlNewChild(n, NULL, (xmlChar *) "Username",
(xmlChar *) username) == NULL) {
xmlFreeNode(n);
return ipc_callout_create_error(NULL,
@@ -2088,8 +2088,7 @@
outnode);
}
- if (xmlNewChild
- (n, NULL, (xmlChar *) "Password",
+ if (xmlNewChild(n, NULL, (xmlChar *) "Password",
(xmlChar *) config_get_pwd_from_profile(prof->method)) ==
NULL) {
xmlFreeNode(n);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-06-15 03:24:14
|
Revision: 688
http://open1x.svn.sourceforge.net/open1x/?rev=688&view=rev
Author: chessing
Date: 2009-06-15 03:24:12 +0000 (Mon, 15 Jun 2009)
Log Message:
-----------
Small fix to prevent a crash when there are no user certificates defined.
Modified Paths:
--------------
trunk/xsupplicant-ui/xsupptray/WizardPages.cpp
Modified: trunk/xsupplicant-ui/xsupptray/WizardPages.cpp
===================================================================
--- trunk/xsupplicant-ui/xsupptray/WizardPages.cpp 2009-06-11 05:16:21 UTC (rev 687)
+++ trunk/xsupplicant-ui/xsupptray/WizardPages.cpp 2009-06-15 03:24:12 UTC (rev 688)
@@ -3729,15 +3729,13 @@
m_numCerts = 0;
- while (m_pCertArray[m_numCerts].certname != NULL)
-
+ while ((m_pCertArray != NULL) &&
+ (m_pCertArray[m_numCerts].certname != NULL))
++m_numCerts;
for (int i = 0; i < nRows; i++)
-
{
-
QTableWidgetItem * item = m_pCertTable->item(i, 0);
if (item != NULL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-06-11 05:19:07
|
Revision: 687
http://open1x.svn.sourceforge.net/open1x/?rev=687&view=rev
Author: chessing
Date: 2009-06-11 05:16:21 +0000 (Thu, 11 Jun 2009)
Log Message:
-----------
Added code to detect multiple instances of the supplicant/UI running and do the right thing.
Modified Paths:
--------------
trunk/xsupplicant/lib/libsupdetect/linux_calls.c
trunk/xsupplicant/src/eapol_key_type2.c
trunk/xsupplicant/src/eapol_key_type254.c
trunk/xsupplicant/src/xsup_driver.c
trunk/xsupplicant/src/xsup_ipc.c
trunk/xsupplicant/src/xsup_ipc.h
Modified: trunk/xsupplicant/lib/libsupdetect/linux_calls.c
===================================================================
--- trunk/xsupplicant/lib/libsupdetect/linux_calls.c 2009-06-03 20:23:35 UTC (rev 686)
+++ trunk/xsupplicant/lib/libsupdetect/linux_calls.c 2009-06-11 05:16:21 UTC (rev 687)
@@ -5,17 +5,100 @@
*
* \author ch...@op...
*
- * $Id: linux_calls.c,v 1.3 2007/10/17 07:00:39 galimorerpg Exp $
- * $Date: 2007/10/17 07:00:39 $
**/
#ifdef LINUX
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <dirent.h>
#include "src/xsup_debug.h"
#include "supdetect_private.h"
/**
+ * \brief Given a full path to a process (including the process name), strip
+ * everything but the process name so that we can get a good match.
+ *
+ * \note This function returns a pointer to the substring that is contained
+ * in the source string. IT SHOULD NOT BE FREED! (Or bad stuff will
+ * happen.)
+ *
+ * @param[in] srcstr A string containing a full path to a process. If this
+ * string is NULL, this function will return NULL.
+ *
+ * \retval char* pointer to the substring that contains just the process name.
+ **/
+char *get_pname_only(char *srcstr)
+{
+ char *last = NULL;
+ char *cur = NULL;
+
+ if (srcstr == NULL) return NULL;
+
+ cur = srcstr;
+ while (cur)
+ {
+ cur = strstr(cur, "/");
+ if (cur) cur = cur+1; // Skip the current /.
+ if (cur)
+ last = cur; // Point to the character beyond the /.
+ }
+
+ return last;
+}
+
+// Taken from the thread at :
+// http://www.linuxforums.org/forum/linux-programming-scripting/40078-c-printing-linux-process-table.html
+
+/**
+ * \brief Get the number of processes by one name are running.
+ *
+ * @param[in] p_processname The name of the process we are looking for.
+ *
+ * \retval 0 if the process wasn't found.
+ * \retval uint of the process if it was found.
+ **/
+unsigned int getNumProcesses(char *p_processname) {
+ DIR *dir_p;
+ char *pname;
+ struct dirent *dir_entry_p;
+ char dir_name[40]; // ??? buffer overrun potential
+ char target_name[252]; // ??? buffer overrun potential
+ int target_result;
+ char exe_link[252];
+ int errorcount;
+ int result;
+ unsigned int num_found = 0;
+
+ errorcount=0;
+ result=0;
+ dir_p = opendir("/proc/"); // Open /proc/ directory
+ while(NULL != (dir_entry_p = readdir(dir_p))) { // Reading /proc/ entries
+ if (strspn(dir_entry_p->d_name, "0123456789") == strlen(dir_entry_p->d_name)) { // Checking for numbered directories
+ strcpy(dir_name, "/proc/");
+ strcat(dir_name, dir_entry_p->d_name);
+ strcat(dir_name, "/"); // Obtaining the full-path eg: /proc/24657/
+ exe_link[0] = 0;
+ strcat(exe_link, dir_name);
+ strcat(exe_link, "exe"); // Getting the full-path of that exe link
+ target_result = readlink(exe_link, target_name, sizeof(target_name)-1); // Getting the target of the exe ie to which binary it points to
+ if (target_result > 0) {
+ target_name[target_result] = 0;
+ pname = get_pname_only(target_name);
+
+ if (strcmp(pname, p_processname) == 0)
+ num_found++;
+ }
+ }
+ }
+ closedir(dir_p);
+
+ return num_found;
+}
+
+/**
* \brief Look in the linux process list to see if a process is running.
*
* @param[in] search The fingerprint record to search for.
@@ -25,8 +108,7 @@
**/
int supdetect_check_process_list(sup_fingerprints * search)
{
-#warning IMPLEMENT!
- return 0;
+ return getNumProcesses(search->match_string);
}
/**
Modified: trunk/xsupplicant/src/eapol_key_type2.c
===================================================================
--- trunk/xsupplicant/src/eapol_key_type2.c 2009-06-03 20:23:35 UTC (rev 686)
+++ trunk/xsupplicant/src/eapol_key_type2.c 2009-06-11 05:16:21 UTC (rev 687)
@@ -52,20 +52,24 @@
uint8_t wpa2_group_key_ver = 0, wpa2_pairwise_key_ver = 0;
/**
- * Given a frame, parse all of the data that is contained in it, and
- * provide a human readable output that is useful for debugging.
+ * \brief Given a frame, parse all of the data that is contained in it, and
+ * provide a human readable output that is useful for debugging.
+ *
+ * @param[in] ctx The context for the interface that the frame came in on.
+ * @param[in] framedata The frame that we want to parse and dump the key
+ * data for.
**/
-void eapol_key_type2_dump(context * intdata, char *framedata)
+void eapol_key_type2_dump(context * ctx, char *framedata)
{
int value16 = 0;
int need_comma = 0, encdata = 0;
uint16_t keylen, version = 0;
- struct wpa2_key_packet *keydata;
+ struct wpa2_key_packet *keydata = NULL;
uint8_t *keypayload = NULL;
uint8_t *key = NULL;
uint8_t rc4_ek[32];
- if (!xsup_assert((intdata != NULL), "intdata != NULL", FALSE))
+ if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE))
return;
if (!xsup_assert((framedata != NULL), "framedata != NULL", FALSE))
@@ -171,6 +175,7 @@
debug_printf(DEBUG_KEY, "Key Data : (%d)\n", value16);
debug_hex_dump(DEBUG_KEY, keydata->keydata, value16);
}
+
// nothing to do!
if (encdata == 0)
return;
@@ -183,13 +188,13 @@
debug_printf(DEBUG_NORMAL,
"Error with malloc of keypayload in %s()!\n",
__FUNCTION__);
- ipc_events_malloc_failed(intdata);
+ ipc_events_malloc_failed(ctx);
return;
}
memcpy(keypayload, keydata->keydata, keylen);
- if (!intdata->statemachine->PTK) {
+ if (!ctx->statemachine->PTK) {
debug_printf(DEBUG_NORMAL,
"PTK is NULL! Can't decrypt data!\n");
FREE(keypayload);
@@ -200,7 +205,7 @@
case 1:
memset(rc4_ek, 0x00, 32);
memcpy(rc4_ek, keydata->key_iv, 16);
- memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16);
+ memcpy(&rc4_ek[16], &ctx->statemachine->PTK[16], 16);
rc4_skip(rc4_ek, 32, 256, keypayload, keylen);
break;
@@ -210,28 +215,28 @@
debug_printf(DEBUG_NORMAL,
"Error with malloc of key in %s()!\n",
__FUNCTION__);
- ipc_events_malloc_failed(intdata);
+ ipc_events_malloc_failed(ctx);
FREE(keypayload);
return;
}
debug_printf(DEBUG_KEY, "PTK : ");
debug_hex_printf(DEBUG_KEY,
- (uint8_t *) intdata->statemachine->PTK, 32);
+ (uint8_t *) ctx->statemachine->PTK, 32);
debug_printf(DEBUG_KEY, "\n");
- if (aes_unwrap((uint8_t *) & intdata->statemachine->PTK[16],
+ if (aes_unwrap((uint8_t *) & ctx->statemachine->PTK[16],
(keylen - 8) / 8, keypayload, key) != 0) {
debug_printf(DEBUG_NORMAL,
"Failed AES unwrap. (Data will be"
" invalid!)\n");
- if (intdata->statemachine->PTK == NULL)
+ if (ctx->statemachine->PTK == NULL)
debug_printf(DEBUG_NORMAL,
"Unwrap failed because PTK is NULL!\n");
- ipc_events_error(intdata,
+ ipc_events_error(ctx,
IPC_EVENT_ERROR_FAILED_AES_UNWRAP,
- intdata->desc);
- cardif_disassociate(intdata, DISASSOC_CIPHER_REJECT);
+ ctx->desc);
+ cardif_disassociate(ctx, DISASSOC_CIPHER_REJECT);
}
FREE(keypayload);
@@ -252,16 +257,22 @@
}
/**
- * Generate the pre-Temporal key. (PTK) Using the authenticator, and
+ * \brief Generate the pre-Temporal key. (PTK) Using the authenticator, and
* supplicant nonces. (Anonce, and Snonce.) The PTK is used for keying
* when we are ready.
+ *
+ * @param[in] ctx The context for the interface that we need to generate the
+ * PTK on.
+ *
+ * \retval NULL on error.
+ * \retval char* pointer to PTK.
**/
-char *eapol_key_type2_gen_ptk(context * intdata, char *Anonce)
+char *eapol_key_type2_gen_ptk(context * ctx, char *Anonce)
{
char prfdata[76]; // 6*2 (MAC addrs) + 32*2 (nonces)
char *retval = NULL;
- if (!xsup_assert((intdata != NULL), "intdata != NULL", FALSE))
+ if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE))
return NULL;
if (!xsup_assert((Anonce != NULL), "Anonce != NULL", FALSE))
@@ -271,25 +282,24 @@
debug_printf(DEBUG_INT, "Checking MAC data :\n");
debug_printf(DEBUG_INT, "Source MAC : \n");
- debug_hex_printf(DEBUG_INT, (uint8_t *) intdata->source_mac, 6);
+ debug_hex_printf(DEBUG_INT, (uint8_t *) ctx->source_mac, 6);
debug_printf(DEBUG_INT, "Dest MAC :\n");
- debug_hex_printf(DEBUG_INT, (uint8_t *) intdata->dest_mac, 6);
- if (memcmp((char *)&intdata->source_mac, (char *)&intdata->dest_mac, 6)
+ debug_hex_printf(DEBUG_INT, (uint8_t *) ctx->dest_mac, 6);
+ if (memcmp((char *)&ctx->source_mac, (char *)&ctx->dest_mac, 6)
< 0) {
- memcpy((char *)&prfdata[0], (char *)&intdata->source_mac, 6);
- memcpy((char *)&prfdata[6], (char *)&intdata->dest_mac, 6);
+ memcpy((char *)&prfdata[0], (char *)&ctx->source_mac, 6);
+ memcpy((char *)&prfdata[6], (char *)&ctx->dest_mac, 6);
} else
- if (memcmp
- ((char *)&intdata->source_mac, (char *)&intdata->dest_mac,
+ if (memcmp((char *)&ctx->source_mac, (char *)&ctx->dest_mac,
6) > 0) {
- memcpy((char *)&prfdata[0], (char *)&intdata->dest_mac, 6);
- memcpy((char *)&prfdata[6], (char *)&intdata->source_mac, 6);
+ memcpy((char *)&prfdata[0], (char *)&ctx->dest_mac, 6);
+ memcpy((char *)&prfdata[6], (char *)&ctx->source_mac, 6);
} else {
debug_printf(DEBUG_NORMAL,
"Source and Destination MAC addresses "
"match! The PTK won't be valid!\n");
- ipc_events_error(intdata, IPC_EVENT_ERROR_INVALID_PTK,
- intdata->desc);
+ ipc_events_error(ctx, IPC_EVENT_ERROR_INVALID_PTK,
+ ctx->desc);
return NULL;
}
@@ -297,19 +307,19 @@
debug_printf(DEBUG_INT, "Anonce : \n");
debug_hex_printf(DEBUG_INT, (uint8_t *) Anonce, 32);
debug_printf(DEBUG_INT, "Snonce :\n");
- debug_hex_printf(DEBUG_INT, intdata->statemachine->SNonce, 32);
- if (memcmp(intdata->statemachine->SNonce, Anonce, 32) < 0) {
- memcpy((char *)&prfdata[12], intdata->statemachine->SNonce, 32);
+ debug_hex_printf(DEBUG_INT, ctx->statemachine->SNonce, 32);
+ if (memcmp(ctx->statemachine->SNonce, Anonce, 32) < 0) {
+ memcpy((char *)&prfdata[12], ctx->statemachine->SNonce, 32);
memcpy((char *)&prfdata[44], Anonce, 32);
- } else if (memcmp(intdata->statemachine->SNonce, Anonce, 32) > 0) {
+ } else if (memcmp(ctx->statemachine->SNonce, Anonce, 32) > 0) {
memcpy((char *)&prfdata[12], Anonce, 32);
- memcpy((char *)&prfdata[44], intdata->statemachine->SNonce, 32);
+ memcpy((char *)&prfdata[44], ctx->statemachine->SNonce, 32);
} else {
debug_printf(DEBUG_NORMAL,
"ANonce and SNonce match! The PTK won't"
" be valid!\n");
- ipc_events_error(intdata, IPC_EVENT_ERROR_INVALID_PTK,
- intdata->desc);
+ ipc_events_error(ctx, IPC_EVENT_ERROR_INVALID_PTK,
+ ctx->desc);
return NULL;
}
@@ -318,16 +328,16 @@
debug_printf(DEBUG_NORMAL,
"Couldn't allocate memory for retval in %s "
"at %d!\n", __FUNCTION__, __LINE__);
- ipc_events_malloc_failed(intdata);
+ ipc_events_malloc_failed(ctx);
return NULL;
}
- if (intdata->statemachine->PMK == NULL)
+ if (ctx->statemachine->PMK == NULL)
return NULL;
debug_printf(DEBUG_KEY, "PMK : ");
- debug_hex_printf(DEBUG_KEY, (uint8_t *) intdata->statemachine->PMK, 32);
- wpa_PRF((uint8_t *) intdata->statemachine->PMK, 32,
+ debug_hex_printf(DEBUG_KEY, (uint8_t *) ctx->statemachine->PMK, 32);
+ wpa_PRF((uint8_t *) ctx->statemachine->PMK, 32,
(uint8_t *) "Pairwise key expansion", 22, (uint8_t *) & prfdata,
76, (uint8_t *) retval, 64);
@@ -338,23 +348,25 @@
}
/**
- * When a MIC failure occures, we need to send the AP a request for
- * a new key. (Reference 802.11i-D3.0.pdf page 43, line 8)
+ * \brief When a MIC failure occures, we need to send the AP a request for
+ * a new key. (Reference 802.11i-D3.0.pdf page 43, line 8)
+ *
+ * @param[in] ctx The context that we need to request a new key on.
+ * @param[in] unicast TRUE if we need to request a new unicast key.
**/
-void eapol_key_type2_request_new_key(context * intdata, char unicast)
+void eapol_key_type2_request_new_key(context * ctx, char unicast)
{
- struct wpa2_key_packet *outkeydata;
- uint16_t value16, keyindex, len;
+ struct wpa2_key_packet *outkeydata = NULL;
+ uint16_t value16 = 0, keyindex = 0, len = 0;
char key[16];
- if (!xsup_assert((intdata != NULL), "intdata != NULL", FALSE))
+ if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE))
return;
- outkeydata =
- (struct wpa2_key_packet *)&intdata->sendframe[OFFSET_TO_EAPOL + 4];
+ outkeydata = (struct wpa2_key_packet *)&ctx->sendframe[OFFSET_TO_EAPOL + 4];
// Clear everything out.
- memset(&intdata->sendframe[OFFSET_TO_EAPOL + 4], 0x00,
+ memset(&ctx->sendframe[OFFSET_TO_EAPOL + 4], 0x00,
sizeof(struct wpa2_key_packet));
outkeydata->key_descriptor = WPA2_KEY_TYPE;
@@ -377,37 +389,49 @@
// Build the response.
len = sizeof(struct wpa2_key_packet);
- intdata->send_size = len + OFFSET_TO_EAPOL + 4;
+ ctx->send_size = len + OFFSET_TO_EAPOL + 4;
- eapol_build_header(intdata, EAPOL_KEY,
- (intdata->send_size - OFFSET_TO_EAPOL - 4),
- (char *)intdata->sendframe);
+ eapol_build_header(ctx, EAPOL_KEY,
+ (ctx->send_size - OFFSET_TO_EAPOL - 4),
+ (char *)ctx->sendframe);
- if (!intdata->statemachine->PTK) {
+ if (!ctx->statemachine->PTK) {
debug_printf(DEBUG_NORMAL,
"No valid PTK available! We will not "
"be able to request a new key!\n");
return;
}
- memcpy(key, intdata->statemachine->PTK, 16);
- mic_wpa_populate((char *)intdata->sendframe, intdata->send_size + 4,
+ memcpy(key, ctx->statemachine->PTK, 16);
+ mic_wpa_populate((char *)ctx->sendframe, ctx->send_size + 4,
key, 16);
- cardif_sendframe(intdata);
- intdata->statemachine->eapolEap = FALSE;
+ cardif_sendframe(ctx);
+ ctx->statemachine->eapolEap = FALSE;
}
/**
- * Process a GTK KDE, and set the keys as needed.
+ * \brief Process a GTK KDE, and set the keys as needed.
+ *
+ * @param[in] ctx The context for the interface that we want to process the
+ * group KDE on.
+ * @param[in] key The KDE that contains the group key that we want to set.
+ * @param[in] kdelen The length of the KDE that was passed in via 'key'.
+ * @param[in] keylen The length of the key we want to set.
+ * @param[in] keyrsc The RSC value for this key.
+ * @param[in] version The version value that tells us what type of key this
+ * is.
+ *
+ * \retval XENONE on success
+ * \retval XEMALLOC on bad parameter passed in.
**/
-char eapol_key_type2_do_gtk_kde(context * intdata, uint8_t * key,
+char eapol_key_type2_do_gtk_kde(context * ctx, uint8_t * key,
uint16_t kdelen, uint8_t keylen,
uint8_t * keyrsc, char version)
{
char keyindex = 0, txkey = 0;
- if (!xsup_assert((intdata != NULL), "intdata != NULL", FALSE))
+ if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE))
return XEMALLOC;
if (!xsup_assert((key != NULL), "key != NULL", FALSE))
@@ -421,8 +445,6 @@
keyindex = WPA2_KEY_INDEX_MASK & key[0];
-// if (WPA2_TX_KEY_MASK & key[0]) txkey = 1;
-
kdelen -= 2;
key += 2;
@@ -437,34 +459,46 @@
switch (version) {
case 1:
- wpa_common_set_key(intdata, NULL, keyindex, txkey, (char *)key,
+ wpa_common_set_key(ctx, NULL, keyindex, txkey, (char *)key,
keylen);
break;
case 2:
- wpa_common_set_key(intdata, NULL, keyindex, txkey, (char *)key,
+ wpa_common_set_key(ctx, NULL, keyindex, txkey, (char *)key,
keylen);
break;
default:
debug_printf(DEBUG_NORMAL, "Unknown encryption/MAC type %d.\n",
version);
- ipc_events_error(intdata, IPC_EVENT_ERROR_UNKNOWN_KEY_REQUEST,
- intdata->desc);
+ ipc_events_error(ctx, IPC_EVENT_ERROR_UNKNOWN_KEY_REQUEST,
+ ctx->desc);
break;
}
debug_printf(DEBUG_NORMAL,
"Interface '%s' set new group IEEE 802.11i/WPA2 key.\n",
- intdata->desc);
+ ctx->desc);
return XENONE;
}
/**
- * Process an STAKey KDE and set keys as needed.
+ * \brief Process an STAKey KDE and set keys as needed.
+ *
+ * \note This is just a stub for if we want to implement STA keys later.
+ *
+ * @param[in] ctx The context for the interface that we want to set the
+ * STAKey on.
+ * @param[in] key The key we want to set.
+ * @param[in] keylen The length of the key we want to set.
+ * @param[in] keyrsc The RSC for the key we want to set.
+ * @param[in] version The version number that tells us what type of key
+ * should be set.
+ *
+ * \retval XENONE is always returned.
**/
-char eapol_key_type2_do_stakey_kde(context * intdata,
+char eapol_key_type2_do_stakey_kde(context * ctx,
uint8_t * key, uint16_t keylen,
uint8_t * keyrsc, char version)
{
@@ -474,9 +508,18 @@
}
/**
- * Process a MAC address KDE.
+ * \brief Process a MAC address KDE.
+ *
+ * \note This is a stub for a function that is not yet implemented.
+ *
+ * @param[in] ctx The context that we want to process a MAC address KDE on.
+ * @param[in] key The KDE that we want to process.
+ * @param[in] keylen The length of the KDE to process.
+ * @param[in] version (Probably wouldn't be used in a real implementation.)
+ *
+ * \retval XENONE is always returned.
**/
-char eapol_key_type2_do_mac_kde(context * intdata, uint8_t * key,
+char eapol_key_type2_do_mac_kde(context * ctx, uint8_t * key,
uint16_t keylen, char version)
{
debug_printf(DEBUG_NORMAL, "MAC KDEs are not supported at this time! "
@@ -485,7 +528,16 @@
}
/**
- * Process a PMKID KDE.
+ * \brief Process a PMKID KDE.
+ *
+ * @param[in] ctx The context for the interface that we want to process a
+ * PMKID KDE on.
+ * @param[in] key The PMKID KDE that we want to process.
+ * @param[in] kdelen The length of the KDE passed in to 'key'.
+ * @param[in] version (Unused.)
+ *
+ * \retval XENONE on success
+ * \retval XEMALLOC on bad parameters passed, or memory allocation failures.
**/
char eapol_key_type2_do_pmkid_kde(context * ctx,
uint8_t * key, uint16_t kdelen, char version)
@@ -503,7 +555,6 @@
if (wctx->pmkid_used) {
if (memcmp(wctx->pmkid_used, key, 16) == 0) {
- //wctx->okc = 1;
debug_printf(DEBUG_INT, "PMKID MATCH\n");
debug_hex_printf(DEBUG_INT, wctx->pmkid_used, kdelen);
}
@@ -542,28 +593,36 @@
}
/**
- * Given the IE from the decrypted data, verify that it matches what
- * the AP originally told us. If not, we should fail, and send a deauth.
+ * \brief Given the IE from the decrypted data, verify that it matches what
+ * the AP originally told us. If not, we should fail, and send a deauth.
+ *
+ * @param[in] ctx The context for the interface that we want to compare the
+ * WPA 2 IE on.
+ * @param[in] iedata The IE that was in the decrypted data.
+ * @param[in] len The length of the IE that was passed in via 'iedata'.
+ *
+ * \retval XENONE on success
+ * \retval -1 on failure
+ * \retval XEMALLOC if a parameter was incorrect, or a memory allocation failed.
**/
-int eapol_key_type2_cmp_ie(context * intdata, uint8_t * iedata, int len)
+int eapol_key_type2_cmp_ie(context * ctx, uint8_t * iedata, int len)
{
- uint8_t *apie, ielen;
+ uint8_t *apie = NULL, ielen = 0;
- if (!xsup_assert((intdata != NULL), "intdata != NULL", FALSE))
+ if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE))
return XEMALLOC;
if (!xsup_assert((iedata != NULL), "iedata != NULL", FALSE))
return XEMALLOC;
- if (!xsup_assert
- ((intdata->conn != NULL), "intdata->conn != NULL", FALSE))
+ if (!xsup_assert((ctx->conn != NULL), "ctx->conn != NULL", FALSE))
return XEMALLOC;
- if (intdata->conn->flags & CONFIG_NET_IS_HIDDEN) {
+ if (ctx->conn->flags & CONFIG_NET_IS_HIDDEN) {
debug_printf(DEBUG_NORMAL,
"Interface '%s' connected to a hidden SSID. We don't know the IE that was used, so we won't check. (Man-in-the-middle checks have been weakened.)\n",
- intdata->desc);
- return 0;
+ ctx->desc);
+ return XENONE;
}
if (iedata[0] != WPA2_EID) {
@@ -577,7 +636,7 @@
debug_hex_dump(DEBUG_KEY, (uint8_t *) iedata, len);
// Be sure *NOT* to free apie, as it is a reference pointer only!!!
- config_ssid_get_rsn_ie(intdata->intTypeData, &apie, &ielen);
+ config_ssid_get_rsn_ie(ctx->intTypeData, &apie, &ielen);
debug_printf(DEBUG_KEY, "AP sent us an IE of (%d) : \n", ielen);
debug_hex_dump(DEBUG_KEY, (uint8_t *) apie, ielen);
@@ -606,7 +665,7 @@
* for different Key Data Encapsulations (KDEs). Depending on the KDE that
* we find, we will pass the data on for further processing.
*
- * @param[in] intdata The context for the interface that we are working with.
+ * @param[in] ctx The context for the interface that we are working with.
* @param[in] keydata The keydata field from the WPA2 key frame. (This is the undefined length field at the end of the frame.)
* @param[in] len The number of bytes in the keydata
* @param[in] keylen The length of the keys that we are using. (May be 0 if we are processing a frame that isn't expected to have a GTK KDE.)
@@ -617,7 +676,7 @@
*
* \retval XENONE on success
**/
-char eapol_key_type2_process_keydata(context * intdata,
+char eapol_key_type2_process_keydata(context * ctx,
uint8_t * keydata, uint16_t len,
uint8_t keylen, uint8_t * keyrsc,
char version, char cmpies)
@@ -626,7 +685,7 @@
int i = 0, done = 0;
uint8_t *p, kdelen;
- if (!xsup_assert((intdata != NULL), "intdata != NULL", FALSE))
+ if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE))
return XEMALLOC;
if (!xsup_assert((keydata != NULL), "keydata != NULL", FALSE))
@@ -638,17 +697,16 @@
while ((i < len) && (!done)) {
if ((keydata[i] == 0x30) && (cmpies == TRUE)) {
// We are testing the IE to see if it matches what the AP gave us.
- if (eapol_key_type2_cmp_ie
- (intdata, &keydata[i], (keydata[i + 1] + 2))
+ if (eapol_key_type2_cmp_ie(ctx, &keydata[i], (keydata[i + 1] + 2))
!= XENONE) {
debug_printf(DEBUG_NORMAL,
"IE presented by the AP doesn't "
"match the IE in the key message! Assuming "
"an active attack is in progress!\n");
- ipc_events_error(intdata,
+ ipc_events_error(ctx,
IPC_EVENT_ERROR_IES_DONT_MATCH,
- intdata->desc);
- cardif_disassociate(intdata,
+ ctx->desc);
+ cardif_disassociate(ctx,
DISASSOC_INVALID_IE);
return -1;
}
@@ -676,8 +734,8 @@
case WPA2_EXTENDED_GTK_KEY:
debug_printf(DEBUG_KEY,
"KDE : GTK KDE\n");
- if (eapol_key_type2_do_gtk_kde
- (intdata, p, kdelen - 4, keylen,
+ if (eapol_key_type2_do_gtk_kde(ctx,
+ p, kdelen - 4, keylen,
keyrsc, version) != XENONE) {
debug_printf(DEBUG_NORMAL,
"Couldn't set the GTK! "
@@ -689,8 +747,10 @@
case WPA2_EXTENDED_STA_KEY:
debug_printf(DEBUG_KEY,
"KDE : STAKey KDE\n");
- if (eapol_key_type2_do_stakey_kde
- (intdata, p, kdelen - 4, keyrsc,
+ if (eapol_key_type2_do_stakey_kde(ctx,
+ p,
+ kdelen - 4,
+ keyrsc,
version) != XENONE) {
debug_printf(DEBUG_NORMAL,
"Couldn't set STAKey!\n");
@@ -701,8 +761,7 @@
case WPA2_EXTENDED_MAC_ADDRESS:
debug_printf(DEBUG_KEY,
"KDE : MAC address KDE\n");
- if (eapol_key_type2_do_mac_kde
- (intdata, p, kdelen - 4,
+ if (eapol_key_type2_do_mac_kde(ctx, p, kdelen - 4,
version) != XENONE) {
debug_printf(DEBUG_NORMAL,
"Couldn't processing MAC "
@@ -714,8 +773,7 @@
case WPA2_EXTENDED_PMKID:
debug_printf(DEBUG_KEY,
"KDE : PMKID KDE\n");
- if (eapol_key_type2_do_pmkid_kde
- (intdata, p, kdelen - 4,
+ if (eapol_key_type2_do_pmkid_kde(ctx, p, kdelen - 4,
version) != XENONE) {
debug_printf(DEBUG_NORMAL,
"Couldn't process PMKID!\n");
@@ -742,40 +800,39 @@
}
/**
- * When we have completed the PTK piece, and the pairwise key has been
+ * \brief When we have completed the PTK piece, and the pairwise key has been
* applied to the interface, we need to get the group key. The authenticator
* will send us a group key that is encrypted. We should decrypt it, apply
* it to our interface, and send the authenticator a message to let it know
* that we have a group key.
+ *
+ * @param[in] ctx The context for the interface that we want to get the GTK
+ * for.
**/
-void eapol_key_type2_do_gtk(context * intdata)
+void eapol_key_type2_do_gtk(context * ctx)
{
- struct wpa2_key_packet *inkeydata, *outkeydata;
- uint16_t value16, keyflags, version, len;
+ struct wpa2_key_packet *inkeydata = NULL, *outkeydata = NULL;
+ uint16_t value16 = 0, keyflags = 0, version = 0, len = 0;
unsigned char *keydata = NULL;
char key[48], rc4_ek[48];
char zeros[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
wireless_ctx *wctx = NULL;
- if (!xsup_assert((intdata != NULL), "intdata != NULL", FALSE))
+ if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE))
return;
- if (!xsup_assert
- ((intdata->intType == ETH_802_11_INT),
- "intdata->intType == ETH_802_11_INT", FALSE))
+ if (!xsup_assert((ctx->intType == ETH_802_11_INT),
+ "ctx->intType == ETH_802_11_INT", FALSE))
return;
- if (!xsup_assert
- ((intdata->intTypeData != NULL), "intdata->intTypeData != NULL",
+ if (!xsup_assert((ctx->intTypeData != NULL), "ctx->intTypeData != NULL",
FALSE))
return;
- wctx = intdata->intTypeData;
+ wctx = ctx->intTypeData;
- inkeydata =
- (struct wpa2_key_packet *)&intdata->recvframe[OFFSET_TO_EAPOL + 4];
- outkeydata =
- (struct wpa2_key_packet *)&intdata->sendframe[OFFSET_TO_EAPOL + 4];
+ inkeydata = (struct wpa2_key_packet *)&ctx->recvframe[OFFSET_TO_EAPOL + 4];
+ outkeydata = (struct wpa2_key_packet *)&ctx->sendframe[OFFSET_TO_EAPOL + 4];
// First, make sure that the inkeydata replay counter is higher than
// the last counter we saw.
@@ -783,11 +840,11 @@
0) && (memcmp(inkeydata->key_replay_counter, zeros, 8) != 0)) {
debug_printf(DEBUG_NORMAL,
"Invalid replay counter! Discarding!\n");
- intdata->recv_size = 0;
+ ctx->recv_size = 0;
return;
}
// Clear everything out.
- memset(&intdata->sendframe[OFFSET_TO_EAPOL + 4], 0x00,
+ memset(&ctx->sendframe[OFFSET_TO_EAPOL + 4], 0x00,
sizeof(struct wpa2_key_packet));
outkeydata->key_descriptor = WPA2_KEY_TYPE;
@@ -815,7 +872,7 @@
if (keydata == NULL) {
debug_printf(DEBUG_NORMAL,
"Couldn't allocate memory for key data!\n");
- ipc_events_malloc_failed(intdata);
+ ipc_events_malloc_failed(ctx);
return;
}
@@ -824,7 +881,7 @@
debug_printf(DEBUG_KEY, "Setting GTK! (Version : %d Length : %d)\n",
version, value16);
- if (!intdata->statemachine->PTK) {
+ if (!ctx->statemachine->PTK) {
debug_printf(DEBUG_NORMAL,
"No valid PTK available! We won't be able"
" to continue.\n");
@@ -837,13 +894,13 @@
// Decrypt the GTK.
memset(rc4_ek, 0x00, 32);
memcpy(rc4_ek, inkeydata->key_iv, 16);
- memcpy(&rc4_ek[16], &intdata->statemachine->PTK[16], 16);
+ memcpy(&rc4_ek[16], &ctx->statemachine->PTK[16], 16);
rc4_skip((uint8_t *) rc4_ek, 32, 256, keydata, value16);
debug_printf(DEBUG_KEY, "Decrypted data : (%d)\n", value16);
debug_hex_dump(DEBUG_KEY, keydata, value16);
- if (eapol_key_type2_process_keydata(intdata, keydata, value16,
+ if (eapol_key_type2_process_keydata(ctx, keydata, value16,
ntohs
(inkeydata->key_length),
inkeydata->key_rsc, version,
@@ -857,31 +914,29 @@
case 2:
// First, decrypt the GTK
memset(key, 0x00, 32);
- if (aes_unwrap((uint8_t *) & intdata->statemachine->PTK[16],
+ if (aes_unwrap((uint8_t *) & ctx->statemachine->PTK[16],
(value16 - 8) / 8, keydata,
(uint8_t *) key) != 0) {
debug_printf(DEBUG_NORMAL, "Failed AES unwrap.\n");
- if (intdata->statemachine->PTK == NULL)
+ if (ctx->statemachine->PTK == NULL)
debug_printf(DEBUG_NORMAL,
"Unwrap failed because PTK is NULL!\n");
- ipc_events_error(intdata,
+ ipc_events_error(ctx,
IPC_EVENT_ERROR_FAILED_AES_UNWRAP,
- intdata->desc);
- cardif_disassociate(intdata, DISASSOC_CIPHER_REJECT);
+ ctx->desc);
+ cardif_disassociate(ctx, DISASSOC_CIPHER_REJECT);
}
debug_printf(DEBUG_KEY, "Result : ");
debug_hex_printf(DEBUG_KEY, (uint8_t *) key, value16);
- if (eapol_key_type2_process_keydata
- (intdata, (uint8_t *) key, value16,
+ if (eapol_key_type2_process_keydata(ctx, (uint8_t *) key, value16,
ntohs(inkeydata->key_length), inkeydata->key_rsc, version,
- TRUE)
- != XENONE) {
+ TRUE) != XENONE) {
FREE(keydata);
debug_printf(DEBUG_NORMAL,
"Unable to process key data!\n");
- cardif_disassociate(intdata, 0); // Fix this to be a valid reason.
+ cardif_disassociate(ctx, 0); // Fix this to be a valid reason.
return;
}
break;
@@ -901,25 +956,25 @@
memcpy(&outkeydata->key_replay_counter, &inkeydata->key_replay_counter,
8);
- eapol_build_header(intdata, EAPOL_KEY,
- (intdata->send_size - OFFSET_TO_EAPOL - 4),
- (char *)intdata->sendframe);
+ eapol_build_header(ctx, EAPOL_KEY,
+ (ctx->send_size - OFFSET_TO_EAPOL - 4),
+ (char *)ctx->sendframe);
- memcpy(key, intdata->statemachine->PTK, 16);
- mic_wpa_populate((char *)intdata->sendframe, intdata->send_size + 4,
+ memcpy(key, ctx->statemachine->PTK, 16);
+ mic_wpa_populate((char *)ctx->sendframe, ctx->send_size + 4,
key, 16);
// Dump what we built.
- eapol_key_type2_dump(intdata, (char *)intdata->sendframe);
+ eapol_key_type2_dump(ctx, (char *)ctx->sendframe);
- if (intdata->conn->association.auth_type == AUTH_PSK) {
+ if (ctx->conn->association.auth_type == AUTH_PSK) {
// If we are using PSK, and we made it here, then we are in
// FORCED AUTHENTICATED state.
- statemachine_change_state(intdata, S_FORCE_AUTH);
- cardif_drop_unencrypted(intdata, FALSE);
+ statemachine_change_state(ctx, S_FORCE_AUTH);
+ cardif_drop_unencrypted(ctx, FALSE);
} else {
// Drop unencrypted frames.
- cardif_drop_unencrypted(intdata, TRUE);
+ cardif_drop_unencrypted(ctx, TRUE);
}
// We need to let the event core know that we are done doing the PSK handshake. This allows it to
@@ -927,55 +982,55 @@
// it is a pretty sure indication that our PSK is invalid. If it didn't, then we should be good.
// Note that sometimes APs will drop us a few seconds after the association, even if the PSK is
// valid. This is *NOT* an indication that the key is wrong!
- if (TEST_FLAG
- (((wireless_ctx *) intdata->intTypeData)->flags,
+ if (TEST_FLAG(((wireless_ctx *) ctx->intTypeData)->flags,
WIRELESS_SM_DOING_PSK)) {
- UNSET_FLAG(((wireless_ctx *) intdata->intTypeData)->flags,
+ UNSET_FLAG(((wireless_ctx *) ctx->intTypeData)->flags,
WIRELESS_SM_DOING_PSK);
- timer_cancel(intdata, PSK_DEATH_TIMER);
- ipc_events_ui(intdata, IPC_EVENT_PSK_SUCCESS, intdata->intName);
+ timer_cancel(ctx, PSK_DEATH_TIMER);
+ ipc_events_ui(ctx, IPC_EVENT_PSK_SUCCESS, ctx->intName);
}
FREE(keydata);
}
/**
- * Handle the first packet in the four-way handshake.
+ * \brief Handle the first packet in the four-way handshake.
+ *
+ * @param[in] ctx The context for the interface that we want to process the
+ * first packet on.
**/
-void eapol_key_type2_do_type1(context * intdata)
+void eapol_key_type2_do_type1(context * ctx)
{
- struct wpa2_key_packet *inkeydata, *outkeydata;
- uint16_t keyflags, len, value16;
- int version;
- uint8_t ielen;
+ struct wpa2_key_packet *inkeydata = NULL, *outkeydata = NULL;
+ uint16_t keyflags = 0, len = 0, value16 = 0;
+ int version = 0;
+ uint8_t ielen = 0;
char key[16];
unsigned char wpa_ie[256];
char zeros[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
wireless_ctx *wctx = NULL;
- if (!xsup_assert((intdata != NULL), "intdata != NULL", FALSE))
+ if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE))
return;
- if (intdata->intType != ETH_802_11_INT) {
+ if (ctx->intType != ETH_802_11_INT) {
debug_printf(DEBUG_NORMAL,
"Attempted to process a key message on non-802.11 interface '%s'.\n",
- intdata->desc);
+ ctx->desc);
return;
}
- if (intdata->intTypeData == NULL) {
+ if (ctx->intTypeData == NULL) {
debug_printf(DEBUG_NORMAL,
"Interface '%s' claims to be 802.11, but it doesn't have a wireless context!?\n",
- intdata->desc);
+ ctx->desc);
return;
}
- wctx = intdata->intTypeData;
+ wctx = ctx->intTypeData;
- inkeydata =
- (struct wpa2_key_packet *)&intdata->recvframe[OFFSET_TO_EAPOL + 4];
- outkeydata =
- (struct wpa2_key_packet *)&intdata->sendframe[OFFSET_TO_EAPOL + 4];
+ inkeydata = (struct wpa2_key_packet *)&intdata->recvframe[OFFSET_TO_EAPOL + 4];
+ outkeydata = (struct wpa2_key_packet *)&intdata->sendframe[OFFSET_TO_EAPOL + 4];
if ((memcmp(inkeydata->key_replay_counter, wctx->replay_counter, 8) <=
0) && (memcmp(inkeydata->key_replay_counter, zeros, 8) != 0)) {
Modified: trunk/xsupplicant/src/eapol_key_type254.c
===================================================================
--- trunk/xsupplicant/src/eapol_key_type254.c 2009-06-03 20:23:35 UTC (rev 686)
+++ trunk/xsupplicant/src/eapol_key_type254.c 2009-06-11 05:16:21 UTC (rev 687)
@@ -664,17 +664,19 @@
return XENONE;
}
-/********************************************************
+/**
+ * \brief Handle the third packet in the 4 way handshake. We should be able to
+ * generate the pairwise key at this point.
*
- * Handle the third packet in the 4 way handshake. We should be able to
- * generate the pairwise key at this point.
+ * @param[in] ctx The context for the interface that we want to process the
+ * third packet on.
*
- ********************************************************/
+ **/
void eapol_key_type254_do_type3(context * ctx)
{
struct wpa_key_packet *inkeydata = NULL, *outkeydata = NULL;
- uint16_t keyflags, len, value16, keyindex;
- int version;
+ uint16_t keyflags = 0, len = 0, value16 = 0, keyindex = 0;
+ int version = 0;
char key[32];
char zeros[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
wireless_ctx *wctx = NULL;
@@ -682,23 +684,19 @@
if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE))
return;
- if (!xsup_assert
- ((ctx->intType == ETH_802_11_INT), "ctx->intType == ETH_802_11_INT",
+ if (!xsup_assert((ctx->intType == ETH_802_11_INT), "ctx->intType == ETH_802_11_INT",
FALSE))
return;
- if (!xsup_assert
- ((ctx->intTypeData != NULL), "ctx->intTypeData != NULL", FALSE))
+ if (!xsup_assert((ctx->intTypeData != NULL), "ctx->intTypeData != NULL", FALSE))
return;
wctx = ctx->intTypeData;
memset(key, 0x00, 32);
- inkeydata =
- (struct wpa_key_packet *)&ctx->recvframe[OFFSET_TO_EAPOL + 4];
- outkeydata =
- (struct wpa_key_packet *)&ctx->sendframe[OFFSET_TO_EAPOL + 4];
+ inkeydata = (struct wpa_key_packet *)&ctx->recvframe[OFFSET_TO_EAPOL + 4];
+ outkeydata = (struct wpa_key_packet *)&ctx->sendframe[OFFSET_TO_EAPOL + 4];
// First, make sure that the inkeydata replay counter is higher than
// the last counter we saw.
@@ -785,6 +783,7 @@
ipc_events_error(ctx, IPC_EVENT_ERROR_INVALID_PTK, ctx->desc);
return;
}
+
// Get TK1
value16 = ntohs(inkeydata->key_length);
memcpy(key, (char *)&ctx->statemachine->PTK[32], value16);
@@ -815,6 +814,12 @@
ctx->desc);
}
+/**
+ * \brief Determine the type of key packet that we were handed, based on the
+ * flags that are presented in the key header.
+ *
+ * @param[in] ctx The context for the interface that the packet came in on.
+ **/
void eapol_key_type254_determine_key(context * ctx)
{
struct wpa_key_packet *keydata = NULL;
@@ -823,8 +828,7 @@
if (!xsup_assert((ctx != NULL), "ctx != NULL", FALSE))
return;
- if (!xsup_assert
- ((ctx->recvframe != NULL), "ctx->recvframe != NULL", FALSE))
+ if (!xsup_assert((ctx->recvframe != NULL), "ctx->recvframe != NULL", FALSE))
return;
keydata = (struct wpa_key_packet *)&ctx->recvframe[OFFSET_TO_EAPOL + 4];
@@ -881,6 +885,10 @@
/**
* \brief If we are doing PSK, and this is called, then the handshake stalled.
+ *
+ * @param[in] ctx The context that the PSK timer expired on.
+ *
+ * \retval 0 on success.
**/
int8_t eapol_key_type254_psk_timeout(context * ctx)
{
@@ -899,14 +907,14 @@
}
/**
+ * \brief Process a WPA frame that we get from the authenticator.
*
- * Process a WPA frame that we get from the authenticator.
- *
+ * @param[in] ctx The context for the interface that we got the WPA frame on.
**/
void eapol_key_type254_process(context * ctx)
{
uint8_t *inframe = NULL;
- int insize;
+ int insize = 0;
char tpmk[254];
wireless_ctx *wctx = NULL;
char *pskptr = NULL;
@@ -1045,3 +1053,5 @@
}
}
+
+
Modified: trunk/xsupplicant/src/xsup_driver.c
===================================================================
--- trunk/xsupplicant/src/xsup_driver.c 2009-06-03 20:23:35 UTC (rev 686)
+++ trunk/xsupplicant/src/xsup_driver.c 2009-06-11 05:16:21 UTC (rev 687)
@@ -161,8 +161,7 @@
{
struct config_globals *globals = NULL;
#ifdef WINDOWS
- char *default_cfg =
- "c:\\windows\\system32\\drivers\\etc\\xsupplicant.conf";
+ char *default_cfg = "c:\\windows\\system32\\drivers\\etc\\xsupplicant.conf";
char *global_conf_path = NULL;
#else
char *default_cfg = "/etc/xsupplicant.conf";
@@ -213,8 +212,7 @@
conf_globals = Malloc(sizeof(struct config_globals));
if (conf_globals == NULL) {
- printf
- ("Couldn't allocate memory to store configuration globals.\n");
+ printf("Couldn't allocate memory to store configuration globals.\n");
exit(255);
}
xsupconfig_defaults_set_globals(conf_globals);
@@ -448,7 +446,7 @@
**/
void usage(char *prog, struct options opts[])
{
- debug_printf(DEBUG_NORMAL, "\n\nXsupplicant %s.%s\n", VERSION,
+ debug_printf(DEBUG_NORMAL, "\n\nXSupplicant %s.%s\n", VERSION,
BUILDNUM);
debug_printf(DEBUG_NORMAL,
@@ -516,7 +514,7 @@
* \brief Initialize the supplicant.
*
**/
-int xsup_driver_init(uint8_t clear_ipc, char *device, char *drivername,
+int xsup_driver_init(char *device, char *drivername,
FDEPTH flags)
{
snmp_init(); // This needs to be moved to support multiple interfaces.
@@ -556,8 +554,7 @@
if (device != NULL) {
debug_printf(DEBUG_INIT,
"Initing interface passed on the command line.\n");
- if (context_init_interface
- (&intiface, NULL, device, drivername, flags) != 0) {
+ if (context_init_interface(&intiface, NULL, device, drivername, flags) != 0) {
printf
("Couldn't initialize the interface passed on the command line! Terminating!\n");
return -1;
@@ -569,7 +566,7 @@
cert_handler_init();
// Init IPC
- if (xsup_ipc_init(clear_ipc) != 0) {
+ if (xsup_ipc_init() != 0) {
printf("Couldn't initalize daemon socket!\n");
global_deinit();
return -2;
@@ -621,10 +618,6 @@
"a", 0},
#endif
-#ifndef WINDOWS
- {PARAM_CLEAR_CTRL, "socket",
- "Remove existing control socket, if found", "s", 0},
-#endif
{PARAM_HELP, "help", "Display this help", "h", 0},
{PARAM_CONNECTION, "connection",
"Force the connection to use (not implemented yet)", "C", 1},
@@ -642,7 +635,6 @@
int numsupps = 0; // This is only being used by Windows right now.
#endif
FDEPTH flags = 0;
- uint8_t clear_ipc = FALSE;
#ifdef WINDOWS
crashdump_init("\\xsupcrashdmp-" BUILDNUM ".zip");
@@ -691,7 +683,7 @@
numsupps += retval;
if (retval >= 2) {
- printf("You already have a copy of Xsupplicant running!\n");
+ printf("You already have a copy of XSupplicant running!\n");
#ifdef BUILD_SERVICE
win_svc_error_dup();
#else
@@ -700,7 +692,7 @@
}
#else
if (supdetect_numinstances("xsupplicant") >= 2) {
- printf("You already have a copy of Xsupplicant running!\n");
+ printf("You already have a copy of XSupplicant running!\n");
return 255;
}
#endif
@@ -770,11 +762,6 @@
// SET_FLAG(flags, ONEDOWN);
break;
- case PARAM_CLEAR_CTRL:
- // Clear the IPC socket file, if it still exists.
- clear_ipc = TRUE;
- break;
-
case PARAM_HELP:
usage(argv[0], opts);
return -2;
@@ -818,7 +805,7 @@
}
#endif
- retval = xsup_driver_init(clear_ipc, device, drivername, flags);
+ retval = xsup_driver_init(device, drivername, flags);
if (retval < 0) {
#ifdef BUILD_SERVICE
win_svc_init_failed(retval);
Modified: trunk/xsupplicant/src/xsup_ipc.c
===================================================================
--- trunk/xsupplicant/src/xsup_ipc.c 2009-06-03 20:23:35 UTC (rev 686)
+++ trunk/xsupplicant/src/xsup_ipc.c 2009-06-11 05:16:21 UTC (rev 687)
@@ -137,7 +137,7 @@
* \retval XENONE on success
* \retval <0 on failure
**/
-int xsup_ipc_init(uint8_t clear)
+int xsup_ipc_init()
{
int sockErr = 0, ctrlSockErr = 0, ipc_gid = 0;
char *error = NULL;
@@ -165,14 +165,13 @@
Strncpy(sb.sun_path, sizeof(ctrlsocknamestr), ctrlsocknamestr,
sizeof(sb.sun_path));
- if (clear == TRUE) {
- // We need to clear the socket file if it exists.
+ // We need to clear the socket file if it exists.
+
+ debug_printf(DEBUG_INT, "Clearing control socket %s \t ctrlsocknamestr.\n",
+ socknamestr, ctrlsocknamestr);
+ remove(socknamestr);
+ remove(ctrlsocknamestr);
- debug_printf(DEBUG_INT, "Clearing control socket %s \t ctrlsocknamestr.\n",
- socknamestr, ctrlsocknamestr);
- remove(socknamestr);
- remove(ctrlsocknamestr);
- }
// Socket we will be using to communicate.
ipc_sock = socket(PF_UNIX, SOCK_STREAM, 0);
ipc_ctrl_sock = socket(PF_UNIX, SOCK_STREAM, 0);
Modified: trunk/xsupplicant/src/xsup_ipc.h
===================================================================
--- trunk/xsupplicant/src/xsup_ipc.h 2009-06-03 20:23:35 UTC (rev 686)
+++ trunk/xsupplicant/src/xsup_ipc.h 2009-06-11 05:16:21 UTC (rev 687)
@@ -44,7 +44,7 @@
#define CMD_VERSION "1.0"
-int xsup_ipc_init(uint8_t);
+int xsup_ipc_init();
int xsup_ipc_send_all(char *, int);
void xsup_ipc_send_eap_notify(char *);
void xsup_ipc_send_log(int, char *);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-06-03 20:23:53
|
Revision: 686
http://open1x.svn.sourceforge.net/open1x/?rev=686&view=rev
Author: chessing
Date: 2009-06-03 20:23:35 +0000 (Wed, 03 Jun 2009)
Log Message:
-----------
Fixed a bad assumption about the 'best' BSSID to use on Linux.
Modified Paths:
--------------
trunk/xsupplicant/src/config_ssid.c
trunk/xsupplicant-ui/xsupptray/ConnectionWizardData.cpp
Modified: trunk/xsupplicant/src/config_ssid.c
===================================================================
--- trunk/xsupplicant/src/config_ssid.c 2009-06-03 18:02:16 UTC (rev 685)
+++ trunk/xsupplicant/src/config_ssid.c 2009-06-03 20:23:35 UTC (rev 686)
@@ -1074,7 +1074,6 @@
if (!xsup_assert((wctx->cur_essid != NULL), "ssid_name != NULL", FALSE))
return NULL;
- config_ssid_dump(wctx);
// Start at the top of the list.
cur = wctx->ssid_cache;
@@ -1085,8 +1084,7 @@
}
if ((cur->ssid_name == NULL)
- || ((strcmp(wctx->cur_essid, cur->ssid_name) == 0) && (freq == cur->freq))
- || (freq != cur->freq)) {
+ || ((strcmp(wctx->cur_essid, cur->ssid_name) == 0) && (freq == cur->freq)) ) {
break;
} else {
cur = cur->next;
Modified: trunk/xsupplicant-ui/xsupptray/ConnectionWizardData.cpp
===================================================================
--- trunk/xsupplicant-ui/xsupptray/ConnectionWizardData.cpp 2009-06-03 18:02:16 UTC (rev 685)
+++ trunk/xsupplicant-ui/xsupptray/ConnectionWizardData.cpp 2009-06-03 20:23:35 UTC (rev 686)
@@ -503,7 +503,11 @@
else
{
mytls->user_cert = _strdup(m_userCert.toAscii());
+#ifdef WINDOWS
mytls->store_type = _strdup("WINDOWS");
+#else
+ mytls->store_type = _strdup("LINUX");
+#endif
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
