markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed waypoint autodownload feature

Browse source
This commit is contained in:
jeefo 2015-06-21 21:39:59 +03:00
commit f3331aea13
1 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

50
source/waypoint.cpp
View file

@ -2502,7 +2502,7 @@ void WaypointDownloader::FreeSocket (int sock)
WaypointDownloadError WaypointDownloader::DoDownload (void) WaypointDownloadError WaypointDownloader::DoDownload (void)
{ {
#if defined (PLATFORM_WIN32) #if defined (PLATFORM_WIN32)
WORD requestedVersion = MAKEWORD (1, 1); WORD requestedVersion = MAKEWORD (1, 3);
WSADATA wsaData; WSADATA wsaData;
WSAStartup (requestedVersion, &wsaData); WSAStartup (requestedVersion, &wsaData);
@ -2522,14 +2522,6 @@ WaypointDownloadError WaypointDownloader::DoDownload (void)
} }
sockaddr_in dest; sockaddr_in dest;
#if defined (PLATFORM_WIN32)
unsigned long mode = 0;
ioctlsocket (socketHandle, FIONBIO, &mode);
#else
int flags = fcntl (socketHandle, F_GETFL, 0) | O_NONBLOCK;
fcntl (socketHandle, F_SETFL, flags);
#endif
timeval timeout; timeval timeout;
timeout.tv_sec = 5; timeout.tv_sec = 5;
timeout.tv_usec = 0; timeout.tv_usec = 0;
@ -2557,25 +2549,26 @@ WaypointDownloadError WaypointDownloader::DoDownload (void)
return WDE_SOCKET_ERROR; return WDE_SOCKET_ERROR;
} }
File fp (g_waypoint->CheckSubfolderFile (), "wb"); const int ChunkSize = 1024;
char buffer[ChunkSize] = { 0, };
if (!fp.IsValid ())
{
FreeSocket (socketHandle);
return WDE_SOCKET_ERROR;
}
char buffer[1024];
bool finished = false; bool finished = false;
int recvPosition = 0; int recvPosition = 0;
int symbolsInLine = 0; int symbolsInLine = 0;
// scan for the end of the header // scan for the end of the header
while (!finished && recvPosition < sizeof (buffer)) while (!finished && recvPosition < ChunkSize)
{ {
if (recv (socketHandle, &buffer[recvPosition], 1, 0) == 0) if (recv (socketHandle, &buffer[recvPosition], 1, 0) == 0)
finished = true; finished = true;
// ugly, but whatever
if (buffer[recvPosition - 2] == '4' && buffer[recvPosition - 1] == '0' && buffer[recvPosition] == '4')
{
FreeSocket (socketHandle);
return WDE_NOTFOUND_ERROR;
}
switch (buffer[recvPosition]) switch (buffer[recvPosition])
{ {
case '\r': case '\r':
@ -2595,20 +2588,27 @@ WaypointDownloadError WaypointDownloader::DoDownload (void)
recvPosition++; recvPosition++;
} }
if (strstr (buffer, "HTTP/1.0 404") != NULL) File fp (g_waypoint->CheckSubfolderFile (), "wb");
if (!fp.IsValid ())
{ {
FreeSocket (socketHandle); FreeSocket (socketHandle);
return WDE_NOTFOUND_ERROR; return WDE_SOCKET_ERROR;
} }
memset (buffer, 0, sizeof (buffer));
int size = 0; int recvSize = 0;
while ((size = recv (socketHandle, buffer, sizeof (buffer) -1, 0)) > 0) do
fp.Write (buffer, size); {
recvSize = recv (socketHandle, buffer, ChunkSize, 0);
fp.Write (buffer, recvSize);
fp.Flush ();
} while (recvSize != 0);
fp.Close (); fp.Close ();
FreeSocket (socketHandle); FreeSocket (socketHandle);
return WDE_NOERROR; return WDE_NOERROR;
} }