The attached patch replaces the last one and has another additional fix.
I'm getting a bit further - the connect procedure starts, but now I seem to be
failing during authentication. I'm not entirely sure I understand what is
supposed to be happening at this point, so any debugging suggestions would be
greatly appreciated. Inaky, it might help if you could send me an example of
what a successful connection is supposed to look like in wimaxd.log.
The relevant lines in wimaxd.log are:
23:02:04: 576399120 @Notice @NDNS_Agent @Executing the current
scheduled task: <Auto Connect> [L4C_HandleReadyState]
@NDnSAgent.c (1211) @wimaxd
23:02:04: 576399120 @Notice @NDNS_Agent @L4db_SetSwRfState - no need to
change - the rf state (1) was not changed [L4db_SetSwRfState]
@NDnSAgent_DB.c (3959) @wimaxd
23:02:04: 576399120 @Notice @NDNS_Agent @L4db_SetSwRfState - no need to
change - the rf state (1) was not changed [L4db_SetSwRfState]
@NDnSAgent_DB.c (3959) @wimaxd
23:02:04: 576399120 @Notice @NDNS_Agent @Executing secheduled
AutoConnect. forceManualConnect=1 [L4C_HandleReadyState]
@NDnSAgent.c (1290)
@wimaxd
23:02:04: 576399120 @Notice @NDNS_Agent @Trying to connect - NSP ID =
2, forcing manual connect = True [NDnSAgent_StartConnect]
@NDnSAgent.c (3654) @wimaxd
23:02:04: 576399120 @Notice @NDNS_Agent @Trying to connect to NAP ID
[00][00][02] (000002) [NDnSAgent_StartConnect]
@NDnSAgent.c (3781) @wimaxd
23:02:04: 576399120 @Notice @NDNS_Agent @L4C_SetControllerModeEx(OUT):
status=0 [L4C_SetControllerModeEx]
@NDnSAgent.c (1527) @wimaxd
23:02:04: 576399120 @Notice @supplicant_ag...@supplicantagent_initialize
Succeeded. Target ID=4 [DelayLoadSupplicant]
@SupplicantAgent.c(2304)
@wimaxd
23:02:04: 576399120 @Notice @supplicant_ag...@supplicant: Assign
configuration - Identity = {sm=1}[[email protected]
[Sup_PrintTrace]
@SupplicantAgent.c(1935) @wimaxd
23:02:04: 576399120 @Notice @supplicant_ag...@supplicant: Assign
configuration - Client cert = /usr/local/share/wimax/supplicant_cert.pem
[Sup_PrintTrace]
@SupplicantAgent.c(1935) @wimaxd
23:02:04: 576399120 @Notice @supplicant_ag...@supplicant: Assign
configuration - Private key = /usr/local/share/wimax/supplicant_key.pem
[Sup_PrintTrace]
@SupplicantAgent.c(1935) @wimaxd
23:02:04: 576399120 @Notice @ACT @Act_MessagesHandler(IN).
pdwResponseMessageID=576396680 [Act_MessagesHandler]
@Act.c (518) @wimaxd
23:02:04: 576399120 @Notice @ACT @Act_MessagesHandler(IN).
dwSentMessageID=6 [Act_MessagesHandler]
@Act.c (524) @wimaxd
23:02:04: 576399120 @Notice @ACT @Got
L4_PROXY_OPCODE_L4_INDICATION_ARRIVED message [Act_MessagesHandler]
@Act.c
(540) @wimaxd
23:02:04: 576399120 @Notice @ACT @Got system state report.
system state=6 , isL5DispatcherOpen=1 [Act_MessagesHandler]
@Act.c (559) @wimaxd
23:02:04: 576399120 @Notice @SERVICE @Sending from sourceid: 6, to
targetid: 1 [l5_common_utils_ActuallySendMessage]
@L5CommonUtils.c (225) @wimaxd
23:02:04: 576399120 @Notice @NDNS_Agent @NDnSAgent_SystemStateUpdate:
SystemState=Connecting, ConnectState=NotApplicable, swRf=1, hwRf=1
[NDnSAgent_SystemStateUpdate] @NDnSAgent_CBs.c (216)
@wimaxd
23:02:04: 576399120 @Notice @NDNS_Agent @L4C_SetControllerModeEx(IN):
systemStateUpdate=Connecting, swRfStatus=1, hwRfStatus=1
[L4C_SetControllerModeEx] @NDnSAgent.c
(1356) @wimaxd
23:02:04: 576399120 @Notice @NDNS_Agent @L4C_SetControllerModeEx.
systemState=7 [L4C_SetControllerModeEx]
@NDnSAgent.c (1392) @wimaxd
23:02:04: 576399120 @Notice @NDNS_Agent @L4C_SetControllerModeEx(OUT):
status=0 [L4C_SetControllerModeEx]
@NDnSAgent.c (1527) @wimaxd
23:02:05: 576399120 @Notice @ACT @Act_MessagesHandler(IN).
pdwResponseMessageID=576396680 [Act_MessagesHandler]
@Act.c (518) @wimaxd
23:02:05: 576399120 @Notice @ACT @Act_MessagesHandler(IN).
dwSentMessageID=6 [Act_MessagesHandler]
@Act.c (524) @wimaxd
23:02:05: 576399120 @Notice @ACT @Got
L4_PROXY_OPCODE_L4_INDICATION_ARRIVED message [Act_MessagesHandler]
@Act.c
(540) @wimaxd
23:02:05: 576399120 @Notice @ACT @Got system state report.
system state=6 , isL5DispatcherOpen=1 [Act_MessagesHandler]
@Act.c (559) @wimaxd
23:02:05: 576399120 @Notice @SERVICE @Sending from sourceid: 6, to
targetid: 1 [l5_common_utils_ActuallySendMessage]
@L5CommonUtils.c (225) @wimaxd
23:02:05: 576399120 @Notice @NDNS_Agent @NDnSAgent_SystemStateUpdate:
SystemState=Connecting, ConnectState=Ranging, swRf=1, hwRf=1
[NDnSAgent_SystemStateUpdate] @NDnSAgent_CBs.c
(216) @wimaxd
23:02:05: 576399120 @Notice @NDNS_Agent @L4C_SetControllerModeEx(IN):
systemStateUpdate=Connecting, swRfStatus=1, hwRfStatus=1
[L4C_SetControllerModeEx] @NDnSAgent.c
(1356) @wimaxd
23:02:05: 576399120 @Notice @NDNS_Agent @L4C_SetControllerModeEx.
systemState=7 [L4C_SetControllerModeEx]
@NDnSAgent.c (1392) @wimaxd
23:02:05: 576399120 @Notice @NDNS_Agent @L4C_SetControllerModeEx(OUT):
status=0 [L4C_SetControllerModeEx]
@NDnSAgent.c (1527) @wimaxd
23:02:05: 576399120 @Notice @ACT @Act_MessagesHandler(IN).
pdwResponseMessageID=576396680 [Act_MessagesHandler]
@Act.c (518) @wimaxd
23:02:05: 576399120 @Notice @ACT @Act_MessagesHandler(IN).
dwSentMessageID=6 [Act_MessagesHandler]
@Act.c (524) @wimaxd
23:02:05: 576399120 @Notice @ACT @Got
L4_PROXY_OPCODE_L4_INDICATION_ARRIVED message [Act_MessagesHandler]
@Act.c
(540) @wimaxd
23:02:05: 576399120 @Notice @ACT @Got system state report.
system state=6 , isL5DispatcherOpen=1 [Act_MessagesHandler]
@Act.c (559) @wimaxd
23:02:05: 576399120 @Notice @SERVICE @Sending from sourceid: 6, to
targetid: 1 [l5_common_utils_ActuallySendMessage]
@L5CommonUtils.c (225) @wimaxd
23:02:05: 576399120 @Notice @NDNS_Agent @NDnSAgent_SystemStateUpdate:
SystemState=Connecting, ConnectState=SBC, swRf=1, hwRf=1
[NDnSAgent_SystemStateUpdate]
@NDnSAgent_CBs.c (216) @wimaxd
23:02:05: 576399120 @Notice @NDNS_Agent @L4C_SetControllerModeEx(IN):
systemStateUpdate=Connecting, swRfStatus=1, hwRfStatus=1
[L4C_SetControllerModeEx] @NDnSAgent.c
(1356) @wimaxd
23:02:05: 576399120 @Notice @NDNS_Agent @L4C_SetControllerModeEx.
systemState=7 [L4C_SetControllerModeEx]
@NDnSAgent.c (1392) @wimaxd
23:02:05: 576399120 @Notice @NDNS_Agent @DeviceStatus update:
DeviceStatus=Connecting ConnectionProgress=SBC [L4Pub_SendDeviceStatusUpdate]
@NDnS_L4Publisher.c(234)
@wimaxd
23:02:05: 576399120 @Notice @NDNS_Agent @L4C_SetControllerModeEx(OUT):
status=0 [L4C_SetControllerModeEx]
@NDnSAgent.c (1527) @wimaxd
23:02:05: 576399120 @Notice @SERVICE @Sending from sourceid: 5, to
targetid: 1 [l5_common_utils_ActuallySendMessage]
@L5CommonUtils.c (225) @wimaxd
23:02:05: 576399120 @Notice @NDNS_Wrapper @wmxNds_SIIReportArrived
[wmxNds_SIIReportArrived]
@wmxSDK_Nds_IndHandler.c(677)
@wimaxd
23:02:05: 576399120 @Notice @ACT @Act_MessagesHandler(IN).
pdwResponseMessageID=576396680 [Act_MessagesHandler]
@Act.c (518) @wimaxd
23:02:05: 576399120 @Notice @ACT @Act_MessagesHandler(IN).
dwSentMessageID=6 [Act_MessagesHandler]
@Act.c (524) @wimaxd
23:02:05: 576399120 @Notice @ACT @Got
L4_PROXY_OPCODE_L4_INDICATION_ARRIVED message [Act_MessagesHandler]
@Act.c
(540) @wimaxd
23:02:05: 576399120 @Notice @ACT @Got system state report.
system state=6 , isL5DispatcherOpen=1 [Act_MessagesHandler]
@Act.c (559) @wimaxd
23:02:05: 576399120 @Notice @SERVICE @Sending from sourceid: 6, to
targetid: 1 [l5_common_utils_ActuallySendMessage]
@L5CommonUtils.c (225) @wimaxd
23:02:05: 576399120 @Notice @NDNS_Agent @NDnSAgent_SystemStateUpdate:
SystemState=Connecting, ConnectState=EAPAuthentication, swRf=1, hwRf=1
[NDnSAgent_SystemStateUpdate] @NDnSAgent_CBs.c (216)
@wimaxd
23:02:05: 576399120 @Notice @NDNS_Agent @L4C_SetControllerModeEx(IN):
systemStateUpdate=Connecting, swRfStatus=1, hwRfStatus=1
[L4C_SetControllerModeEx] @NDnSAgent.c
(1356) @wimaxd
23:02:05: 576399120 @Notice @NDNS_Agent @L4C_SetControllerModeEx.
systemState=7 [L4C_SetControllerModeEx]
@NDnSAgent.c (1392) @wimaxd
23:02:05: 576399120 @Notice @NDNS_Agent @DeviceStatus update:
DeviceStatus=Connecting ConnectionProgress=EAP_authentication_Device
[L4Pub_SendDeviceStatusUpdate]
@NDnS_L4Publisher.c(234) @wimaxd
23:02:05: 576399120 @Notice @NDNS_Agent @L4C_SetControllerModeEx(OUT):
status=0 [L4C_SetControllerModeEx]
@NDnSAgent.c (1527) @wimaxd
23:02:05: 576399120 @Notice @SERVICE @Sending from sourceid: 5, to
targetid: 1 [l5_common_utils_ActuallySendMessage]
@L5CommonUtils.c (225) @wimaxd
23:02:05: 576399120 @Error @supplicant_wrap...@suppwrapper: sending down
op. 3, ctx 1, conn 0, p1 0, p2 0 [SendTLSRequest]
@wmxSDK_Sup_Impl.c(1123)
@wimaxd
23:02:05: 576399120 @Error @supplicant_wrap...@suppwrapper: received op.
3, ctx 1, conn 2E35C8, p1 0, p2 0 [SendTLSRequest]
@wmxSDK_Sup_Impl.c(1155)
@wimaxd
23:02:05: 576399120 @Error @supplicant_wrap...@suppwrapper: Connection
init => 2E35C8 [tls_connection_init]
@wmxSDK_Sup_Impl.c(1178)
@wimaxd
23:02:05: 576399120 @Error @supplicant_wrap...@suppwrapper: sending down
op. 6, ctx 1, conn 2E35C8, p1 0, p2 0 [SendTLSRequest]
@wmxSDK_Sup_Impl.c(1123)
@wimaxd
23:02:05: 576399120 @Error @supplicant_wrap...@suppwrapper: received op.
6, ctx 1, conn 2E35C8, p1 0, p2 0 [SendTLSRequest]
@wmxSDK_Sup_Impl.c(1155)
@wimaxd
23:02:05: 576399120 @Error @supplicant_wrap...@suppwrapper: sending down
op. 11, ctx 1, conn 2E35C8, p1 0, p2 0 [SendTLSRequest]
@wmxSDK_Sup_Impl.c(1123)
@wimaxd
23:02:05: 576399120 @Error @supplicant_wrap...@suppwrapper: received op.
11, ctx 1, conn 2E35C8, p1 0, p2 0 [SendTLSRequest]
@wmxSDK_Sup_Impl.c(1155)
@wimaxd
23:02:05: 576399120 @Error @supplicant_wrap...@suppwrapper: sending down
op. 12, ctx 1, conn 2E35C8, p1 0, p2 0 [SendTLSRequest]
@wmxSDK_Sup_Impl.c(1123)
@wimaxd
23:02:05: 576399120 @Error @supplicant_wrap...@suppwrapper: received op.
12, ctx 1, conn 2E35C8, p1 0, p2 0 [SendTLSRequest]
@wmxSDK_Sup_Impl.c(1155)
@wimaxd
23:02:24: 576399120 @Notice @NDNS_Agent @L4C_HandleRobustConnect (IN)
[L4C_HandleRobustConnect]
@NDnSAgent.c (963) @wimaxd
23:02:24: 576399120 @Notice @NDNS_Agent @L4C_HandleRobustConnect (OUT)
[L4C_HandleRobustConnect]
@NDnSAgent.c (1036) @wimaxd
23:02:24: 576399120 @Notice @supplicant_ag...@supplicant: Assign
configuration - Identity = {sm=1}[[email protected]
[Sup_PrintTrace]
@SupplicantAgent.c(1935) @wimaxd
23:02:24: 576399120 @Notice @supplicant_ag...@supplicant: Assign
configuration - Client cert = /usr/local/share/wimax/supplicant_cert.pem
[Sup_PrintTrace]
@SupplicantAgent.c(1935) @wimaxd
23:02:24: 576399120 @Notice @supplicant_ag...@supplicant: Assign
configuration - Private key = /usr/local/share/wimax/supplicant_key.pem
[Sup_PrintTrace]
@SupplicantAgent.c(1935) @wimaxd
23:02:24: 576399120 @Notice @ACT @Act_MessagesHandler(IN).
pdwResponseMessageID=576396680 [Act_MessagesHandler]
@Act.c (518) @wimaxd
23:02:24: 576399120 @Notice @ACT @Act_MessagesHandler(IN).
dwSentMessageID=6 [Act_MessagesHandler]
@Act.c (524) @wimaxd
23:02:24: 576399120 @Notice @ACT @Got
L4_PROXY_OPCODE_L4_INDICATION_ARRIVED message [Act_MessagesHandler]
@Act.c
(540) @wimaxd
23:02:24: 576399120 @Notice @ACT @Got system state report.
system state=3 , isL5DispatcherOpen=1 [Act_MessagesHandler]
@Act.c (559) @wimaxd
23:02:24: 576399120 @Notice @SERVICE @Sending from sourceid: 6, to
targetid: 1 [l5_common_utils_ActuallySendMessage]
@L5CommonUtils.c (225) @wimaxd
23:02:24: 576399120 @Notice @NDNS_Agent @NDnSAgent_SystemStateUpdate:
SystemState=Ready, ConnectState=NotApplicable, swRf=1, hwRf=1
[NDnSAgent_SystemStateUpdate] @NDnSAgent_CBs.c
(216) @wimaxd
23:02:24: 576399120 @Notice @NDNS_Agent @L4C_SetControllerModeEx(IN):
systemStateUpdate=Ready, swRfStatus=1, hwRfStatus=1 [L4C_SetControllerModeEx]
@NDnSAgent.c (1356) @wimaxd
23:02:24: 576399120 @Notice @NDNS_Agent @L4C_SetControllerModeEx.
systemState=5 [L4C_SetControllerModeEx]
@NDnSAgent.c (1392) @wimaxd
23:02:24: 576399120 @Notice @NDNS_Agent @Executing the current
scheduled task: <Start Scan> [L4C_HandleReadyState]
@NDnSAgent.c (1211) @wimaxd
diff -Naur wimax-1.5.1.orig//InfraStack/OSAgnostic/Common/L4Common/SourceControl/BitmanCommon.h wimax-1.5.1/InfraStack/OSAgnostic/Common/L4Common/SourceControl/BitmanCommon.h
--- wimax-1.5.1.orig//InfraStack/OSAgnostic/Common/L4Common/SourceControl/BitmanCommon.h 2010-10-03 22:51:00.000000000 -0400
+++ wimax-1.5.1/InfraStack/OSAgnostic/Common/L4Common/SourceControl/BitmanCommon.h 2010-10-03 22:51:09.000000000 -0400
@@ -67,6 +67,10 @@
#define MASK_1 (0xFFFFFFFFFFFFFFFF)
#define MASK_2 (0xFFFFFFFFFFFFFFFE)
#define MASK_4 (0xFFFFFFFFFFFFFFFC)
+#elif __x86_64__
+#define MASK_1 (0xFFFFFFFFFFFFFFFF)
+#define MASK_2 (0xFFFFFFFFFFFFFFFE)
+#define MASK_4 (0xFFFFFFFFFFFFFFFC)
#else
#define MASK_1 (0xFFFFFFFF)
#define MASK_2 (0xFFFFFFFE)
diff -Naur wimax-1.5.1.orig//InfraStack/OSAgnostic/Common/L4Common/SourceControl/CommonTypes.h wimax-1.5.1/InfraStack/OSAgnostic/Common/L4Common/SourceControl/CommonTypes.h
--- wimax-1.5.1.orig//InfraStack/OSAgnostic/Common/L4Common/SourceControl/CommonTypes.h 2010-10-03 22:51:00.000000000 -0400
+++ wimax-1.5.1/InfraStack/OSAgnostic/Common/L4Common/SourceControl/CommonTypes.h 2010-10-03 22:51:09.000000000 -0400
@@ -91,6 +91,8 @@
/// when you need to hold both a pointer and a number
#ifdef WIN64
typedef UINT64 POINTER_AND_UINT;
+#elif __x86_64__
+typedef UINT64 POINTER_AND_UINT;
#else
typedef UINT POINTER_AND_UINT;
#endif
diff -Naur wimax-1.5.1.orig//InfraStack/OSAgnostic/Common/L5Common/L5CommonUtils.c wimax-1.5.1/InfraStack/OSAgnostic/Common/L5Common/L5CommonUtils.c
--- wimax-1.5.1.orig//InfraStack/OSAgnostic/Common/L5Common/L5CommonUtils.c 2010-10-03 22:51:00.000000000 -0400
+++ wimax-1.5.1/InfraStack/OSAgnostic/Common/L5Common/L5CommonUtils.c 2010-10-03 22:51:09.000000000 -0400
@@ -182,7 +182,7 @@
result = l5_common_utils_ActuallySendMessage( Socket, pMessage );
- TRACE(TR_MOD_SERVICE, TR_SEV_NOTICE, "Result of ActuallySendMessage is %d %d", result);
+ TRACE(TR_MOD_SERVICE, TR_SEV_NOTICE, "Result of ActuallySendMessage is %d", result);
return result;
}
diff -Naur wimax-1.5.1.orig//InfraStack/OSAgnostic/Product/AppSrvInfra/L5SocketsDispatcher.c wimax-1.5.1/InfraStack/OSAgnostic/Product/AppSrvInfra/L5SocketsDispatcher.c
--- wimax-1.5.1.orig//InfraStack/OSAgnostic/Product/AppSrvInfra/L5SocketsDispatcher.c 2010-10-03 22:51:00.000000000 -0400
+++ wimax-1.5.1/InfraStack/OSAgnostic/Product/AppSrvInfra/L5SocketsDispatcher.c 2010-10-03 22:53:14.000000000 -0400
@@ -61,7 +61,8 @@
L5_CONNECTION L5Conn; // Can be NULL before handshake
// Is this an active slot?
- BOOL bActive;
+ // Updated using OSAL_atomic_exchange(), so this must be a LONG not a BOOL
+ LONG bActive;
// Connections from both sides
SOCKETS_CLIENT_ID Socket;
@@ -702,7 +703,7 @@
// XXX SEH error handling
OSAL_init_critical_section( &(pConn->csSendReceive) );
OSAL_init_critical_section( &(pConn->csHandlingRequest) );
- OSAL_atomic_exchange( (LPLONG)&(pConn->bActive), TRUE );
+ OSAL_atomic_exchange( &(pConn->bActive), TRUE );
*context = pConn;
@@ -1034,7 +1035,7 @@
L5_DISPATCHER_Disconnect( pConn->L5Conn );
}
- OSAL_atomic_exchange( (LPLONG)&(pConn->bActive), FALSE );
+ OSAL_atomic_exchange( &(pConn->bActive), FALSE );
OSAL_exit_critical_section( &(pConn->csHandlingRequest) );
OSAL_delete_critical_section(&pConn->csSendReceive);
diff -Naur wimax-1.5.1.orig//InfraStack/OSAgnostic/WiMax/Agents/NDnS/Source/NDnSAgent_Internals.h wimax-1.5.1/InfraStack/OSAgnostic/WiMax/Agents/NDnS/Source/NDnSAgent_Internals.h
--- wimax-1.5.1.orig//InfraStack/OSAgnostic/WiMax/Agents/NDnS/Source/NDnSAgent_Internals.h 2010-10-03 22:51:00.000000000 -0400
+++ wimax-1.5.1/InfraStack/OSAgnostic/WiMax/Agents/NDnS/Source/NDnSAgent_Internals.h 2010-10-03 22:52:59.000000000 -0400
@@ -200,8 +200,8 @@
wmx_ConnectStatus_t connectStatus;
int DummyForCompilerHappy3;
TinyFSM_t fsm;
- L4C_Task scheduledTask;
- wmx_ScheduledTaskData_t scheduledTaskData;
+ LONG scheduledTask; // Updated using OSAL_atomic_exchange(), so this must be a LONG not an L4C_Task
+ wmx_ScheduledTaskData_t scheduledTaskData;
wmx_Status_t scanStatus;
wmx_LinkLossType_t linkLossType;
wmx_ScanType_t currentScanType;
diff -Naur wimax-1.5.1.orig//InfraStack/OSDependent/Linux/OSAL/Primitives/wimax_osal_basictypes.h wimax-1.5.1/InfraStack/OSDependent/Linux/OSAL/Primitives/wimax_osal_basictypes.h
--- wimax-1.5.1.orig//InfraStack/OSDependent/Linux/OSAL/Primitives/wimax_osal_basictypes.h 2010-10-03 22:51:00.000000000 -0400
+++ wimax-1.5.1/InfraStack/OSDependent/Linux/OSAL/Primitives/wimax_osal_basictypes.h 2010-10-03 22:51:09.000000000 -0400
@@ -39,6 +39,7 @@
#include <string.h>
#include <ctype.h>
#include <sys/stat.h>
+#include <pthread.h>
#if 0
#include <sys/socket.h>
@@ -90,7 +91,7 @@
typedef int pid_t;
-typedef int OSAL_thread_t;
+typedef pthread_t OSAL_thread_t;
typedef void * OSAL_event_t;
_______________________________________________
wimax mailing list
[email protected]
http://lists.linuxwimax.org/listinfo/wimax
