diff --git a/kamailio/presence-fast-pickup.cfg b/kamailio/presence-fast-pickup.cfg index 77669a6..11813b7 100644 --- a/kamailio/presence-fast-pickup.cfg +++ b/kamailio/presence-fast-pickup.cfg @@ -105,7 +105,7 @@ route[PRESENCE_FAST_PICKUP_ATTEMPT] ##### STAR 5 CHECK #### if($sel(cfg_get.kazoo.presence_fast_pickup_star_5) == 1) { - if($(ru{uri.user}) =~ "\*5") { + if($(ru{uri.user}) =~ "^\*5") { $var(park) = $_s(*3$(ru{uri.user}{s.substr,2,0})@$(ru{uri.domain})); if($sht(park=>$var(park)) != $null) { $du = $sht(park=>$var(park)); @@ -126,11 +126,11 @@ route[PRESENCE_FAST_PICKUP_ATTEMPT] } ##### CALL-PARK IN KAZOO #### - $var(park_extension) = "\*3"; + $var(park_extension) = "^\*3"; if($sel(cfg_get.kazoo.presence_fast_pickup_star_5) == 1) { - $var(park_extension) = "\*[3,5]"; + $var(park_extension) = "^\*[3,5]"; } - if($(ru{uri.user}) =~ $var(park_extension) && !($rd =~ "[0-9]{1,3}\.[0-9]{1,3}.[0-9]{1,3}\.[0-9]{1,3}") ) { + if($(ru{uri.user}) =~ $var(park_extension) && !is_ip($rd)) { xlog("L_INFO", "$ci|log|checking park request to $(ru{uri.user})@$(ru{uri.domain})\n"); $var(amqp_payload_request) = '{"Event-Category" : "call_event" , "Event-Name" : "query_user_channels_req", "Username" : "*3$(ru{uri.user}{s.substr,2,0})", "Realm" : "$(ru{uri.domain})", "Active-Only" : true }'; $var(amqp_routing_key) = "call.status_req." + $(ci{kz.encode});