fix sock_connect() to return -1 on all errors (Frederick Nacino)
This commit is contained in:
@@ -226,7 +226,7 @@ int connect_and_setup()
|
|||||||
report(RPT_INFO, "Connecting to %s:%d", address, port);
|
report(RPT_INFO, "Connecting to %s:%d", address, port);
|
||||||
|
|
||||||
sock = sock_connect(address, port);
|
sock = sock_connect(address, port);
|
||||||
if (sock <= 0) {
|
if (sock < 0) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ main (int argc, char **argv)
|
|||||||
/* Try to connect to server */
|
/* Try to connect to server */
|
||||||
sock = sock_connect(server, port);
|
sock = sock_connect(server, port);
|
||||||
|
|
||||||
if (sock <= 0) { /* there was some error and exit */
|
if (sock < 0) { /* there was some error and exit */
|
||||||
fprintf(stderr, "Error: Could not connect to %s:%d\n", server, port);
|
fprintf(stderr, "Error: Could not connect to %s:%d\n", server, port);
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -278,7 +278,7 @@ fprintf(stderr, "%s%s\n", (state) ? "" : "!", name);
|
|||||||
// Connect to the server...
|
// Connect to the server...
|
||||||
usleep(500000); // wait for the server to start up
|
usleep(500000); // wait for the server to start up
|
||||||
sock = sock_connect(server, port);
|
sock = sock_connect(server, port);
|
||||||
if (sock <= 0) {
|
if (sock < 0) {
|
||||||
fprintf(stderr, "Error connecting to LCD server %s on port %d.\n"
|
fprintf(stderr, "Error connecting to LCD server %s on port %d.\n"
|
||||||
"Check to see that the server is running and operating normally.\n",
|
"Check to see that the server is running and operating normally.\n",
|
||||||
server, port);
|
server, port);
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ int connect_and_setup()
|
|||||||
report(RPT_INFO, "Connecting to %s:%d", address, port);
|
report(RPT_INFO, "Connecting to %s:%d", address, port);
|
||||||
|
|
||||||
sock = sock_connect(address, port);
|
sock = sock_connect(address, port);
|
||||||
if (sock <= 0) {
|
if (sock < 0) {
|
||||||
report(RPT_ERR, "Connecting to %s:%d failed", address, port);
|
report(RPT_ERR, "Connecting to %s:%d failed", address, port);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -82,7 +82,7 @@ sock_connect (char *host, unsigned short int port)
|
|||||||
#endif
|
#endif
|
||||||
report (RPT_ERR, "sock_connect: connect failed");
|
report (RPT_ERR, "sock_connect: connect failed");
|
||||||
shutdown (sock, SHUT_RDWR);
|
shutdown (sock, SHUT_RDWR);
|
||||||
return 0; // Normal exit if server doesn't exist...
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef WINSOCK2
|
#ifndef WINSOCK2
|
||||||
|
|||||||
Reference in New Issue
Block a user