| author | zautrix <zautrix> | 2004-09-02 08:57:01 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-09-02 08:57:01 (UTC) |
| commit | 95e13360d1ef2a7caae121ae526a8a3c1ac12005 (patch) (side-by-side diff) | |
| tree | c9ca8e5c98a11eb5dd7d2afdc8e69d64cdffad25 /kmicromail | |
| parent | f255826bda2f95721aec4d6c9ba372d852fb9d0b (diff) | |
| download | kdepimpi-95e13360d1ef2a7caae121ae526a8a3c1ac12005.zip kdepimpi-95e13360d1ef2a7caae121ae526a8a3c1ac12005.tar.gz kdepimpi-95e13360d1ef2a7caae121ae526a8a3c1ac12005.tar.bz2 | |
Added debug putput for program hang when reading pop3 mail data
| -rw-r--r-- | kmicromail/libetpan/include/libetpan/mailstream.h | 1 | ||||
| -rw-r--r-- | kmicromail/libetpan/tools/mailstream.c | 2 | ||||
| -rw-r--r-- | kmicromail/libetpan/tools/mailstream.h | 3 | ||||
| -rw-r--r-- | kmicromail/libetpan/tools/mailstream_socket.c | 13 |
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 @@ -36,2 +36,3 @@ #ifndef MAILSTREAM_H +#define DEFAULT_NETWORK_TIMEOUT 30 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 @@ -42,3 +42,3 @@ -#define DEFAULT_NETWORK_TIMEOUT 300 + 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 @@ -38,3 +38,4 @@ #define MAILSTREAM_H - +//dont forget to change the value in <libetpan/mailstream.h> as well +#define DEFAULT_NETWORK_TIMEOUT 30 #include <sys/time.h> 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 @@ -171,4 +171,7 @@ static ssize_t mailstream_low_socket_read(mailstream_low * s, 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; @@ -182,3 +185,3 @@ static ssize_t mailstream_low_socket_read(mailstream_low * s, } - +#include <stdio.h> static ssize_t mailstream_low_socket_write(mailstream_low * s, @@ -202,4 +205,8 @@ static ssize_t mailstream_low_socket_write(mailstream_low * s, 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; |