--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp Tue May 25 14:22:18 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp Wed Jun 09 11:23:04 2010 +0300
@@ -155,12 +155,9 @@
{
iAgent->CancelReconnect();
}
- // Issue disconnect only if agent is not already disconneting state
- else if (iAgentState != EDisconnecting)
- {
- iAgentState = EDisconnecting;
- iAgent->Disconnect(aReason);
- }
+
+ iAgentState = EDisconnecting;
+ iAgent->Disconnect(aReason);
}
@@ -310,9 +307,7 @@
}
else
{
- iLastProgress.iError = aStatus;
- // Set the agent state to EDisconnecting
- iAgentState = EDisconnecting;
+ iLastProgress.iError = aStatus;
iAgent->Disconnect(aStatus);
}
}
--- a/tcpiputils/dhcp/src/DHCPStateMachine.cpp Tue May 25 14:22:18 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPStateMachine.cpp Wed Jun 09 11:23:04 2010 +0300
@@ -420,10 +420,29 @@
// how could we attempt to handle it anyway?...keep trying??? i think not...
// ensure that we have a socket to write down
iSocket.Close();
- (void)iSocket.Open(iEsock, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection);
- (void)iSocket.SetOpt(KSoInetConfigInterface, KSolInetIfCtrl, configInfo);
- // make socket invisible for interface counting
- (void)iSocket.SetOpt(KSoKeepInterfaceUp, KSolInetIp, 0);
+ TInt error = iSocket.Open(iEsock, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection);
+
+ if(error == KErrNone)
+ {
+ error = iSocket.SetOpt(KSoInetConfigInterface, KSolInetIfCtrl, configInfo);
+ if(error == KErrNone)
+ {
+ // make socket invisible for interface counting
+ error = iSocket.SetOpt(KSoKeepInterfaceUp, KSolInetIp, 0);
+ if(error != KErrNone)
+ {
+ __CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L("CDHCPStateMachine::RemoveConfiguredAddress, SetOpt Failed to set KSolInetIp")));
+ }
+ }
+ else
+ {
+ __CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L("CDHCPStateMachine::RemoveConfiguredAddress,SetOpt Failed to set KsolInetIfCtrl")));
+ }
+ }
+ else
+ {
+ __CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L("CDHCPStateMachine::RemoveConfiguredAddress,Socket Open Failed: Due to KErrNotReady ")));
+ }
}
void CDHCPStateMachine::ConfigureInterfaceL( const TSoInet6InterfaceInfo& aInterfaceInfo )
--- a/tcpiputils/networkaddressandporttranslation/TE_Napt/configs/Te_NaptConnection_target.xml Tue May 25 14:22:18 2010 +0300
+++ b/tcpiputils/networkaddressandporttranslation/TE_Napt/configs/Te_NaptConnection_target.xml Wed Jun 09 11:23:04 2010 +0300
@@ -822,7 +822,7 @@
<IfNetworks>ip</IfNetworks>
<IpNetMask>255.255.255.0</IpNetMask>
<IpGateway>10.32.194.254</IpGateway>
- <IpAddr>10.225.164.209</IpAddr>
+ <IpAddr>10.225.171.70</IpAddr>
<IpAddrFromServer>TRUE</IpAddrFromServer>
<IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
<IpNameServer1>194.72.6.51</IpNameServer1>
--- a/tcpiputils/networkaddressandporttranslation/TE_Napt/configs/Te_NaptConnection_winscw.xml Tue May 25 14:22:18 2010 +0300
+++ b/tcpiputils/networkaddressandporttranslation/TE_Napt/configs/Te_NaptConnection_winscw.xml Wed Jun 09 11:23:04 2010 +0300
@@ -822,7 +822,7 @@
<IfNetworks>ip</IfNetworks>
<IpNetMask>255.255.255.0</IpNetMask>
<IpGateway>10.32.194.254</IpGateway>
- <IpAddr>10.253.27.249</IpAddr>
+ <IpAddr>10.225.171.70</IpAddr>
<IpAddrFromServer>TRUE</IpAddrFromServer>
<IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
<IpNameServer1>194.72.6.51</IpNameServer1>
--- a/tcpiputils/networkaddressandporttranslation/TE_Napt/configs/te_naptconfig_target.ini Tue May 25 14:22:18 2010 +0300
+++ b/tcpiputils/networkaddressandporttranslation/TE_Napt/configs/te_naptconfig_target.ini Wed Jun 09 11:23:04 2010 +0300
@@ -4,7 +4,7 @@
[General]
NaptStatus=On
-NaptTestServer=10.225.164.210
+NaptTestServer=10.225.171.71
NaptTestServerPort=48555
EthIPAddr=10.192.192.79
EchoPort = 7
--- a/tcpiputils/networkaddressandporttranslation/TE_Napt/configs/te_naptconfig_winscw.ini Tue May 25 14:22:18 2010 +0300
+++ b/tcpiputils/networkaddressandporttranslation/TE_Napt/configs/te_naptconfig_winscw.ini Wed Jun 09 11:23:04 2010 +0300
@@ -4,7 +4,7 @@
[General]
NaptStatus=On
-NaptTestServer=10.253.27.250
+NaptTestServer=10.225.171.71
NaptTestServerPort=48555
EthIPAddr=10.192.192.79
EchoPort = 7