4 files changed, 14 insertions, 5 deletions

diff --git a/kmicromail/libetpan/include/libetpan/mailstream.h b/kmicromail/libetpan/include/libetpan/mailstream.h
index a4e35cd..ffb5062 100644
--- a/kmicromail/libetpan/include/libetpan/mailstream.h
+++ b/kmicromail/libetpan/include/libetpan/mailstream.h
@@ -1,73 +1,74 @@
 /*
  * libEtPan! -- a mail stuff library
  *
  * Copyright (C) 2001, 2002 - DINH Viet Hoa
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the libEtPan! project nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 /*
  * $Id$
  */
 
 #ifndef MAILSTREAM_H
+#define DEFAULT_NETWORK_TIMEOUT 30
 
 #define MAILSTREAM_H
 
 #include <sys/time.h>
 
 #include <libetpan/mailstream_low.h>
 #include <libetpan/mailstream_helper.h>
 #include <libetpan/mailstream_socket.h>
 #include <libetpan/mailstream_ssl.h>
 #include <libetpan/mailstream_types.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 mailstream * mailstream_new(mailstream_low * low, size_t buffer_size);
 ssize_t mailstream_write(mailstream * s, const void * buf, size_t count);
 ssize_t mailstream_read(mailstream * s, void * buf, size_t count);
 int mailstream_close(mailstream * s);
 int mailstream_flush(mailstream * s);
 ssize_t mailstream_feed_read_buffer(mailstream * s);
 mailstream_low * mailstream_get_low(mailstream * s);
 void mailstream_set_low(mailstream * s, mailstream_low * low);
 
 #ifdef LIBETPAN_MAILSTREAM_DEBUG
 extern int mailstream_debug;
 #endif
 
 #define LIBETPAN_MAILSTREAM_NETWORK_DELAY
 extern struct timeval mailstream_network_delay;
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif
 
diff --git a/kmicromail/libetpan/tools/mailstream.c b/kmicromail/libetpan/tools/mailstream.c
index 0f55e67..6d1a8cc 100644
--- a/kmicromail/libetpan/tools/mailstream.c
+++ b/kmicromail/libetpan/tools/mailstream.c
@@ -1,91 +1,91 @@
 /*
  * libEtPan! -- a mail stuff library
  *
  * Copyright (C) 2001, 2002 - DINH Viet Hoa
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the libEtPan! project nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 /*
  * $Id$
  */
 
 #include "mailstream.h"
 #include "maillock.h"
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#define DEFAULT_NETWORK_TIMEOUT 300
+
 
 #ifdef LIBETPAN_MAILSTREAM_DEBUG
 
 #define STREAM_DEBUG
 
 #include <stdio.h>
 
 #define LOG_FILE "libetpan-stream-debug.log"
 
 int mailstream_debug = 0;
 
 #define STREAM_LOG_BUF(buf, size) \
   if (mailstream_debug) { \
     FILE * f; \
     mode_t old_mask; \
     \
     old_mask = umask(0077); \
     f = fopen(LOG_FILE, "a"); \
     umask(old_mask); \
     if (f != NULL) { \
       maillock_write_lock(LOG_FILE, fileno(f)); \
       fwrite((buf), 1, (size), f); \
       maillock_write_unlock(LOG_FILE, fileno(f)); \
       fclose(f); \
     } \
   }
 
 #define STREAM_LOG(str) \
   if (mailstream_debug) { \
     FILE * f; \
     mode_t old_mask; \
     \
     old_mask = umask(0077); \
     f = fopen(LOG_FILE, "a"); \
     umask(old_mask); \
     if (f != NULL) { \
       maillock_write_lock(LOG_FILE, fileno(f)); \
       fputs((str), f); \
       maillock_write_unlock(LOG_FILE, fileno(f)); \
       fclose(f); \
     } \
   }
 
 #else
 
 #define STREAM_LOG_BUF(buf, size) do { } while (0)
 #define STREAM_LOG(buf) do { } while (0)
 
diff --git a/kmicromail/libetpan/tools/mailstream.h b/kmicromail/libetpan/tools/mailstream.h
index a4e35cd..8a89a72 100644
--- a/kmicromail/libetpan/tools/mailstream.h
+++ b/kmicromail/libetpan/tools/mailstream.h
@@ -1,73 +1,74 @@
 /*
  * libEtPan! -- a mail stuff library
  *
  * Copyright (C) 2001, 2002 - DINH Viet Hoa
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the libEtPan! project nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 /*
  * $Id$
  */
 
 #ifndef MAILSTREAM_H
 
 #define MAILSTREAM_H
-
+//dont forget to change the value in  <libetpan/mailstream.h> as well
+#define DEFAULT_NETWORK_TIMEOUT 30
 #include <sys/time.h>
 
 #include <libetpan/mailstream_low.h>
 #include <libetpan/mailstream_helper.h>
 #include <libetpan/mailstream_socket.h>
 #include <libetpan/mailstream_ssl.h>
 #include <libetpan/mailstream_types.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 mailstream * mailstream_new(mailstream_low * low, size_t buffer_size);
 ssize_t mailstream_write(mailstream * s, const void * buf, size_t count);
 ssize_t mailstream_read(mailstream * s, void * buf, size_t count);
 int mailstream_close(mailstream * s);
 int mailstream_flush(mailstream * s);
 ssize_t mailstream_feed_read_buffer(mailstream * s);
 mailstream_low * mailstream_get_low(mailstream * s);
 void mailstream_set_low(mailstream * s, mailstream_low * low);
 
 #ifdef LIBETPAN_MAILSTREAM_DEBUG
 extern int mailstream_debug;
 #endif
 
 #define LIBETPAN_MAILSTREAM_NETWORK_DELAY
 extern struct timeval mailstream_network_delay;
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif
 
diff --git a/kmicromail/libetpan/tools/mailstream_socket.c b/kmicromail/libetpan/tools/mailstream_socket.c
index 29e50e1..04a6f48 100644
--- a/kmicromail/libetpan/tools/mailstream_socket.c
+++ b/kmicromail/libetpan/tools/mailstream_socket.c
@@ -124,116 +124,123 @@ static int mailstream_low_socket_close(mailstream_low * s)
   struct mailstream_socket_data * socket_data;
 
   socket_data = (struct mailstream_socket_data *) s->data;
   socket_data_close(socket_data);
 
   return 0;
 }
 
 static void mailstream_low_socket_free(mailstream_low * s)
 {
   struct mailstream_socket_data * socket_data;
 
   socket_data = (struct mailstream_socket_data *) s->data;
   socket_data_free(socket_data);
   s->data = NULL;
 
   free(s);
 }
 
 static int mailstream_low_socket_get_fd(mailstream_low * s)
 {
   struct mailstream_socket_data * socket_data;
 
   socket_data = (struct mailstream_socket_data *) s->data;
   return socket_data->fd;
 }
 
 
 static ssize_t mailstream_low_socket_read(mailstream_low * s,
                                           void * buf, size_t count)
 {
   struct mailstream_socket_data * socket_data;
   
   socket_data = (struct mailstream_socket_data *) s->data;
   
   /* timeout */
   {
     fd_set fds_read;
     fd_set fds_excp;
     struct timeval timeout;
     int r;
     
     timeout = mailstream_network_delay;
     
     FD_ZERO(&fds_read);
     FD_SET(socket_data->fd, &fds_read);
     FD_ZERO(&fds_excp);
     FD_SET(socket_data->fd, &fds_excp);
+    // LUTZ for safety I insert here a max val as well
+    if (  timeout.tv_sec > DEFAULT_NETWORK_TIMEOUT ) 
+        timeout.tv_sec = DEFAULT_NETWORK_TIMEOUT; 
     r = select(socket_data->fd + 1, &fds_read, NULL, &fds_excp, &timeout);
-    if (r == 0)
+    if (r < 1 )
       return -1;
     if (FD_ISSET(socket_data->fd, &fds_excp))
       return -1;
     if (!FD_ISSET(socket_data->fd, &fds_read))
       return 0;
   }
   return recv(socket_data->fd,buf,count,MSG_NOSIGNAL);
   //return read(socket_data->fd, buf, count);
 }
-
+#include <stdio.h>
 static ssize_t mailstream_low_socket_write(mailstream_low * s,
                                            const void * buf, size_t count)
 {
   struct mailstream_socket_data * socket_data;
 
   socket_data = (struct mailstream_socket_data *) s->data;
   /* timeout */
   {
     fd_set fds_write;
     fd_set fds_excp;
     struct timeval timeout;
     int r;
     
     timeout = mailstream_network_delay;
     
     FD_ZERO(&fds_write);
     FD_SET(socket_data->fd, &fds_write);
     FD_ZERO(&fds_excp);
     FD_SET(socket_data->fd, &fds_excp);
+    // LUTZ next line blocks sometimes
+    if (  timeout.tv_sec > DEFAULT_NETWORK_TIMEOUT ) 
+        timeout.tv_sec = DEFAULT_NETWORK_TIMEOUT; 
+    fprintf(stderr,"fd %d to secs %d  \n", socket_data->fd, timeout.tv_sec );
     r = select(socket_data->fd + 1, NULL, &fds_write, &fds_excp, &timeout);
-    if (r == 0)
+    if (r < 1)
       return -1;
     if (FD_ISSET(socket_data->fd, &fds_excp))
       return -1;
     if (!FD_ISSET(socket_data->fd, &fds_write))
       return 0;
   }
   
    return send(socket_data->fd,buf,count,MSG_NOSIGNAL);
   //return write(socket_data->fd, buf, count);
 }
 
 
 /* mailstream */
 
 mailstream * mailstream_socket_open(int fd)
 {
   mailstream_low * low;
   mailstream * s;
 
   low = mailstream_low_socket_open(fd);
   if (low == NULL)
     goto err;
 
   s = mailstream_new(low, 8192);
   if (s == NULL)
     goto free_low;
 
   return s;
 
  free_low:
   mailstream_low_close(low);
  err:
   return NULL;
 }