updated modules/network/*.c to new logging standard

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

diff --git a/citadel/modules/network/serv_netfilter.c b/citadel/modules/network/serv_netfilter.c
index 450e803b2bca52655cabf98886b649b82910961d..121ef3116658291fee7785e817fe0b16443239ad 100644 (file)
--- a/citadel/modules/network/serv_netfilter.c
+++ b/citadel/modules/network/serv_netfilter.c
@@ -1,21 +1,15 @@
 /*
  * A server-side module for Citadel designed to filter idiots off the network.
  * 
- * Copyright (c) 2002-2012 by the citadel.org team
+ * Copyright (c) 2002-2017 by the citadel.org team
  *
- *  This program is open source software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3.
- *  
- *  
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  
- *  
- *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "sysdep.h"
@@ -149,29 +143,29 @@ int filter_the_idiots(struct CtdlMessage *msg, char *target_room) {
                zap_room = 0;
                zap_node = 0;
 
-               if (msg->cm_fields['A'] != NULL) {
-                       if ( (!strcasecmp(msg->cm_fields['A'], fptr->fl_user))
+               if (!CM_IsEmpty(msg, eAuthor)) {
+                       if ( (!strcasecmp(msg->cm_fields[eAuthor], fptr->fl_user))
                           || (fptr->fl_user[0] == 0) ) {
                                zap_user = 1;
                        }
                }
 
-               if (msg->cm_fields['C'] != NULL) {
-                       if ( (!strcasecmp(msg->cm_fields['C'], fptr->fl_room))
+               if (!CM_IsEmpty(msg, eRemoteRoom)) {
+                       if ( (!strcasecmp(msg->cm_fields[eRemoteRoom], fptr->fl_room))
                           || (fptr->fl_room[0] == 0) ) {
                                zap_room = 1;
                        }
                }
 
-               if (msg->cm_fields['O'] != NULL) {
-                       if ( (!strcasecmp(msg->cm_fields['O'], fptr->fl_room))
+               if (!CM_IsEmpty(msg, eOriginalRoom)) {
+                       if ( (!strcasecmp(msg->cm_fields[eOriginalRoom], fptr->fl_room))
                           || (fptr->fl_room[0] == 0) ) {
                                zap_room = 1;
                        }
                }
 
-               if (msg->cm_fields['N'] != NULL) {
-                       if ( (!strcasecmp(msg->cm_fields['N'], fptr->fl_node))
+               if (!CM_IsEmpty(msg, eNodeName)) {
+                       if ( (!strcasecmp(msg->cm_fields[eNodeName], fptr->fl_node))
                           || (fptr->fl_node[0] == 0) ) {
                                zap_node = 1;
                        }
@@ -189,7 +183,10 @@ CTDL_MODULE_INIT(netfilter)
 {
        if (!threading)
        {
+/*
+  currently unsupported.
                CtdlRegisterNetprocHook(filter_the_idiots);
+*/
        }
        
        /* return our module name for the log */