* Fixed timeout problem for remote client sessions (all timeouts were set to

  1 second ... probably a temporary hack that was missed in the cleanup)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 2a4104e14fe8a789f4ebe0c0e1262fb833f0e171..e1e0147de26d84a7a7464c60b61b4c6358a5e4bf 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 1.410  1999/11/02 19:51:23  ajc
+* Fixed timeout problem for remote client sessions (all timeouts were set to
+  1 second ... probably a temporary hack that was missed in the cleanup)
+
 Revision 1.409  1999/11/02 03:03:27  ajc
 * Several fixes to msgbase.c and netproc.c to prevent corrupted incoming
   network traffic from crashing the server.  Reject bad messages.
@@ -1413,3 +1417,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Initial CVS import 
+

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 243985722c16535d5f6a315611c0a64e8ad34f34..a2ee6e7e8de966c2fbed8349bda7b517fc1a87dd 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -439,7 +439,7 @@ void cmd_iden(char *argbuf)
        safestrncpy(CC->cs_clientname, desc, sizeof CC->cs_clientname);
        CC->cs_clientname[31] = 0;
 
-       lprintf(9, "Looking up hostname\n");
+       lprintf(9, "Looking up hostname '%s'\n", from_host);
        if ((strlen(from_host)>0) && 
           (is_public_client(CC->cs_host))) {
                if (inet_aton(from_host, &addr))

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 887609b0deba56bb84b67f8397fc8c86e7f4fbf8..9afd43fec24072d8196f4c969f9d04662e6a2fca 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -425,7 +425,7 @@ int client_read_to(char *buf, int bytes, int timeout)
        while(len<bytes) {
                FD_ZERO(&rfds);
                FD_SET(CC->client_socket, &rfds);
-               tv.tv_sec = 1;
+               tv.tv_sec = timeout;
                tv.tv_usec = 0;
 
                retval = select( (CC->client_socket)+1,