#include "internet_addressing.h"
#include "serv_network.h"
#include "clientsocket.h"
-#include "file_ops.h"
#include "citadel_dirs.h"
#include "threads.h"
#include "context.h"
void ParseRoomAlias(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *rncfg)
{
-/*
- if (rncfg->RNCfg->sender != NULL)
- continue; / * just one alowed... * /
- extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
- rncfg->RNCfg->sender = nptr;
-*/
+ if (rncfg->Sender != NULL)
+ return;
+
+ ParseGeneric(ThisOne, Line, LinePos, rncfg);
+ rncfg->Sender = NewStrBufDup(rncfg->NetConfigs[roommailalias]->Value[0]);
}
void ParseSubPendingLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG)
return interested;
}
+void Netmap_AddMe(struct CtdlMessage *msg, const char *defl, long defllen)
+{
+ long node_len;
+ char buf[SIZ];
+ /* prepend our node to the path */
+ if (CM_IsEmpty(msg, eMessagePath)) {
+ CM_SetField(msg, eMessagePath, defl, defllen);
+ }
+ node_len = configlen.c_nodename;
+ if (node_len >= SIZ)
+ node_len = SIZ - 1;
+ memcpy(buf, config.c_nodename, node_len);
+ buf[node_len] = '!';
+ buf[node_len + 1] = '\0';
+ CM_PrependToField(msg, eMessagePath, buf, node_len + 1);
+}
void InspectQueuedRoom(SpoolControl **pSC,
RoomProcList *room_to_spool,
return;
}
+ begin_critical_section(S_NETCONFIGS);
if (sc->RNCfg == NULL)
sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber);
if (!HaveSpoolConfig(sc->RNCfg))
{
+ end_critical_section(S_NETCONFIGS);
free(sc);
/* nothing to do for this room... */
return;
if (StrLength(sc->RNCfg->Sender) > 0)
sc->Users[roommailalias] = NewStrBufDup(sc->RNCfg->Sender);
+ end_critical_section(S_NETCONFIGS);
sc->next = *pSC;
*pSC = sc;
void CalcListID(SpoolControl *sc)
{
+ StrBuf *RoomName;
const char *err;
int fd;
struct CitContext *CCC = CC;
assoc_file_name(filename, sizeof filename, &sc->room, ctdl_info_dir);
fd = open(filename, 0);
- if (fd != 0) {
+ if (fd > 0) {
struct stat stbuf;
- fstat(fd, &stbuf);
- if (stbuf.st_size > 0)
+ if ((fstat(fd, &stbuf) == 0) &&
+ (stbuf.st_size > 0))
{
sc->RoomInfo = NewStrBufPlain(NULL, stbuf.st_size + 1);
StrBufReadBLOB(sc->RoomInfo, &fd, 0, stbuf.st_size, &err);
}
StrBufAppendBufPlain(sc->ListID, HKEY("<"), 0);
+ RoomName = NewStrBufPlain (sc->room.QRname, -1);
+ StrBufAsciify(RoomName, '_');
+ StrBufReplaceChars(RoomName, ' ', '_');
if (StrLength(sc->Users[roommailalias]) > 0)
{
else
{
StrBufAppendBufPlain(sc->ListID, HKEY("room_"), 0);
- StrBufAppendBufPlain(sc->ListID, sc->room.QRname, -1, 0);
+ StrBufAppendBuf(sc->ListID, RoomName, 0);
StrBufAppendBufPlain(sc->ListID, HKEY("."), 0);
StrBufAppendBufPlain(sc->ListID, config.c_fqdn, -1, 0);
/*
{
sc->Users[roommailalias] = NewStrBuf();
- StrBufPrintf(sc->Users[roommailalias],
- "room_%s@%s",
- CCC->room.QRname,
- config.c_fqdn);
+ StrBufAppendBufPlain(sc->Users[roommailalias], HKEY("room_"), 0);
+ StrBufAppendBuf(sc->Users[roommailalias], RoomName, 0);
+ StrBufAppendBufPlain(sc->Users[roommailalias], HKEY("@"), 0);
+ StrBufAppendBufPlain(sc->Users[roommailalias], config.c_fqdn, -1, 0);
- StrBufAsciify(sc->Users[roommailalias], '_');
StrBufLowerCase(sc->Users[roommailalias]);
}
+ FreeStrBuf(&RoomName);
}
/* Now rewrite the config file */
if (sc->lastsent != lastsent)
{
+ begin_critical_section(S_NETCONFIGS);
sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber);
sc->RNCfg->lastsent = sc->lastsent;
sc->RNCfg->changed = 1;
+ end_critical_section(S_NETCONFIGS);
}
- end_critical_section(S_NETCONFIGS);
}
/*
*/
void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, HashList *the_netmap, int *netmap_changed)
{
+ long len;
struct CitContext *CCC = CC;
StrBuf *Buf = NULL;
struct CtdlMessage *msg = NULL;
long pos;
int field;
- struct recptypes *recp = NULL;
+ recptypes *recp = NULL;
char target_room[ROOMNAMELEN];
struct ser_ret sermsg;
- char *oldpath = NULL;
char filename[PATH_MAX];
FILE *fp;
const StrBuf *nexthop = NULL;
for (pos = 3; pos < size; ++pos) {
field = buffer[pos];
- msg->cm_fields[field] = strdup(&buffer[pos+1]);
- pos = pos + strlen(&buffer[(int)pos]);
+ len = strlen(buffer + pos + 1);
+ CM_SetField(msg, field, buffer + pos + 1, len);
+ pos = pos + len + 1;
}
/* Check for message routing */
- if (msg->cm_fields['D'] != NULL) {
- if (strcasecmp(msg->cm_fields['D'], config.c_nodename)) {
+ if (!CM_IsEmpty(msg, eDestination)) {
+ if (strcasecmp(msg->cm_fields[eDestination], config.c_nodename)) {
/* route the message */
- Buf = NewStrBufPlain(msg->cm_fields['D'], -1);
+ Buf = NewStrBufPlain(CM_KEY(msg,eDestination));
if (CtdlIsValidNode(&nexthop,
NULL,
Buf,
working_ignetcfg,
the_netmap) == 0)
{
- /* prepend our node to the path */
- if (msg->cm_fields['P'] != NULL) {
- oldpath = msg->cm_fields['P'];
- msg->cm_fields['P'] = NULL;
- }
- else {
- oldpath = strdup("unknown_user");
- }
- size = strlen(oldpath) + SIZ;
- msg->cm_fields['P'] = malloc(size);
- snprintf(msg->cm_fields['P'], size, "%s!%s",
- config.c_nodename, oldpath);
- free(oldpath);
+ Netmap_AddMe(msg, HKEY("unknown_user"));
/* serialize the message */
- serialize_message(&sermsg, msg);
+ CtdlSerializeMessage(&sermsg, msg);
/* now send it */
if (StrLength(nexthop) == 0) {
QN_syslog(LOG_ERR, "%s: %s\n", filename, strerror(errno));
}
free(sermsg.ser);
- CtdlFreeMessage(msg);
+ CM_Free(msg);
FreeStrBuf(&Buf);
return;
}
* connected that it's inevitable.)
*/
if (network_usetable(msg) != 0) {
- CtdlFreeMessage(msg);
+ CM_Free(msg);
return;
}
/* Learn network topology from the path */
- if ((msg->cm_fields['N'] != NULL) && (msg->cm_fields['P'] != NULL)) {
- NetworkLearnTopology(msg->cm_fields['N'],
- msg->cm_fields['P'],
+ if (!CM_IsEmpty(msg, eNodeName) && !CM_IsEmpty(msg, eMessagePath)) {
+ NetworkLearnTopology(msg->cm_fields[eNodeName],
+ msg->cm_fields[eMessagePath],
the_netmap,
netmap_changed);
}
/* Is the sending node giving us a very persuasive suggestion about
* which room this message should be saved in? If so, go with that.
*/
- if (msg->cm_fields['C'] != NULL) {
- safestrncpy(target_room, msg->cm_fields['C'], sizeof target_room);
+ if (!CM_IsEmpty(msg, eRemoteRoom)) {
+ safestrncpy(target_room, msg->cm_fields[eRemoteRoom], sizeof target_room);
}
/* Otherwise, does it have a recipient? If so, validate it... */
- else if (msg->cm_fields['R'] != NULL) {
- recp = validate_recipients(msg->cm_fields['R'], NULL, 0);
+ else if (!CM_IsEmpty(msg, eRecipient)) {
+ recp = validate_recipients(msg->cm_fields[eRecipient], NULL, 0);
if (recp != NULL) if (recp->num_error != 0) {
network_bounce(msg,
"A message you sent could not be delivered due to an invalid address.\n"
}
/* Our last shot at finding a home for this message is to see if
- * it has the O field (Originating room) set.
+ * it has the eOriginalRoom (O) field (Originating room) set.
*/
- else if (msg->cm_fields['O'] != NULL) {
- safestrncpy(target_room, msg->cm_fields['O'], sizeof target_room);
+ else if (!CM_IsEmpty(msg, eOriginalRoom)) {
+ safestrncpy(target_room, msg->cm_fields[eOriginalRoom], sizeof target_room);
}
/* Strip out fields that are only relevant during transit */
- if (msg->cm_fields['D'] != NULL) {
- free(msg->cm_fields['D']);
- msg->cm_fields['D'] = NULL;
- }
- if (msg->cm_fields['C'] != NULL) {
- free(msg->cm_fields['C']);
- msg->cm_fields['C'] = NULL;
- }
+ CM_FlushField(msg, eDestination);
+ CM_FlushField(msg, eRemoteRoom);
/* save the message into a room */
if (PerformNetprocHooks(msg, target_room) == 0) {
msg->cm_flags = CM_SKIP_HOOKS;
CtdlSubmitMsg(msg, recp, target_room, 0);
}
- CtdlFreeMessage(msg);
+ CM_Free(msg);
free_recipients(recp);
}
long msgend = (-1L);
long msgcur = 0L;
int ch;
-
+ int nMessages = 0;
fp = fopen(filename, "rb");
if (fp == NULL) {
}
++msgcur;
+ nMessages ++;
}
msgend = msgcur - 1;
working_ignetcfg,
the_netmap,
netmap_changed);
+ nMessages ++;
}
+ if (nMessages > 0)
+ QN_syslog(LOG_INFO,
+ "network: processed %d messages in %s\n",
+ nMessages,
+ filename);
+
fclose(fp);
unlink(filename);
}
(filedir_entry != NULL))
{
#ifdef _DIRENT_HAVE_D_NAMLEN
- d_namelen = filedir_entry->d_namelen;
+ d_namelen = filedir_entry->d_namlen;
#else
d_namelen = strlen(filedir_entry->d_name);
(filedir_entry != NULL))
{
#ifdef _DIRENT_HAVE_D_NAMLEN
- d_namelen = filedir_entry->d_namelen;
+ d_namelen = filedir_entry->d_namlen;
#else
d_namelen = strlen(filedir_entry->d_name);
do {} while ((FileMoveChunked(&FDIO, &err) > 0) && (err == NULL));
if (err == NULL) {
unlink(filename);
+ QN_syslog(LOG_DEBUG,
+ "Spoolfile %s now "SIZE_T_FMT" k\n",
+ spooloutfilename,
+ (dsize + fsize)/1024
+ );
}
else {
nFailed++;
(filedir_entry != NULL))
{
#ifdef _DIRENT_HAVE_D_NAMLEN
- d_namelen = filedir_entry->d_namelen;
+ d_namelen = filedir_entry->d_namlen;
#else
d_namelen = strlen(filedir_entry->d_name);
closedir(dp);
}
+void free_spoolcontrol_struct(SpoolControl **sc)
+{
+ free_spoolcontrol_struct_members(*sc);
+ free(*sc);
+ *sc = NULL;
+}
+
+void free_spoolcontrol_struct_members(SpoolControl *sc)
+{
+ int i;
+ FreeStrBuf(&sc->RoomInfo);
+ FreeStrBuf(&sc->ListID);
+ for (i = 0; i < maxRoomNetCfg; i++)
+ FreeStrBuf(&sc->Users[i]);
+}
projects / citadel.git / blobdiff