$avp(s:callee_adm_block_in_clir)

squeeze-backports
Victor Seva 12 years ago
parent 0191a29179
commit 7af63397d5

@ -1023,7 +1023,6 @@ route[ROUTE_LOAD_CALLEE_PREF]
avp_copy("$avp(s:block_in_clir)", "$avp(s:callee_block_in_clir)/d"); avp_copy("$avp(s:block_in_clir)", "$avp(s:callee_block_in_clir)/d");
avp_copy("$avp(s:adm_block_in_mode)", "$avp(s:callee_adm_block_in_mode)/d"); avp_copy("$avp(s:adm_block_in_mode)", "$avp(s:callee_adm_block_in_mode)/d");
avp_copy("$avp(s:adm_block_in_list)", "$avp(s:callee_adm_block_in_list)/gd"); avp_copy("$avp(s:adm_block_in_list)", "$avp(s:callee_adm_block_in_list)/gd");
avp_copy("$avp(s:adm_block_in_clir)", "$avp(s:callee_adm_block_in_clir)/d");
avp_copy("$avp(s:ext_subscriber_id)", "$avp(s:callee_ext_subscriber_id)/d"); avp_copy("$avp(s:ext_subscriber_id)", "$avp(s:callee_ext_subscriber_id)/d");
avp_copy("$avp(s:ext_contract_id)", "$avp(s:callee_ext_contract_id)/d"); avp_copy("$avp(s:ext_contract_id)", "$avp(s:callee_ext_contract_id)/d");
@ -3301,7 +3300,7 @@ route[ROUTE_BLOCK_IN]
if($avp(s:callee_adm_block_in_mode) == 1) if($avp(s:callee_adm_block_in_mode) == 1)
{ {
xlog("L_INFO", "Admin callee block mode is 'closed' - [% logreq -%]\n"); xlog("L_INFO", "Admin callee block mode is 'closed' - [% logreq -%]\n");
if($avp(s:caller_clir) == 1 && $avp(s:callee_adm_block_in_clir) == 0) if($avp(s:caller_clir) == 1 && $xavp(callee_real_prefs=>adm_block_in_clir) == 0)
{ {
# also block CLIR in whitelist-mode if block_in_clir is unset # also block CLIR in whitelist-mode if block_in_clir is unset
xlog("L_INFO", "Anonymous caller blocked by Admin in 'closed' mode - [% logreq -%]\n"); xlog("L_INFO", "Anonymous caller blocked by Admin in 'closed' mode - [% logreq -%]\n");
@ -3342,7 +3341,7 @@ route[ROUTE_BLOCK_IN]
$(avp(s:announce_reason)[*]) = "Blocked by Admin"; $(avp(s:announce_reason)[*]) = "Blocked by Admin";
route(ROUTE_EARLY_REJECT); route(ROUTE_EARLY_REJECT);
} }
else if($avp(s:caller_clir) == 1 && $avp(s:callee_adm_block_in_clir) == 1) else if($avp(s:caller_clir) == 1 && $xavp(callee_real_prefs=>adm_block_in_clir) == 1)
{ {
xlog("L_INFO", "Anonymous caller blocked by Admin in 'open' mode - [% logreq -%]\n"); xlog("L_INFO", "Anonymous caller blocked by Admin in 'open' mode - [% logreq -%]\n");

Loading…
Cancel
Save