[sr-dev] git:master:531f2551: nat_traversal: new marameter contact_match

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 531f2551affb06e71cbabbeba0e3174900e69aab
URL: https://github.com/kamailio/kamailio/commit/531f2551affb06e71cbabbeba0e3174900e69aab

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2020-04-04T09:59:06+02:00

nat_traversal: new marameter contact_match

- if set to 0 (default), match request-reply contacts with string
comparison (behaviour so far)
- if set to 1, use light uri comparison ( match uri type, user, host,
port and proto )

---

Modified: src/modules/nat_traversal/nat_traversal.c

---

Diff:  https://github.com/kamailio/kamailio/commit/531f2551affb06e71cbabbeba0e3174900e69aab.diff
Patch: https://github.com/kamailio/kamailio/commit/531f2551affb06e71cbabbeba0e3174900e69aab.patch

---

diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c
index 709b9032cd..27dbf2736d 100644
--- a/src/modules/nat_traversal/nat_traversal.c
+++ b/src/modules/nat_traversal/nat_traversal.c
@@ -59,6 +59,7 @@
 #include "../../core/data_lump.h"
 #include "../../core/mod_fix.h"
 #include "../../core/script_cb.h"
+#include "../../core/strutils.h"
 #include "../../core/timer_proc.h"
 #include "../../core/parser/msg_parser.h"
 #include "../../core/parser/parse_from.h"
@@ -246,6 +247,7 @@ bool have_dlg_api = false;
 
 static int dialog_flag = -1;
 static unsigned dialog_default_timeout = 12 * 3600; // 12 hours
+static int natt_contact_match = 0;
 
 stat_var *keepalive_endpoints = 0;
 stat_var *registered_endpoints = 0;
@@ -287,6 +289,8 @@ static param_export_t parameters[] = {
 	{"keepalive_extra_headers", PARAM_STRING,
 			&keepalive_params.extra_headers},
 	{"keepalive_state_file", PARAM_STRING, &keepalive_state_file},
+	{"contact_match", PARAM_INT, &natt_contact_match},
+
 	{0, 0, 0}
 };
 
@@ -897,7 +901,11 @@ static time_t get_register_expire(
 				r_contact_body = (contact_body_t *)r_hdr->parsed;
 				for(r_contact = r_contact_body->contacts; r_contact;
 						r_contact = r_contact->next) {
-					if(STR_MATCH_STR(contact->uri, r_contact->uri)) {
+					if((natt_contact_match==0
+								&& STR_MATCH_STR(contact->uri, r_contact->uri))
+							|| (natt_contact_match==1
+								&& cmp_uri_light_str(&contact->uri,
+									&r_contact->uri)==0)){
 						expires_param = r_contact->expires;
 						if(expires_param && expires_param->body.len
 								&& str2int(&expires_param->body, &exp) == 0)
@@ -1760,6 +1768,10 @@ static int mod_init(void)
 	int *param;
 	modparam_t type;
 
+	if(natt_contact_match!=0) {
+		natt_contact_match = 1;
+	}
+
 	if(keepalive_interval <= 0) {
 		LM_NOTICE(
 				"keepalive functionality is disabled from the configuration\n");