+ FreeStrBuf(&OneRNCfg->Sender);
+ FreeStrBuf(&OneRNCfg->RoomInfo);
+ FreeStrBuf(&OneRNCfg->misc);
+ memset(OneRNCfg, 0, sizeof(OneRoomNetCfg));
+}
+
+
+void vFreeRoomNetworkStruct(void *vOneRoomNetCfg)
+{
+ OneRoomNetCfg *OneRNCfg;
+ OneRNCfg = (OneRoomNetCfg*)vOneRoomNetCfg;
+ FreeRoomNetworkStructContent(OneRNCfg);
+ free(OneRNCfg);
+}
+
+
+void FreeRoomNetworkStruct(OneRoomNetCfg **pOneRNCfg)
+{
+ vFreeRoomNetworkStruct(*pOneRNCfg);
+ *pOneRNCfg=NULL;
+}
+
+
+/*
+ * Fetch the netconfig entry for a room, parse it, and return the data.
+ * Caller owns the returned memory and MUST free it using FreeRoomNetworkStruct()
+ */
+OneRoomNetCfg *CtdlGetNetCfgForRoom(long roomnum)
+{
+ OneRoomNetCfg *OneRNCfg = NULL;
+ char *serialized_config = NULL;
+
+ serialized_config = LoadRoomNetConfigFile(roomnum);
+ if (!serialized_config) return NULL;
+
+ OneRNCfg = ParseRoomNetConfigFile(serialized_config);
+ free(serialized_config);
+ return OneRNCfg;
+}
+
+
+/*-----------------------------------------------------------------------------*
+ * Per room network configs : exchange with client *
+ *-----------------------------------------------------------------------------*/
+
+void cmd_gnet(char *argbuf)
+{
+ if ( (CC->room.QRflags & QR_MAILBOX) && (CC->user.usernum == atol(CC->room.QRname)) ) {
+ /* users can edit the netconfigs for their own mailbox rooms */
+ }
+ else if (CtdlAccessCheck(ac_room_aide)) return;
+
+ cprintf("%d Network settings for room #%ld <%s>\n", LISTING_FOLLOWS, CC->room.QRnumber, CC->room.QRname);
+
+ char *c = LoadRoomNetConfigFile(CC->room.QRnumber);
+ if (c) {
+ int len = strlen(c);
+ client_write(c, len); // Can't use cprintf() here, it has a limit of 1024 bytes
+ if (c[len] != '\n') {
+ client_write(HKEY("\n"));
+ }
+ free(c);
+ }
+ cprintf("000\n");
+}
+
+
+void cmd_snet(char *argbuf)
+{
+ struct CitContext *CCC = CC;
+ StrBuf *Line = NULL;
+ StrBuf *TheConfig = NULL;
+ int rc;
+
+ unbuffer_output();
+ Line = NewStrBuf();
+ TheConfig = NewStrBuf();
+ cprintf("%d send new netconfig now\n", SEND_LISTING);
+
+ while (rc = CtdlClientGetLine(Line), (rc >= 0))
+ {
+ if ((rc == 3) && (strcmp(ChrPtr(Line), "000") == 0))
+ break;
+
+ StrBufAppendBuf(TheConfig, Line, 0);
+ StrBufAppendBufPlain(TheConfig, HKEY("\n"), 0);
+ }
+ FreeStrBuf(&Line);
+
+ write_netconfig_to_configdb(CCC->room.QRnumber, ChrPtr(TheConfig));
+ FreeStrBuf(&TheConfig);
+}
+
+
+/*-----------------------------------------------------------------------------*
+ * Per node network configs *
+ *-----------------------------------------------------------------------------*/
+void DeleteCtdlNodeConf(void *vNode)
+{
+ CtdlNodeConf *Node = (CtdlNodeConf*) vNode;
+ FreeStrBuf(&Node->NodeName);
+ FreeStrBuf(&Node->Secret);
+ FreeStrBuf(&Node->Host);
+ FreeStrBuf(&Node->Port);
+ free(Node);
+}
+
+
+CtdlNodeConf *NewNode(StrBuf *SerializedNode)
+{
+ const char *Pos = NULL;
+ CtdlNodeConf *Node;
+
+ /* we need at least 4 pipes and some other text so its invalid. */
+ if (StrLength(SerializedNode) < 8)
+ return NULL;
+ Node = (CtdlNodeConf *) malloc(sizeof(CtdlNodeConf));
+
+ Node->DeleteMe = 0;
+
+ Node->NodeName=NewStrBuf();
+ StrBufExtract_NextToken(Node->NodeName, SerializedNode, &Pos, '|');
+
+ Node->Secret=NewStrBuf();
+ StrBufExtract_NextToken(Node->Secret, SerializedNode, &Pos, '|');
+
+ Node->Host=NewStrBuf();
+ StrBufExtract_NextToken(Node->Host, SerializedNode, &Pos, '|');
+
+ Node->Port=NewStrBuf();
+ StrBufExtract_NextToken(Node->Port, SerializedNode, &Pos, '|');
+ return Node;
+}
+
+
+/*
+ * Load or refresh the Citadel network (IGnet) configuration for this node.
+ */
+HashList* CtdlLoadIgNetCfg(void)
+{
+ const char *LinePos;
+ char *Cfg;
+ StrBuf *Buf;
+ StrBuf *LineBuf;
+ HashList *Hash;
+ CtdlNodeConf *Node;
+
+ Cfg = CtdlGetSysConfig(IGNETCFG);
+ if ((Cfg == NULL) || IsEmptyStr(Cfg)) {
+ if (Cfg != NULL)
+ free(Cfg);
+ return NULL;
+ }
+
+ Hash = NewHash(1, NULL);
+ Buf = NewStrBufPlain(Cfg, -1);
+ free(Cfg);
+ LineBuf = NewStrBufPlain(NULL, StrLength(Buf));
+ LinePos = NULL;
+ do
+ {
+ StrBufSipLine(LineBuf, Buf, &LinePos);
+ if (StrLength(LineBuf) != 0) {
+ Node = NewNode(LineBuf);
+ if (Node != NULL) {
+ Put(Hash, SKEY(Node->NodeName), Node, DeleteCtdlNodeConf);
+ }
+ }
+ } while (LinePos != StrBufNOTNULL);
+ FreeStrBuf(&Buf);
+ FreeStrBuf(&LineBuf);
+ return Hash;
+}
+
+
+int is_recipient(OneRoomNetCfg *RNCfg, const char *Name)
+{
+ const RoomNetCfg RecipientCfgs[] = {
+ listrecp,
+ digestrecp,
+ participate,
+ maxRoomNetCfg
+ };
+ int i;
+ RoomNetCfgLine *nptr;
+ size_t len;
+
+ len = strlen(Name);
+ i = 0;
+ while (RecipientCfgs[i] != maxRoomNetCfg)
+ {
+ nptr = RNCfg->NetConfigs[RecipientCfgs[i]];
+
+ while (nptr != NULL)
+ {
+ if ((StrLength(nptr->Value[0]) == len) &&
+ (!strcmp(Name, ChrPtr(nptr->Value[0]))))
+ {
+ return 1;
+ }
+ nptr = nptr->next;
+ }
+ i++;
+ }
+ return 0;
+}
+
+
+int CtdlNetconfigCheckRoomaccess(char *errmsgbuf, size_t n, const char* RemoteIdentifier)
+{
+ OneRoomNetCfg *RNCfg;
+ int found;
+
+ if (RemoteIdentifier == NULL)
+ {
+ snprintf(errmsgbuf, n, "Need sender to permit access.");
+ return (ERROR + USERNAME_REQUIRED);
+ }
+
+ begin_critical_section(S_NETCONFIGS);
+ RNCfg = CtdlGetNetCfgForRoom (CC->room.QRnumber);
+ if (RNCfg == NULL)
+ {
+ end_critical_section(S_NETCONFIGS);
+ snprintf(errmsgbuf, n,
+ "This mailing list only accepts posts from subscribers.");
+ return (ERROR + NO_SUCH_USER);
+ }
+ found = is_recipient (RNCfg, RemoteIdentifier);
+ FreeRoomNetworkStruct(&RNCfg);
+ end_critical_section(S_NETCONFIGS);
+
+ if (found) {
+ return (0);
+ }
+ else {
+ snprintf(errmsgbuf, n,
+ "This mailing list only accepts posts from subscribers.");
+ return (ERROR + NO_SUCH_USER);
+ }
+}
+
+
+/*
+ * cmd_netp() - authenticate to the server as another Citadel node polling
+ * for network traffic
+ */
+void cmd_netp(char *cmdbuf)
+{
+ struct CitContext *CCC = CC;
+ HashList *working_ignetcfg;
+ char *node;
+ StrBuf *NodeStr;
+ long nodelen;
+ int v;
+
+ const StrBuf *secret = NULL;
+ const StrBuf *nexthop = NULL;
+ char err_buf[SIZ] = "";
+
+ /* Authenticate */
+ node = CCC->curr_user;
+ nodelen = extract_token(CCC->curr_user, cmdbuf, 0, '|', sizeof CCC->curr_user);
+ NodeStr = NewStrBufPlain(node, nodelen);
+ /* load the IGnet Configuration to check node validity */
+ working_ignetcfg = CtdlLoadIgNetCfg();
+ v = CtdlIsValidNode(&nexthop, &secret, NodeStr, working_ignetcfg, NULL);
+ if (v != 0) {
+ snprintf(err_buf, sizeof err_buf,
+ "An unknown Citadel server called \"%s\" attempted to connect from %s [%s].\n",
+ node, CCC->cs_host, CCC->cs_addr
+ );
+ syslog(LOG_WARNING, "netconfig: %s", err_buf);
+ cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
+ CtdlAideMessage(err_buf, "IGNet Networking");
+ DeleteHash(&working_ignetcfg);
+ FreeStrBuf(&NodeStr);
+ return;
+ }
+
+ extract_token(CCC->user.password, cmdbuf, 1, '|', sizeof CCC->user.password);
+ if (strcasecmp(CCC->user.password, ChrPtr(secret))) {
+ snprintf(err_buf, sizeof err_buf,
+ "A Citadel server at %s [%s] failed to authenticate as network node \"%s\".\n",
+ CCC->cs_host, CCC->cs_addr, node
+ );
+ syslog(LOG_WARNING, "netconfig: %s", err_buf);
+ cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
+
+ CtdlAideMessage(err_buf, "IGNet Networking");
+ DeleteHash(&working_ignetcfg);
+ FreeStrBuf(&NodeStr);
+ return;
+ }
+
+ if (CtdlNetworkTalkingTo(node, nodelen, NTT_CHECK)) {
+ syslog(LOG_WARNING, "netconfig: duplicate session for network node <%s>", node);
+ cprintf("%d Already talking to %s right now\n", ERROR + RESOURCE_BUSY, node);
+ DeleteHash(&working_ignetcfg);
+ FreeStrBuf(&NodeStr);
+ return;
+ }
+ nodelen = safestrncpy(CCC->net_node, node, sizeof CCC->net_node);
+ CtdlNetworkTalkingTo(CCC->net_node, nodelen, NTT_ADD);
+ syslog(LOG_INFO, "netconfig: network node <%s> logged in from %s [%s]",
+ CCC->net_node, CCC->cs_host, CCC->cs_addr
+ );
+ cprintf("%d authenticated as network node '%s'\n", CIT_OK, CCC->net_node);
+ DeleteHash(&working_ignetcfg);
+ FreeStrBuf(&NodeStr);
+}
+
+
+/*-----------------------------------------------------------------------------*
+ * Network maps: evaluate other nodes *
+ *-----------------------------------------------------------------------------*/
+
+void DeleteNetMap(void *vNetMap)
+{
+ CtdlNetMap *TheNetMap = (CtdlNetMap*) vNetMap;
+ FreeStrBuf(&TheNetMap->NodeName);
+ FreeStrBuf(&TheNetMap->NextHop);
+ free(TheNetMap);
+}
+
+
+CtdlNetMap *NewNetMap(StrBuf *SerializedNetMap)
+{
+ const char *Pos = NULL;
+ CtdlNetMap *NM;
+
+ /* we need at least 3 pipes and some other text so its invalid. */
+ if (StrLength(SerializedNetMap) < 6)
+ return NULL;
+ NM = (CtdlNetMap *) malloc(sizeof(CtdlNetMap));
+
+ NM->NodeName=NewStrBuf();
+ StrBufExtract_NextToken(NM->NodeName, SerializedNetMap, &Pos, '|');
+
+ NM->lastcontact = StrBufExtractNext_long(SerializedNetMap, &Pos, '|');
+
+ NM->NextHop=NewStrBuf();
+ StrBufExtract_NextToken(NM->NextHop, SerializedNetMap, &Pos, '|');
+
+ return NM;
+}
+
+
+HashList* CtdlReadNetworkMap(void)
+{
+ const char *LinePos;
+ char *Cfg;
+ StrBuf *Buf;
+ StrBuf *LineBuf;
+ HashList *Hash;
+ CtdlNetMap *TheNetMap;
+
+ Hash = NewHash(1, NULL);
+ Cfg = CtdlGetSysConfig(IGNETMAP);
+ if ((Cfg == NULL) || IsEmptyStr(Cfg)) {
+ if (Cfg != NULL)
+ free(Cfg);
+ return Hash;
+ }
+
+ Buf = NewStrBufPlain(Cfg, -1);
+ free(Cfg);
+ LineBuf = NewStrBufPlain(NULL, StrLength(Buf));
+ LinePos = NULL;
+ while (StrBufSipLine(Buf, LineBuf, &LinePos))
+ {
+ TheNetMap = NewNetMap(LineBuf);
+ if (TheNetMap != NULL) { /* TODO: is the NodeName Uniq? */
+ Put(Hash, SKEY(TheNetMap->NodeName), TheNetMap, DeleteNetMap);
+ }
+ }
+ FreeStrBuf(&Buf);
+ FreeStrBuf(&LineBuf);
+ return Hash;
+}
+
+
+StrBuf *CtdlSerializeNetworkMap(HashList *Map)
+{
+ void *vMap;
+ const char *key;
+ long len;
+ StrBuf *Ret = NewStrBuf();
+ HashPos *Pos = GetNewHashPos(Map, 0);
+
+ while (GetNextHashPos(Map, Pos, &len, &key, &vMap))
+ {
+ CtdlNetMap *pMap = (CtdlNetMap*) vMap;
+ StrBufAppendBuf(Ret, pMap->NodeName, 0);
+ StrBufAppendBufPlain(Ret, HKEY("|"), 0);
+
+ StrBufAppendPrintf(Ret, "%ld", pMap->lastcontact, 0);
+ StrBufAppendBufPlain(Ret, HKEY("|"), 0);
+
+ StrBufAppendBuf(Ret, pMap->NextHop, 0);
+ StrBufAppendBufPlain(Ret, HKEY("\n"), 0);
+ }
+ DeleteHashPos(&Pos);
+ return Ret;
+}
+
+
+/*
+ * Learn topology from path fields
+ */
+void NetworkLearnTopology(char *node, char *path, HashList *the_netmap, int *netmap_changed)
+{
+ CtdlNetMap *pNM = NULL;
+ void *vptr;
+ char nexthop[256];
+ CtdlNetMap *nmptr;
+
+ if (GetHash(the_netmap, node, strlen(node), &vptr) &&
+ (vptr != NULL))/* TODO: is the NodeName Uniq? */
+ {
+ pNM = (CtdlNetMap*)vptr;
+ extract_token(nexthop, path, 0, '!', sizeof nexthop);
+ if (!strcmp(nexthop, ChrPtr(pNM->NextHop))) {
+ pNM->lastcontact = time(NULL);
+ (*netmap_changed) ++;
+ return;
+ }
+ }
+
+ /* If we got here then it's not in the map, so add it. */
+ nmptr = (CtdlNetMap *) malloc(sizeof (CtdlNetMap));
+ nmptr->NodeName = NewStrBufPlain(node, -1);
+ nmptr->lastcontact = time(NULL);
+ nmptr->NextHop = NewStrBuf ();
+ StrBufExtract_tokenFromStr(nmptr->NextHop, path, strlen(path), 0, '!');
+ /* TODO: is the NodeName Uniq? */
+ Put(the_netmap, SKEY(nmptr->NodeName), nmptr, DeleteNetMap);
+ (*netmap_changed) ++;