Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 334361. Failure to honor network changes. wince only r=darin

Browse Source
This commit is contained in:
dougt%meer.net 2006-04-17 22:59:10 +00:00
parent fc81710a28
commit cfef30d5a1
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
netwerk/base/src/nsAutodialWin.cpp
View File

@ -276,21 +276,7 @@ static nsresult DoPPCConnection()
{
static HANDLE gConnectionHandle = NULL;
DWORD status;
if (gConnectionHandle)
{
ConnMgrConnectionStatus(gConnectionHandle, &status);
if (status == CONNMGR_STATUS_CONNECTED)
return NS_OK;
// Release it immediately since we currently only do
// sync connections. the assumption here is that
// ConnMgrEstablishConnectionSync has to either return
// a failure or a connected connection.
ConnMgrReleaseConnection(gConnectionHandle, 0);
}
// Make the connection to the new network
CONNMGR_CONNECTIONINFO conn_info;
memset(&conn_info, 0, sizeof(CONNMGR_CONNECTIONINFO));
@ -301,12 +287,32 @@ static nsresult DoPPCConnection()
conn_info.bExclusive = FALSE;
conn_info.bDisabled = FALSE;
if(ConnMgrEstablishConnectionSync(&conn_info, &gConnectionHandle, 25000, &status) != S_OK)
HANDLE tempConnectionHandle;
DWORD status;
HRESULT result = ConnMgrEstablishConnectionSync(&conn_info,
&tempConnectionHandle,
60000,
&status);
if (result != S_OK)
{
return NS_ERROR_FAILURE;
}
if (status != CONNMGR_STATUS_CONNECTED)
{
// could not connect to this network. release the
// temp connection.
ConnMgrReleaseConnection(tempConnectionHandle, 0);
return NS_ERROR_FAILURE;
}
// At this point, we have a new connection, so release
// the old connection
if (gConnectionHandle)
ConnMgrReleaseConnection(gConnectionHandle, 0);
gConnectionHandle = tempConnectionHandle;
return NS_OK;
}

4
netwerk/base/src/nsAutodialWin.h
View File

@ -61,8 +61,8 @@ typedef RASAUTODIALENTRYA RASAUTODIALENTRY, *LPRASAUTODIALENTRY;
#endif // WINVER
// Loading the RAS DLL dynamically.
typedef DWORD (WINAPI* tRASPHONEBOOKDLG)(LPTSTR,LPTSTR,LPRASPBDLG);
typedef DWORD (WINAPI* tRASDIALDLG)(LPTSTR,LPTSTR,LPTSTR,LPRASDIALDLG);
typedef DWORD (WINAPI* tRASPHONEBOOKDLG)(LPTSTR,LPTSTR,void*);
typedef DWORD (WINAPI* tRASDIALDLG)(LPTSTR,LPTSTR,LPTSTR,void*);
typedef DWORD (WINAPI* tRASENUMCONNECTIONS)(LPRASCONN,LPDWORD,LPDWORD);
typedef DWORD (WINAPI* tRASENUMENTRIES)(LPTSTR,LPTSTR,LPRASENTRYNAME,LPDWORD,LPDWORD);
typedef DWORD (WINAPI* tRASSETAUTODIALADDRESS)(LPCTSTR,DWORD,LPRASAUTODIALENTRY,DWORD,DWORD);