Skip to content

Commit 2b0e4f8

Browse files
committed
default route tweaks
* clean proxy-authorization * fix log line * don't forward ack without destination set (cherry picked from commit 726784b)
1 parent fd057e1 commit 2b0e4f8

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

kamailio/default.cfg

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ route[MAIN]
260260
if (!isflagset(FLAG_INTERNALLY_SOURCED)) {
261261
route(AUTHORIZATION);
262262
remove_hf("Authorization");
263+
remove_hf("Proxy-Authorization");
263264
}
264265

265266
#!ifdef MESSAGE_ROLE
@@ -321,7 +322,7 @@ route[LOG_REQUEST_CLASSIFIED_SOURCE]
321322
} else if (isflagset(FLAG_TRUSTED_SOURCE)) {
322323
xlog("$var(log_request_level)", "request from trusted IP\n");
323324
} else if (!isflagset(FLAG_NETWORK_CLASSIFIED)) {
324-
if (is_myself("$ou")) {
325+
if (is_myself("$ou") && !has_totag()) {
325326
xlog("$var(log_request_level)", "original R-URI ($ou) is this proxy, treating as external sources\n");
326327
} else {
327328
xlog("$var(log_request_level)", "originated from external sources\n");
@@ -727,6 +728,11 @@ route[EXTERNAL_TO_INTERNAL_RELAY]
727728

728729
route[RELAY_TO_INTERNAL]
729730
{
731+
if (is_method("ACK") && has_totag() && !isdsturiset()) {
732+
xlog("L_INFO", "ACK - end\n");
733+
return;
734+
}
735+
730736
if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE|NOTIFY|CANCEL|REFER")) {
731737
if(!t_is_set("branch_route")) t_on_branch("MANAGE_BRANCH");
732738
}

0 commit comments

Comments
 (0)