The-Homebrew-Cloud/snes9xgx
2
0
Fork 0
mirror of https://github.com/dborth/snes9xgx.git synced 2024-11-30 14:34:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
dborth 2011-06-05 05:24:22 +00:00
parent 85119d4fcb
commit 13738fc3b0
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
source/utils/http.cpp
View File

@ -68,9 +68,8 @@ static s32 tcp_connect(char *host, const u16 port)
struct hostent *hp; struct hostent *hp;
struct sockaddr_in sa; struct sockaddr_in sa;
struct in_addr val; struct in_addr val;
fd_set myset;
struct timeval tv;
s32 s, res; s32 s, res;
u64 t1;
s = tcp_socket(); s = tcp_socket();
if (s < 0) if (s < 0)
@ -94,17 +93,20 @@ static s32 tcp_connect(char *host, const u16 port)
memcpy((char *) &sa.sin_addr, hp->h_addr_list[0], hp->h_length); memcpy((char *) &sa.sin_addr, hp->h_addr_list[0], hp->h_length);
} }
res = net_connect (s, (struct sockaddr *) &sa, sizeof (sa)); t1=ticks_to_secs(gettime());
do
if (res == EINPROGRESS)
{ {
tv.tv_sec = TCP_CONNECT_TIMEOUT; res = net_connect(s,(struct sockaddr*) &sa, sizeof (sa));
tv.tv_usec = 0; if(ticks_to_secs(gettime())-t1 > TCP_CONNECT_TIMEOUT*1000) break;
FD_ZERO(&myset); usleep(500);
FD_SET(s, &myset); }while(res != -EISCONN);
if (net_select(s+1, NULL, &myset, NULL, &tv) <= 0) if(res != -EISCONN)
return -1; {
net_close(s);
return -1;
} }
return s; return s;
} }
@ -122,13 +124,13 @@ static int tcp_readln(const s32 s, char *buf, const u16 max_length)
ret = net_read(s, &buf[c], 1); ret = net_read(s, &buf[c], 1);
if (ret == 0 || ret == -EAGAIN) if (ret == -EAGAIN)
{ {
usleep(20 * 1000); usleep(20 * 1000);
continue; continue;
} }
if (ret < 0) if (ret <= 0)
break; break;
if (c > 0 && buf[c - 1] == '\r' && buf[c] == '\n') if (c > 0 && buf[c - 1] == '\r' && buf[c] == '\n')
@ -138,16 +140,17 @@ static int tcp_readln(const s32 s, char *buf, const u16 max_length)
break; break;
} }
c++; c++;
start_time = gettime();
usleep(100); usleep(100);
} }
return res; return res;
} }
static int tcp_read(const s32 s, u8 *buffer, const u32 length) static u32 tcp_read(const s32 s, u8 *buffer, const u32 length)
{ {
char *p; char *p;
u32 left, block, received, step=0; u32 left, block, received, step=0;
s64 t; u64 t;
s32 res; s32 res;
p = (char *)buffer; p = (char *)buffer;
@ -169,17 +172,17 @@ static int tcp_read(const s32 s, u8 *buffer, const u32 length)
res = net_read(s, p, block); res = net_read(s, p, block);
if(res>0) if (res == -EAGAIN)
{ {
received += res; usleep(20 * 1000);
left -= res; continue;
p += res;
}
else if (res < 0 && res != -EAGAIN)
{
break;
} }
if(res<=0) break;
received += res;
left -= res;
p += res;
usleep(1000); usleep(1000);
if ((received / TCP_BLOCK_SIZE) > step) if ((received / TCP_BLOCK_SIZE) > step)
@ -191,7 +194,7 @@ static int tcp_read(const s32 s, u8 *buffer, const u32 length)
return received; return received;
} }
static int tcp_write(const s32 s, const u8 *buffer, const u32 length) static u32 tcp_write(const s32 s, const u8 *buffer, const u32 length)
{ {
const u8 *p; const u8 *p;
u32 left, block, sent, step=0; u32 left, block, sent, step=0;