From 2ecbeda741c8bea37a5c740fe8610a45515a772b Mon Sep 17 00:00:00 2001 From: lazedo Date: Wed, 27 Feb 2019 18:24:10 +0000 Subject: [PATCH] allow not logging OPTIONS --- kamailio/default.cfg | 39 +++++++++++++++++++++++++++--------- kamailio/dispatcher-role.cfg | 6 +++--- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/kamailio/default.cfg b/kamailio/default.cfg index f9aa14c..45bf547 100644 --- a/kamailio/default.cfg +++ b/kamailio/default.cfg @@ -312,14 +312,6 @@ route route(CHECK_RETRANS); - # log the basic info regarding this call - xlog("L_INFO", "$ci|start|received $pr request $rm $ou\n"); - xlog("L_INFO", "$ci|log|source $si:$sp -> $RAi:$RAp\n"); - xlog("L_INFO", "$ci|log|from $fu\n"); - xlog("L_INFO", "$ci|log|to $tu\n"); - - route(CLASSIFY_SOURCE); - #!ifdef ANTIFLOOD_ROLE route(ANTIFLOOD_LIMIT); #!endif @@ -336,6 +328,10 @@ route route(DOS_PREVENTION); #!endif + route(LOG_REQUEST); + + route(CLASSIFY_SOURCE); + #!ifdef NAT_TRAVERSAL_ROLE route(NAT_DETECT); #!endif @@ -386,6 +382,24 @@ route route(RELAY); } +#!trydef KZ_LOG_REQUEST_OPTIONS 0 +kazoo.log_request_options = KZ_LOG_REQUEST_OPTIONS descr "log OPTIONS requests, default is 0 for preserving log size" + +route[LOG_REQUEST] +{ + if($sel(cfg_get.kazoo.log_request_options) == 0 && is_method("OPTIONS")) { + $var(log_request_level) = L_DBG; + } else { + $var(log_request_level) = L_INFO; + } + + # log the basic info regarding this call + xlog("$var(log_request_level)", "$ci|start|received $pr request $rm $ou\n"); + xlog("$var(log_request_level)", "$ci|log|source $si:$sp -> $RAi:$RAp\n"); + xlog("$var(log_request_level)", "$ci|log|from $fu\n"); + xlog("$var(log_request_level)", "$ci|log|to $tu\n"); +} + route[CHECK_RETRANS] { # handle retransmissions @@ -404,10 +418,15 @@ route[CLASSIFY_SOURCE] route(DISPATCHER_CLASSIFY_SOURCE); #!endif - if (isflagset(FLAG_INTERNALLY_SOURCED) || allow_source_address(TRUSTED_ADR_GROUP) || is_myself($si)) { - xlog("L_INFO", "$ci|log|request from trusted IP\n"); + if (allow_source_address(TRUSTED_ADR_GROUP)) { + xlog("$var(log_request_level)", "$ci|log|request from trusted IP\n"); setflag(FLAG_TRUSTED_SOURCE); } + + if (isflagset(FLAG_INTERNALLY_SOURCED) || is_myself($si)) { + setflag(FLAG_TRUSTED_SOURCE); + } + } route[HANDLE_OPTIONS] diff --git a/kamailio/dispatcher-role.cfg b/kamailio/dispatcher-role.cfg index cc28e79..b9afffe 100644 --- a/kamailio/dispatcher-role.cfg +++ b/kamailio/dispatcher-role.cfg @@ -65,7 +65,7 @@ route[DISPATCHER_CLASSIFY_SOURCE] #!import_file "dispatcher-network-classify.cfg" if (is_myself("$ou")) { - xlog("L_INFO", "$ci|log|original R-URI ($ou) is this proxy, treating as external sources\n"); + xlog("$var(log_request_level)", "$ci|log|original R-URI ($ou) is this proxy, treating as external sources\n"); } else if ( ds_is_from_list(KZ_DISPATCHER_PRIMARY_GROUP, 3) || ds_is_from_list(KZ_DISPATCHER_SECONDARY_GROUP, 3) || @@ -79,10 +79,10 @@ route[DISPATCHER_CLASSIFY_SOURCE] ds_is_from_list(KZ_DISPATCHER_REGISTRAR_PRIMARY_GROUP, 3) || ds_is_from_list(KZ_DISPATCHER_REGISTRAR_SECONDARY_GROUP, 3) ) { - xlog("L_INFO", "$ci|log|originated from internal sources\n"); + xlog("$var(log_request_level)", "$ci|log|originated from internal sources\n"); setflag(FLAG_INTERNALLY_SOURCED); } else { - xlog("L_INFO", "$ci|log|originated from external sources\n"); + xlog("$var(log_request_level)", "$ci|log|originated from external sources\n"); } }