Replace all discrete checks for empty message fields by CM_IsEmpty()

[citadel.git] / citadel / modules / network / serv_netspool.c

diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index cbff2d41223804780b51b4b32426377a6c3aaf16..586b945da602211353986efa4f10609f0e841f66 100644 (file)
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -160,7 +160,23 @@ int HaveSpoolConfig(OneRoomNetCfg* RNCfg)
        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 = strlen(config.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,     
@@ -289,7 +305,6 @@ void CalcListID(SpoolControl *sc)
                StrBufAppendBuf(sc->ListID, RoomName, 0);
                StrBufAppendBufPlain(sc->ListID, HKEY("."), 0);
                StrBufAppendBufPlain(sc->ListID, config.c_fqdn, -1, 0);
-               FreeStrBuf(&RoomName);
                /*
                 * this used to be:
                 * roomname <Room-Number.list-id.fqdn>
@@ -312,6 +327,7 @@ void CalcListID(SpoolControl *sc)
                StrBufLowerCase(sc->Users[roommailalias]);
        }
 
+       FreeStrBuf(&RoomName);
 }
 
 
@@ -408,7 +424,6 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg,
        struct recptypes *recp = NULL;
        char target_room[ROOMNAMELEN];
        struct ser_ret sermsg;
-       char *oldpath = NULL;
        char filename[PATH_MAX];
        FILE *fp;
        const StrBuf *nexthop = NULL;
@@ -439,36 +454,23 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg,
        for (pos = 3; pos < size; ++pos) {
                field = buffer[pos];
                len = strlen(buffer + pos + 1);
-               msg->cm_fields[field] = malloc(len + 1);
-               memcpy (msg->cm_fields[field], buffer+ pos + 1, len + 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(msg->cm_fields[eDestination], -1);
                        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);
@@ -525,9 +527,9 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg,
        }
 
        /* 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);
        }
@@ -535,13 +537,13 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg,
        /* 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"
@@ -555,21 +557,15 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg,
        }
 
        /* 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) {