* Started moving all of the global variables into a struct, to facilitate

[citadel.git] / webcit / tcp_sockets.c

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index bafeea9b5bef56578c1e0105764f50586037dfdd..d7ec10712e545c5abecb64f565c4911529e45ff4 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -29,9 +29,6 @@ char server_is_local = 0;
 
 extern int errno;
 
-int serv_sock;
-
-
 RETSIGTYPE timeout(int signum)
 {
        fprintf(stderr, "Connection timed out.\n");
@@ -105,12 +102,12 @@ void serv_read(char *buf, int bytes)
 
        len = 0;
        while (len < bytes) {
-               rlen = read(serv_sock, &buf[len], bytes - len);
+               rlen = read(WC->serv_sock, &buf[len], bytes - len);
                if (rlen < 1) {
                        fprintf(stderr, "Server connection broken: %s\n",
                                strerror(errno));
-                       connected = 0;
-                       logged_in = 0;
+                       WC->connected = 0;
+                       WC->logged_in = 0;
                        return;
                }
                len = len + rlen;
@@ -147,13 +144,13 @@ void serv_write(char *buf, int nbytes)
        int bytes_written = 0;
        int retval;
        while (bytes_written < nbytes) {
-               retval = write(serv_sock, &buf[bytes_written],
+               retval = write(WC->serv_sock, &buf[bytes_written],
                               nbytes - bytes_written);
                if (retval < 1) {
                        fprintf(stderr, "Server connection broken: %s\n",
                                strerror(errno));
-                       connected = 0;
-                       logged_in = 0;
+                       WC->connected = 0;
+                       WC->logged_in = 0;
                        return;
                }
                bytes_written = bytes_written + retval;