Remove trailing whitespace from all .c and .h files.

[solanum.git] / src / reject.c

diff --git a/src/reject.c b/src/reject.c
index b5035c6567f0854897a1625d6b201f16b2742359..f5f547c99f799820bac863f6a4adb5707dd11536 100644 (file)
--- a/src/reject.c
+++ b/src/reject.c
@@ -77,12 +77,12 @@ reject_exit(void *unused)
        rb_dlink_node *ptr, *ptr_next;
        delay_t *ddata;
        static const char *errbuf = "ERROR :Closing Link: (*** Banned (cache))\r\n";
-       
+
        RB_DLINK_FOREACH_SAFE(ptr, ptr_next, delay_exit.head)
        {
                ddata = ptr->data;
 
-               rb_write(ddata->F, errbuf, strlen(errbuf));             
+               rb_write(ddata->F, errbuf, strlen(errbuf));
                rb_close(ddata->F);
                rb_free(ddata);
        }
@@ -97,11 +97,11 @@ reject_expires(void *unused)
        rb_dlink_node *ptr, *next;
        rb_patricia_node_t *pnode;
        reject_t *rdata;
-       
+
        RB_DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
        {
                pnode = ptr->data;
-               rdata = pnode->data;            
+               rdata = pnode->data;
 
                if(rdata->time + ConfigFileEntry.reject_duration > rb_current_time())
                        continue;
@@ -122,6 +122,25 @@ init_reject(void)
        rb_event_add("throttle_expires", throttle_expires, NULL, 10);
 }
 
+unsigned long
+throttle_size(void)
+{
+       unsigned long count;
+       rb_dlink_node *ptr;
+       rb_patricia_node_t *pnode;
+       throttle_t *t;
+
+       count = 0;
+       RB_DLINK_FOREACH(ptr, throttle_list.head)
+       {
+               pnode = ptr->data;
+               t = pnode->data;
+               if (t->count > ConfigFileEntry.throttle_count)
+                       count++;
+       }
+
+       return count;
+}
 
 void
 add_reject(struct Client *client_p, const char *mask1, const char *mask2)
@@ -171,7 +190,7 @@ check_reject(rb_fde_t *F, struct sockaddr *addr)
        /* Reject is disabled */
        if(ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_duration == 0)
                return 0;
-               
+
        pnode = rb_match_ip(reject_tree, addr);
        if(pnode != NULL)
        {
@@ -187,18 +206,43 @@ check_reject(rb_fde_t *F, struct sockaddr *addr)
                        rb_dlinkAdd(ddata, &ddata->node, &delay_exit);
                        return 1;
                }
-       }       
-       /* Caller does what it wants */ 
+       }
+       /* Caller does what it wants */
        return 0;
 }
 
-void 
+int
+is_reject_ip(struct sockaddr *addr)
+{
+       rb_patricia_node_t *pnode;
+       reject_t *rdata;
+       int duration;
+
+       /* Reject is disabled */
+       if(ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_duration == 0)
+               return 0;
+
+       pnode = rb_match_ip(reject_tree, addr);
+       if(pnode != NULL)
+       {
+               rdata = pnode->data;
+
+               if(rdata->count > (unsigned long)ConfigFileEntry.reject_after_count)
+               {
+                       duration = rdata->time + ConfigFileEntry.reject_duration - rb_current_time();
+                       return duration > 0 ? duration : 1;
+               }
+       }
+       return 0;
+}
+
+void
 flush_reject(void)
 {
        rb_dlink_node *ptr, *next;
        rb_patricia_node_t *pnode;
        reject_t *rdata;
-       
+
        RB_DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
        {
                pnode = ptr->data;
@@ -209,11 +253,11 @@ flush_reject(void)
        }
 }
 
-int 
+int
 remove_reject_ip(const char *ip)
 {
        rb_patricia_node_t *pnode;
-       
+
        /* Reject is disabled */
        if(ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_duration == 0)
                return -1;
@@ -237,7 +281,7 @@ remove_reject_mask(const char *mask1, const char *mask2)
        reject_t *rdata;
        uint32_t hashv;
        int n = 0;
-       
+
        hashv = 0;
        if (mask1 != NULL)
                hashv ^= fnv_hash_upper((const unsigned char *)mask1, 32);
@@ -269,8 +313,10 @@ throttle_add(struct sockaddr *addr)
                t = pnode->data;
 
                if(t->count > ConfigFileEntry.throttle_count)
-                       return 1;                       
-
+               {
+                       ServerStats.is_thr++;
+                       return 1;
+               }
                /* Stop penalizing them after they've been throttled */
                t->last = rb_current_time();
                t->count++;
@@ -281,27 +327,64 @@ throttle_add(struct sockaddr *addr)
                if(GET_SS_FAMILY(addr) == AF_INET6)
                        bitlen = 128;
 #endif
-               t = rb_malloc(sizeof(throttle_t));      
+               t = rb_malloc(sizeof(throttle_t));
                t->last = rb_current_time();
                t->count = 1;
                pnode = make_and_lookup_ip(throttle_tree, addr, bitlen);
                pnode->data = t;
-               rb_dlinkAdd(pnode, &t->node, &throttle_list); 
-       }       
+               rb_dlinkAdd(pnode, &t->node, &throttle_list);
+       }
+       return 0;
+}
+
+int
+is_throttle_ip(struct sockaddr *addr)
+{
+       throttle_t *t;
+       rb_patricia_node_t *pnode;
+       int duration;
+
+       if((pnode = rb_match_ip(throttle_tree, addr)) != NULL)
+       {
+               t = pnode->data;
+               if(t->count > ConfigFileEntry.throttle_count)
+               {
+                       duration = t->last + ConfigFileEntry.throttle_duration - rb_current_time();
+                       return duration > 0 ? duration : 1;
+               }
+       }
        return 0;
 }
 
+void
+flush_throttle(void)
+{
+       rb_dlink_node *ptr, *next;
+       rb_patricia_node_t *pnode;
+       throttle_t *t;
+
+       RB_DLINK_FOREACH_SAFE(ptr, next, throttle_list.head)
+       {
+               pnode = ptr->data;
+               t = pnode->data;
+
+               rb_dlinkDelete(ptr, &throttle_list);
+               rb_free(t);
+               rb_patricia_remove(throttle_tree, pnode);
+       }
+}
+
 static void
 throttle_expires(void *unused)
 {
        rb_dlink_node *ptr, *next;
        rb_patricia_node_t *pnode;
        throttle_t *t;
-       
+
        RB_DLINK_FOREACH_SAFE(ptr, next, throttle_list.head)
        {
                pnode = ptr->data;
-               t = pnode->data;                
+               t = pnode->data;
 
                if(t->last + ConfigFileEntry.throttle_duration > rb_current_time())
                        continue;