#include "msgbase.h"
#include "internet_addressing.h"
#include "clientsocket.h"
-#include "file_ops.h"
#include "citadel_dirs.h"
#include "threads.h"
#include "context.h"
#define EVN_syslog(LEVEL, FORMAT, ...) \
NCDBGLOG(LEVEL) syslog(LEVEL, \
- "IO[%ld]CC[%d]NW[%s][%ld]" FORMAT, \
- IO->ID, CCID, NODE, N, __VA_ARGS__)
+ "%s[%ld]CC[%d]NW[%s][%ld]" FORMAT, \
+ IOSTR, IO->ID, CCID, NODE, N, __VA_ARGS__)
#define EVNM_syslog(LEVEL, FORMAT) \
NCDBGLOG(LEVEL) syslog(LEVEL, \
- "IO[%ld]CC[%d]NW[%s][%ld]" FORMAT, \
- IO->ID, CCID, NODE, N)
+ "%s[%ld]CC[%d]NW[%s][%ld]" FORMAT, \
+ IOSTR, IO->ID, CCID, NODE, N)
#define EVNCS_syslog(LEVEL, FORMAT, ...) \
- NCDBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]NW[%s][%ld]" FORMAT, \
- IO->ID, NODE, N, __VA_ARGS__)
+ NCDBGLOG(LEVEL) syslog(LEVEL, "%s[%ld]NW[%s][%ld]" FORMAT, \
+ IOSTR, IO->ID, NODE, N, __VA_ARGS__)
#define EVNCSM_syslog(LEVEL, FORMAT) \
- NCDBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]NW[%s][%ld]" FORMAT, \
- IO->ID, NODE, N)
+ NCDBGLOG(LEVEL) syslog(LEVEL, "%s[%ld]NW[%s][%ld]" FORMAT, \
+ IOSTR, IO->ID, NODE, N)
typedef enum _eNWCState {
#define NWC_DBG_READ() EVN_syslog(LOG_DEBUG, ": < %s\n", ChrPtr(NW->IO.IOBuf))
#define NWC_OK (strncasecmp(ChrPtr(NW->IO.IOBuf), "+OK", 3) == 0)
-eNextState SendFailureMessage(AsyncIO *IO)
+eNextState NWC_SendFailureMessage(AsyncIO *IO)
{
AsyncNetworker *NW = IO->Data;
long lens[2];
CtdlAideFPMessage(
ChrPtr(NW->IO.ErrMsg),
"Networker error",
- 2, strs, (long*) &lens);
+ 2, strs, (long*) &lens,
+ IO->Now,
+ IO->ID, CCID);
return eAbort;
}
connected_to, ChrPtr(NW->node));
EVN_syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
StopClientWatchers(IO, 1);
- return QueueDBOperation(IO, SendFailureMessage);
+ return QueueDBOperation(IO, NWC_SendFailureMessage);
}
return eSendReply;
}
SetNWCState(IO, eNWCVSAuthFailNTT);
EVN_syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
StopClientWatchers(IO, 1);
- return QueueDBOperation(IO, SendFailureMessage);
+ return QueueDBOperation(IO, NWC_SendFailureMessage);
}
return eAbort;
}
NWC_DBG_READ();
if (ChrPtr(NW->IO.IOBuf)[0] == '2')
{
+ int LogLevel = LOG_DEBUG;
NW->IO.IOB.TotalSentAlready = 0;
+
TotalSendSize = atol (ChrPtr(NW->IO.IOBuf) + 4);
- EVN_syslog(LOG_DEBUG, "Expecting to transfer %d bytes\n", TotalSendSize);
+
+ if (TotalSendSize > 0)
+ LogLevel = LOG_INFO;
+
+ EVN_syslog(LogLevel,
+ "Expecting to transfer %d bytes to %s\n",
+ TotalSendSize,
+ ChrPtr(NW->tempFileName));
+
if (TotalSendSize <= 0) {
NW->State = eNUOP - 1;
}
ChrPtr(NW->SpoolFileName),
strerror(errno));
}
-
+ else {
+ EVN_syslog(LOG_INFO,
+ "moved %s to %s\n",
+ ChrPtr(NW->tempFileName),
+ ChrPtr(NW->SpoolFileName));
+ }
+
unlink(ChrPtr(NW->tempFileName));
rc = NWC_DispatchWriteDone(&NW->IO);
NW->State --;
ChrPtr(NW->SpoolFileName),
strerror(errno));
}
+ else {
+ EVN_syslog(LOG_INFO,
+ "moved %s to %s\n",
+ ChrPtr(NW->tempFileName),
+ ChrPtr(NW->SpoolFileName));
+ }
unlink(ChrPtr(NW->tempFileName));
rc = NWC_DispatchWriteDone(&NW->IO);
if (fd > 0) close(fd);
return rc;
}
+ else
+ {
+ EVN_syslog(LOG_INFO,
+ "sending %s to %s\n",
+ ChrPtr(NW->SpoolFileName),
+ ChrPtr(NW->node));
+ }
+
FDIOBufferInit(&NW->IO.IOB, &NW->IO.SendBuf, fd, TotalSendSize);
StrBufPlain(NW->IO.SendBuf.Buf, HKEY("NUOP\n"));
AsyncIO *IO = &NW->IO;
NWC_DBG_READ();
- EVN_syslog(LOG_NOTICE, "Sent %ld octets to <%s>\n", NW->IO.IOB.ChunkSize, ChrPtr(NW->node));
+ EVN_syslog(LOG_NOTICE,
+ "Sent %s [%ld] octets to <%s>\n",
+ ChrPtr(NW->SpoolFileName),
+ NW->IO.IOB.ChunkSize,
+ ChrPtr(NW->node));
+
if (ChrPtr(NW->IO.IOBuf)[0] == '2') {
EVN_syslog(LOG_DEBUG, "Removing <%s>\n", ChrPtr(NW->SpoolFileName));
unlink(ChrPtr(NW->SpoolFileName));
{
SetNWCState(IO, eNWCVSConnFail);
StopClientWatchers(IO, 1);
- return QueueDBOperation(IO, SendFailureMessage);
+ return QueueDBOperation(IO, NWC_SendFailureMessage);
}
void NWC_SetTimeout(eNextState NextTCPState, AsyncNetworker *NW)
EVN_syslog(LOG_DEBUG, "%s - %d\n", __FUNCTION__, NextTCPState);
switch (NextTCPState) {
- case eSendReply:
case eSendMore:
- break;
- case eReadFile:
+ case eSendReply:
case eReadMessage:
Timeout = NWC_ReadTimeouts[NW->State];
break;
+ case eReadFile:
+ case eSendFile:
case eReadPayload:
Timeout = 100000;
- /* TODO!!! */
break;
case eSendDNSQuery:
case eReadDNSReply:
+ case eDBQuery:
+ case eReadMore:
case eConnect:
- case eSendFile:
-//TODO
case eTerminateConnection:
- case eDBQuery:
case eAbort:
- case eReadMore://// TODO
return;
}
if (Timeout > 0) {
eNextState rc;
rc = NWC_ReadHandlers[NW->State](NW);
+
if (rc != eReadMore)
NW->State++;
+
NWC_SetTimeout(rc, NW);
+
return rc;
}
eNextState NWC_DispatchWriteDone(AsyncIO *IO)