Destination blacklist parameters have been updated to the config

framework, the following variables are changeable runtime:

- use_dst_blacklist
- dst_blacklist_expire
- dst_blacklist_mem

diff --git a/cfg.y b/cfg.y
index ac4cbf2..45d9766 100644 (file)
--- a/cfg.y
+++ b/cfg.y
@@ -645,11 +645,11 @@ assign_stm:
        | DNS_CACHE_GC_INT error { yyerror("boolean value expected"); }
        | DNS_CACHE_DEL_NONEXP EQUAL NUMBER   { IF_DNS_CACHE(dns_cache_del_nonexp=$3); }
        | DNS_CACHE_DEL_NONEXP error { yyerror("boolean value expected"); }
-       | USE_DST_BLST EQUAL NUMBER   { IF_DST_BLACKLIST(use_dst_blacklist=$3); }
+       | USE_DST_BLST EQUAL NUMBER   { IF_DST_BLACKLIST(default_core_cfg.use_dst_blacklist=$3); }
        | USE_DST_BLST error { yyerror("boolean value expected"); }
-       | DST_BLST_MEM EQUAL NUMBER   { IF_DST_BLACKLIST(blst_max_mem=$3); }
+       | DST_BLST_MEM EQUAL NUMBER   { IF_DST_BLACKLIST(default_core_cfg.blst_max_mem=$3); }
        | DST_BLST_MEM error { yyerror("boolean value expected"); }
-       | DST_BLST_TTL EQUAL NUMBER   { IF_DST_BLACKLIST(blst_timeout=$3); }
+       | DST_BLST_TTL EQUAL NUMBER   { IF_DST_BLACKLIST(default_core_cfg.blst_timeout=$3); }
        | DST_BLST_TTL error { yyerror("boolean value expected"); }
        | DST_BLST_GC_INT EQUAL NUMBER { IF_DST_BLACKLIST(blst_timer_interval=$3);}
        | DST_BLST_GC_INT error { yyerror("boolean value expected"); }

diff --git a/cfg_core.c b/cfg_core.c
index 01bf796..78b8f81 100644 (file)
--- a/cfg_core.c
+++ b/cfg_core.c
@@ -30,16 +30,30 @@
  */
 
 #include "dprint.h"
+#include "dst_blacklist.h"
 #include "cfg/cfg.h"
 #include "cfg_core.h"
 
 struct cfg_group_core default_core_cfg = {
-       L_DEFAULT /*  print only msg. < L_WARN */
+       L_DEFAULT, /*  print only msg. < L_WARN */
+#ifdef USE_DST_BLACKLIST
+       0, /* dst blacklist is disabled by default */
+       DEFAULT_BLST_TIMEOUT,
+       DEFAULT_BLST_MAX_MEM,
+#endif
 };
 
 void   *core_cfg = &default_core_cfg;
 
 cfg_def_t core_cfg_def[] = {
        {"debug",       CFG_VAR_INT,    0, 0, 0, 0, "debug level"},
+#ifdef USE_DST_BLACKLIST
+       {"use_dst_blacklist",   CFG_VAR_INT,    0, 0, 0, 0,
+               "enable/disable destination blacklisting"},
+       {"dst_blacklist_expire",        CFG_VAR_INT,    0, 0, 0, 0,
+               "how much time (in s) a blacklisted destination is kept in the list"},
+       {"dst_blacklist_mem",   CFG_VAR_INT,    0, 0, blst_max_mem_fixup, 0,
+               "maximum shared memory amount (in KB) used for keeping the blacklisted destinations"},
+#endif
        {0, 0, 0, 0, 0, 0}
 };

diff --git a/cfg_core.h b/cfg_core.h
index c80abd5..4152c62 100644 (file)
--- a/cfg_core.h
+++ b/cfg_core.h
@@ -46,6 +46,12 @@ extern void  *core_cfg;
 
 struct cfg_group_core {
        int     debug;
+#ifdef USE_DST_BLACKLIST
+       int     use_dst_blacklist; /* 1 if blacklist is enabled */
+       unsigned int    blst_timeout; /* blacklist entry ttl */
+       unsigned int    blst_max_mem; /* maximum memory used for the
+                                       blacklist entries */
+#endif
 };
 
 extern struct cfg_group_core default_core_cfg;

diff --git a/dst_blacklist.c b/dst_blacklist.c
index 8d758f9..1ca0f81 100644 (file)
--- a/dst_blacklist.c
+++ b/dst_blacklist.c
@@ -40,6 +40,7 @@
 
 #include "dst_blacklist.h"
 #include "globals.h"
+#include "cfg_core.h"
 #include "mem/shm_mem.h"
 #include "hashes.h"
 #include "locking.h"
@@ -71,7 +72,6 @@ struct dst_blst_entry{
 
 
 #define DST_BLST_HASH_SIZE             1024
-#define DEFAULT_BLST_MAX_MEM   250 /* 1 Kb FIXME (debugging)*/
 #define DEFAULT_BLST_TIMER_INTERVAL            60 /* 1 min */
 
 
@@ -126,9 +126,6 @@ struct dst_blst_lst_head{
 static struct timer_ln* blst_timer_h=0;
 
 static volatile unsigned int* blst_mem_used=0;
-unsigned int  blst_max_mem=DEFAULT_BLST_MAX_MEM; /* maximum memory used
-                                                                                                       for the blacklist entries*/
-unsigned int blst_timeout=DEFAULT_BLST_TIMEOUT;
 unsigned int blst_timer_interval=DEFAULT_BLST_TIMER_INTERVAL;
 struct dst_blst_lst_head* dst_blst_hash=0;
 
@@ -452,7 +449,7 @@ int init_dst_blacklist()
                goto error;
        }
        /* fix options */
-       blst_max_mem<<=10; /* in Kb */ /* TODO: test with 0 */
+       default_core_cfg.blst_max_mem<<=10; /* in Kb */ /* TODO: test with 0 */
        if (blst_timer_interval){
                timer_init(blst_timer_h, blst_timer, 0 ,0); /* slow timer */
                if (timer_add(blst_timer_h, S_TO_TICKS(blst_timer_interval))<0){
@@ -691,7 +688,8 @@ inline static int dst_blacklist_add_ip(unsigned char err_flags,
                        e->flags|=err_flags;
                        e->expire=now+timeout; /* update the timeout */
                }else{
-                       if (unlikely((*blst_mem_used+size)>=blst_max_mem)){
+                       if (unlikely((*blst_mem_used+size) >=
+                                       cfg_get(core, core_cfg, blst_max_mem))){
 #ifdef USE_DST_BLACKLIST_STATS
                                dst_blacklist_stats[process_no].bkl_lru_cnt++;
 #endif
@@ -700,7 +698,8 @@ inline static int dst_blacklist_add_ip(unsigned char err_flags,
                                 * spend more then 250 ms*/
                                dst_blacklist_clean_expired(*blst_mem_used/16*14, 0,
                                                                                                                        MS_TO_TICKS(250));
-                               if (unlikely(*blst_mem_used+size>=blst_max_mem)){
+                               if (unlikely(*blst_mem_used+size >=
+                                               cfg_get(core, core_cfg, blst_max_mem))){
                                        ret=-1;
                                        goto error;
                                }
@@ -829,11 +828,11 @@ int dst_blacklist_del(struct dest_info* si, struct sip_msg* msg)
 /* rpc functions */
 void dst_blst_mem_info(rpc_t* rpc, void* ctx)
 {
-       if (!use_dst_blacklist){
+       if (!cfg_get(core, core_cfg, use_dst_blacklist)){
                rpc->fault(ctx, 500, "dst blacklist support disabled");
                return;
        }
-       rpc->add(ctx, "dd",  *blst_mem_used, blst_max_mem);
+       rpc->add(ctx, "dd",  *blst_mem_used, cfg_get(core, core_cfg, blst_max_mem));
 }
 
 
@@ -891,7 +890,7 @@ void dst_blst_stats_get(rpc_t* rpc, void* c)
                NULL
        };
        
-       if (!use_dst_blacklist){
+       if (!cfg_get(core, core_cfg, use_dst_blacklist)){
                rpc->fault(c, 500, "dst blacklist support disabled");
                return;
        }
@@ -934,7 +933,7 @@ void dst_blst_debug(rpc_t* rpc, void* ctx)
        ticks_t now;
        struct ip_addr ip;
 
-       if (!use_dst_blacklist){
+       if (!cfg_get(core, core_cfg, use_dst_blacklist)){
                rpc->fault(ctx, 500, "dst blacklist support disabled");
                return;
        }
@@ -964,7 +963,7 @@ void dst_blst_hash_stats(rpc_t* rpc, void* ctx)
 
        n=0;
 #endif
-       if (!use_dst_blacklist){
+       if (!cfg_get(core, core_cfg, use_dst_blacklist)){
                rpc->fault(ctx, 500, "dst blacklist support disabled");
                return;
        }
@@ -989,7 +988,7 @@ void dst_blst_view(rpc_t* rpc, void* ctx)
        ticks_t now;
        struct ip_addr ip;
 
-       if (!use_dst_blacklist){
+       if (!cfg_get(core, core_cfg, use_dst_blacklist)){
                rpc->fault(ctx, 500, "dst blacklist support disabled");
                return;
        }
@@ -1046,7 +1045,7 @@ void dst_blst_flush(void)
 /* rpc wrapper function for dst_blst_flush() */
 void dst_blst_delete_all(rpc_t* rpc, void* ctx)
 {
-       if (!use_dst_blacklist){
+       if (!cfg_get(core, core_cfg, use_dst_blacklist)){
                rpc->fault(ctx, 500, "dst blacklist support disabled");
                return;
        }
@@ -1061,7 +1060,7 @@ void dst_blst_add(rpc_t* rpc, void* ctx)
        unsigned char err_flags;
        struct ip_addr *ip_addr;
 
-       if (!use_dst_blacklist){
+       if (!cfg_get(core, core_cfg, use_dst_blacklist)){
                rpc->fault(ctx, 500, "dst blacklist support disabled");
                return;
        }
@@ -1092,9 +1091,19 @@ void dst_blst_add(rpc_t* rpc, void* ctx)
        }
 
        if (dst_blacklist_add_ip(err_flags, proto, ip_addr, port, 
-                                                                                       S_TO_TICKS(blst_timeout)))
+                                   S_TO_TICKS(cfg_get(core, core_cfg, blst_timeout))))
                rpc->fault(ctx, 400, "Failed to add the entry to the blacklist");
 }
 
+/* KByte to Byte conversion */
+int blst_max_mem_fixup(void *handle, str *name, void **val)
+{
+       unsigned int    u;
+
+       u = ((unsigned int)(long)(*val))<<10;
+       (*val) = (void *)(long)u;
+       return 0;
+}
+
 #endif /* USE_DST_BLACKLIST */
 

diff --git a/dst_blacklist.h b/dst_blacklist.h
index 1582583..345274b 100644 (file)
--- a/dst_blacklist.h
+++ b/dst_blacklist.h
@@ -38,8 +38,10 @@
 #include "ip_addr.h"
 #include "parser/msg_parser.h"
 #include "timer_ticks.h"
+#include "cfg_core.h"
 
 #define DEFAULT_BLST_TIMEOUT           60  /* 1 min. */
+#define DEFAULT_BLST_MAX_MEM           250 /* 250 KB */
 
 /* flags: */
 #define BLST_IS_IPV6           1               /* set if the address is ipv6 */
@@ -89,7 +91,8 @@ int dst_blacklist_add_to(unsigned char err_flags, struct dest_info* si,
 
 /* adds a dst to the blacklist with default timeout */
 #define dst_blacklist_add(err_flags, si, msg) \
-       dst_blacklist_add_to((err_flags), (si), (msg), S_TO_TICKS(blst_timeout))
+       dst_blacklist_add_to((err_flags), (si), (msg), \
+               S_TO_TICKS(cfg_get(core, core_cfg, blst_timeout)))
 
 int dst_is_blacklisted(struct dest_info* si, struct sip_msg* msg);
 /* delete an entry from the blacklist */
@@ -100,4 +103,7 @@ int dst_blacklist_del(struct dest_info* si, struct sip_msg* msg);
  */
 void dst_blst_flush(void);
 
+/* KByte to Byte conversion */
+int blst_max_mem_fixup(void *handle, str *name, void **val);
+
 #endif

diff --git a/forward.c b/forward.c
index fc87b50..71a8242 100644 (file)
--- a/forward.c
+++ b/forward.c
@@ -74,6 +74,7 @@
 #include "route.h"
 #include "dprint.h"
 #include "globals.h"
+#include "cfg_core.h"
 #include "data_lump.h"
 #include "ut.h"
 #include "mem/mem.h"
@@ -419,7 +420,7 @@ int forward_request(struct sip_msg* msg, str* dst, unsigned short port,
 #endif
                }
 #ifdef USE_DST_BLACKLIST
-               if (use_dst_blacklist){
+               if (cfg_get(core, core_cfg, use_dst_blacklist)){
                        if (dst_is_blacklisted(send_info, msg)){
                                su2ip_addr(&ip, &send_info->to);
                                LOG(L_DBG, "DEBUG: blacklisted destination:%s:%d (%d)\n",
@@ -437,7 +438,7 @@ int forward_request(struct sip_msg* msg, str* dst, unsigned short port,
                if (msg_send(send_info, buf, len)<0){
                        ret=ser_error=E_SEND;
 #ifdef USE_DST_BLACKLIST
-                       if (use_dst_blacklist)
+                       if (cfg_get(core, core_cfg, use_dst_blacklist))
                                dst_blacklist_add(BLST_ERR_SEND, send_info, msg);
 #endif
 #ifdef USE_DNS_FAILOVER

diff --git a/globals.h b/globals.h
index 629f350..4ac0e94 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -222,10 +222,6 @@ extern struct t_dns_cache_stats* dns_cache_stats;
 #endif /* USE_DNS_CACHE_STATS */
 #endif
 #ifdef USE_DST_BLACKLIST
-extern int use_dst_blacklist; /* 1 if the blacklist is enabled */
-extern unsigned int  blst_max_mem; /* maximum memory used for the blacklist
-                                                                         entries*/
-extern unsigned int blst_timeout; /* blacklist entry ttl */
 extern unsigned int blst_timer_interval; /*blacklist gc timer interval (in s)*/
 
 #ifdef USE_DST_BLACKLIST_STATS

diff --git a/main.c b/main.c
index c1f6cec..adb5f4e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -375,9 +375,6 @@ int mcast_ttl = -1; /* if -1, don't touch it, use the default (usually 1) */
 int use_dns_cache=1; /* 1 if the cache is enabled, 0 otherwise */
 int use_dns_failover=0; /* 1 if failover is enabled, 0 otherwise */
 #endif
-#ifdef USE_DST_BLACKLIST
-int use_dst_blacklist=0; /* 1 if the blacklist is enabled */
-#endif
 
 int tos = IPTOS_LOWDELAY;
 int pmtu_discovery = 0;

diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c
index 67b5148..ebd7eaf 100644 (file)
--- a/modules/tm/t_fwd.c
+++ b/modules/tm/t_fwd.c
@@ -84,6 +84,7 @@
 #include "../../timer.h"
 #include "../../hash_func.h"
 #include "../../globals.h"
+#include "../../cfg_core.h"
 #include "../../mem/mem.h"
 #include "../../dset.h"
 #include "../../action.h"
@@ -690,7 +691,7 @@ int t_send_branch( struct cell *t, int branch, struct sip_msg* p_msg ,
                return -1; /* drop, try next branch */
        }
 #ifdef USE_DST_BLACKLIST
-       if (use_dst_blacklist
+       if (cfg_get(core, core_cfg, use_dst_blacklist)
                && p_msg
                && (p_msg->REQ_METHOD & tm_blst_methods_lookup)
        ){
@@ -737,7 +738,7 @@ int t_send_branch( struct cell *t, int branch, struct sip_msg* p_msg ,
                                                        ip_addr2a(&ip), su_getport(&uac->request.dst.to),
                                                        uac->request.dst.proto);
 #ifdef USE_DST_BLACKLIST
-               if (use_dst_blacklist)
+               if (cfg_get(core, core_cfg, use_dst_blacklist))
                        dst_blacklist_add(BLST_ERR_SEND, &uac->request.dst, p_msg);
 #endif
 #ifdef USE_DNS_FAILOVER

diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c
index b46674a..8d22998 100644 (file)
--- a/modules/tm/t_reply.c
+++ b/modules/tm/t_reply.c
@@ -1806,7 +1806,7 @@ int reply_received( struct sip_msg  *p_msg )
        }
 #ifdef USE_DST_BLACKLIST
                /* add temporary to the blacklist the source of a 503 reply */
-               if (tm_blst_503 && use_dst_blacklist && (msg_status==503)){
+               if (tm_blst_503 && cfg_get(core, core_cfg, use_dst_blacklist) && (msg_status==503)){
                        blst_503_timeout=tm_blst_503_default;
                        if ((parse_headers(p_msg, HDR_RETRY_AFTER_F, 0)==0) && 
                                (p_msg->parsed_flag & HDR_RETRY_AFTER_F)){

diff --git a/modules/tm/timer.c b/modules/tm/timer.c
index 0953db6..f6ee0e0 100644 (file)
--- a/modules/tm/timer.c
+++ b/modules/tm/timer.c
@@ -455,7 +455,7 @@ inline static void final_response_handler(  struct retr_buf* r_buf,
                        (t->uac[r_buf->branch].last_received==0)){
                /* no reply received */
 #ifdef USE_DST_BLACKLIST
-               if (use_dst_blacklist
+               if (cfg_get(core, core_cfg, use_dst_blacklist)
                        && r_buf->my_T
                        && r_buf->my_T->uas.request
                        && (r_buf->my_T->uas.request->REQ_METHOD & tm_blst_methods_add)