--- lmtp2nntp.c 2001/10/09 10:24:41 1.73
+++ lmtp2nntp.c 2001/10/09 10:34:10 1.74
@@ -131,7 +131,6 @@
char *option_operationmodefakestatus;
char *option_operationmodefakedsn;
int option_maxmessagesize;
- int option_waittime;
int option_timeout_lmtp_accept;
int option_timeout_lmtp_read;
int option_timeout_lmtp_write;
@@ -380,7 +379,6 @@
ctx->option_operationmodefakestatus = "553"; /* Requested action not taken: mailbox name not allowed */
ctx->option_operationmodefakedsn = "5.7.1"; /* Delivery not authorized, message refused */
ctx->option_maxmessagesize = 8 * 1024 * 1024;
- ctx->option_waittime = -1;
ctx->option_timeout_lmtp_accept = 0;
ctx->option_timeout_lmtp_read = 10;
ctx->option_timeout_lmtp_write = 10;
@@ -1048,10 +1046,10 @@
}
}
- if (bOk && (ctx->option_waittime > 0)) {
- log1(ctx, DEBUG, "timeout configured through waittime=%d", ctx->option_waittime);
- sa_timeout(ctx->ns[i].sa, SA_TIMEOUT_ALL, ctx->option_waittime, 0);
- }
+ sa_timeout(ctx->ns[i].sa, SA_TIMEOUT_ALL, 0, 0);
+ sa_timeout(ctx->ns[i].sa, SA_TIMEOUT_CONNECT, ctx->option_timeout_nntp_connect, 0);
+ sa_timeout(ctx->ns[i].sa, SA_TIMEOUT_READ, ctx->option_timeout_nntp_read, 0);
+ sa_timeout(ctx->ns[i].sa, SA_TIMEOUT_WRITE, ctx->option_timeout_nntp_read, 0);
if (bOk) {
log0(ctx, DEBUG, "connect");
@@ -1073,9 +1071,9 @@
}
}
- if (bOk && ctx->option_waittime >= 0) {
- log1(ctx, DEBUG, "nntp_timeout with %d", ctx->option_waittime);
- nntp_timeout(ctx->ns[i].nntp, ctx->option_waittime);
+ if (bOk && ctx->option_timeout_nntp_connect >= 0) {
+ log1(ctx, DEBUG, "nntp_timeout with %d", ctx->option_timeout_nntp_connect);
+ nntp_timeout(ctx->ns[i].nntp, ctx->option_timeout_nntp_connect);
}
if (bOk) {
|
