moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

Added timeout support for the non-windows version.

Browse Source
This commit is contained in:
Daniel Stenberg 2002-10-08 13:03:26 +00:00
parent e157aabd4d
commit 512db1bc54
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/telnet.c
View File

@ -1050,6 +1050,7 @@ CURLcode Curl_telnet(struct connectdata *conn)
char *buf = data->state.buffer; char *buf = data->state.buffer;
ssize_t nread; ssize_t nread;
struct TELNET *tn; struct TELNET *tn;
struct timeval now; /* current time */
code = init_telnet(conn); code = init_telnet(conn);
if(code) if(code)
@ -1149,9 +1150,13 @@ CURLcode Curl_telnet(struct connectdata *conn)
keepfd = readfd; keepfd = readfd;
while (keepon) { while (keepon) {
readfd = keepfd; /* set this every lap in the loop */ struct timeval interval;
switch (select (sockfd + 1, &readfd, NULL, NULL, NULL)) { readfd = keepfd; /* set this every lap in the loop */
interval.tv_sec = 1;
interval.tv_usec = 0;
switch (select (sockfd + 1, &readfd, NULL, NULL, &interval)) {
case -1: /* error, stop reading */ case -1: /* error, stop reading */
keepon = FALSE; keepon = FALSE;
continue; continue;
@ -1199,10 +1204,20 @@ CURLcode Curl_telnet(struct connectdata *conn)
} }
} }
} }
if(data->set.timeout) {
now = Curl_tvnow();
if(Curl_tvdiff(now, conn->created)/1000 >= data->set.timeout) {
failf(data, "Time-out");
code = CURLE_OPERATION_TIMEOUTED;
keepon = FALSE;
}
}
} }
#endif #endif
/* mark this as "no further transfer wanted" */ /* mark this as "no further transfer wanted" */
return Curl_Transfer(conn, -1, -1, FALSE, NULL, -1, NULL); Curl_Transfer(conn, -1, -1, FALSE, NULL, -1, NULL);
return code;
} }
/* /*