generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added an active disconnected state, to make the code clearer.

Browse Source
This commit is contained in:
Daniel Stenberg 2005-05-07 13:52:07 +00:00
parent fd191deb49
commit ef5eea689a
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
tests/server/sockfilt.c
View File

@ -211,9 +211,10 @@ unsigned short port = DEFAULT_PORT;
unsigned short connectport = 0; /* if non-zero, we activate this mode */ unsigned short connectport = 0; /* if non-zero, we activate this mode */
enum sockmode { enum sockmode {
PASSIVE_LISTEN, /* as a server waiting for connections */ PASSIVE_LISTEN, /* as a server waiting for connections */
PASSIVE_CONNECT, /* as a server, connected to a client */ PASSIVE_CONNECT, /* as a server, connected to a client */
ACTIVE /* as a client, connected to a server */ ACTIVE, /* as a client, connected to a server */
ACTIVE_DISCONNECT /* as a client, disconnected from server */
}; };
/* /*
@ -281,6 +282,12 @@ static int juggle(curl_socket_t *sockfdp,
maxfd = 0; maxfd = 0;
} }
break; break;
case ACTIVE_DISCONNECT:
logmsg("disconnected, no socket to read on");
maxfd = 0;
sockfd = CURL_SOCKET_BAD;
break;
} }
do { do {
@ -335,7 +342,7 @@ static int juggle(curl_socket_t *sockfdp,
else if(!memcmp("QUIT", buffer, 4)) { else if(!memcmp("QUIT", buffer, 4)) {
/* just die */ /* just die */
logmsg("quits"); logmsg("quits");
exit(0); return FALSE;
} }
else if(!memcmp("DATA", buffer, 4)) { else if(!memcmp("DATA", buffer, 4)) {
/* data IN => data OUT */ /* data IN => data OUT */
@ -366,6 +373,10 @@ static int juggle(curl_socket_t *sockfdp,
logmsg("====> Client forcibly disconnected"); logmsg("====> Client forcibly disconnected");
sclose(sockfd); sclose(sockfd);
*sockfdp = CURL_SOCKET_BAD; *sockfdp = CURL_SOCKET_BAD;
if(*mode == PASSIVE_CONNECT)
*mode = PASSIVE_LISTEN;
else
*mode = ACTIVE_DISCONNECT;
} }
else else
logmsg("attempt to close already dead connection"); logmsg("attempt to close already dead connection");
@ -374,7 +385,7 @@ static int juggle(curl_socket_t *sockfdp,
} }
else { else {
logmsg("read %d from stdin, exiting", (int)nread); logmsg("read %d from stdin, exiting", (int)nread);
exit(0); return FALSE;
} }
} }
@ -405,6 +416,8 @@ static int juggle(curl_socket_t *sockfdp,
*sockfdp = CURL_SOCKET_BAD; *sockfdp = CURL_SOCKET_BAD;
if(*mode == PASSIVE_CONNECT) if(*mode == PASSIVE_CONNECT)
*mode = PASSIVE_LISTEN; *mode = PASSIVE_LISTEN;
else
*mode = ACTIVE_DISCONNECT;
return TRUE; return TRUE;
} }
@ -491,7 +504,7 @@ int main(int argc, char *argv[])
" --ipv4\n" " --ipv4\n"
" --ipv6\n" " --ipv6\n"
" --port [port]"); " --port [port]");
exit(0); return 0;
} }
} }
@ -522,7 +535,7 @@ int main(int argc, char *argv[])
if (sock < 0) { if (sock < 0) {
perror("opening stream socket"); perror("opening stream socket");
logmsg("Error opening socket"); logmsg("Error opening socket");
exit(1); return 1;
} }
if(connectport) { if(connectport) {
@ -552,7 +565,7 @@ int main(int argc, char *argv[])
if(rc) { if(rc) {
perror("connecting stream socket"); perror("connecting stream socket");
logmsg("Error connecting to port %d", port); logmsg("Error connecting to port %d", port);
exit(1); return 1;
} }
logmsg("====> Client connect"); logmsg("====> Client connect");
msgsock = sock; /* use this as stream */ msgsock = sock; /* use this as stream */
@ -587,7 +600,7 @@ int main(int argc, char *argv[])
if(rc < 0) { if(rc < 0) {
perror("binding stream socket"); perror("binding stream socket");
logmsg("Error binding socket"); logmsg("Error binding socket");
exit(1); return 1;
} }
if(!port) { if(!port) {
@ -610,14 +623,6 @@ int main(int argc, char *argv[])
} }
pidfile = fopen(pidname, "w");
if(pidfile) {
fprintf(pidfile, "%d\n", (int)getpid());
fclose(pidfile);
}
else
fprintf(stderr, "Couldn't write pid file\n");
logmsg("Running IPv%d version", logmsg("Running IPv%d version",
(use_ipv6?6:4)); (use_ipv6?6:4));
@ -626,6 +631,16 @@ int main(int argc, char *argv[])
else else
logmsg("Listening on port %d", port); logmsg("Listening on port %d", port);
pidfile = fopen(pidname, "w");
if(pidfile) {
int pid = (int)getpid();
fprintf(pidfile, "%d\n", pid);
fclose(pidfile);
logmsg("Wrote pid %d to %s", pid, pidname);
}
else
fprintf(stderr, "Couldn't write pid file\n");
do { do {
ok = juggle(&msgsock, sock, &mode); ok = juggle(&msgsock, sock, &mode);
} while(ok); } while(ok);