Only count throttle entries that cause rejection in /stats t.

[irc/rqf/shadowircd.git] / src / chmode.c

diff --git a/src/chmode.c b/src/chmode.c
index f8878bc919d40c9432fa9b190d07b3db425b2dad..c73609372b3d99bc3256be90bdaf8d5a3ab32253 100644 (file)
--- a/src/chmode.c
+++ b/src/chmode.c
@@ -65,15 +65,40 @@ static int mode_limit;
 static int mode_limit_simple;
 static int mask_pos;
 
+char cflagsbuf[256];
+char cflagsmyinfo[256];
+
 int chmode_flags[256];
+
+/* OPTIMIZE ME! -- dwr */
 void
-find_orphaned_cflags(void)
+construct_noparam_modes(void)
 {
        int i;
-       static int prev_chmode_flags[256];
+        char *ptr = cflagsbuf;
+       char *ptr2 = cflagsmyinfo;
+        static int prev_chmode_flags[256];
+        
+        *ptr = '\0';
+       *ptr2 = '\0';
 
-       for (i = 0; i < 256; i++)
+       for(i = 0; i < 256; i++)
        {
+               if( !(chmode_table[i].set_func == chm_ban) && 
+                       !(chmode_table[i].set_func == chm_forward) &&
+                       !(chmode_table[i].set_func == chm_throttle) &&
+                        !(chmode_table[i].set_func == chm_key) &&
+                        !(chmode_table[i].set_func == chm_limit) &&
+                        !(chmode_table[i].set_func == chm_op) &&
+                        !(chmode_table[i].set_func == chm_voice))
+               {
+                       chmode_flags[i] = chmode_table[i].mode_type;
+               }
+               else
+               {
+                       chmode_flags[i] = 0;
+               }
+                
                if (prev_chmode_flags[i] != 0 && prev_chmode_flags[i] != chmode_flags[i])
                {
                        if (chmode_flags[i] == 0)
@@ -89,29 +114,40 @@ find_orphaned_cflags(void)
                }
                else
                        prev_chmode_flags[i] = chmode_flags[i];
-       }
-}
-
-void
-construct_noparam_modes(void)
-{
-       int i;
-
-       for(i = 0; i < 256; i++)
-       {
-               if( (chmode_table[i].set_func == chm_simple) ||
-                       (chmode_table[i].set_func == chm_staff) ||
-                       (chmode_table[i].set_func == chm_regonly))
+                
+               switch (chmode_flags[i])
                {
-                       chmode_flags[i] = chmode_table[i].mode_type;
+                   case MODE_EXLIMIT:
+                   case MODE_DISFORWARD:
+                       if(ConfigChannel.use_forward)
+                       {
+                           *ptr++ = (char) i;
+                       }
+                       
+                       break;
+                   case MODE_REGONLY:
+                       if(rb_dlink_list_length(&service_list))
+                       {
+                           *ptr++ = (char) i;
+                       }
+
+                       break;
+                   default:
+                       if(chmode_flags[i] != 0)
+                       {
+                           *ptr++ = (char) i;
+                       }
                }
-               else
+               
+               /* Should we leave orphaned check here? -- dwr */
+               if(!(chmode_table[i].set_func == chm_nosuch) && !(chmode_table[i].set_func == chm_orphaned))
                {
-                       chmode_flags[i] = 0;
+                   *ptr2++ = (char) i;
                }
        }
         
-        find_orphaned_cflags();
+        *ptr++ = '\0';
+       *ptr2++ = '\0';
 }
 
 /*