[sr-dev] git:master:622f02d0: registrar: implemented lookup filter mode 2

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 622f02d0f817c5b6c70783cc98745cf06a986f84
URL: https://github.com/kamailio/kamailio/commit/622f02d0f817c5b6c70783cc98745cf06a986f84

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2021-09-10T13:20:12+02:00

registrar: implemented lookup filter mode 2

- use only contacts that have associated TCP/TLS/WSS connection active

---

Modified: src/modules/registrar/doc/registrar_admin.xml
Modified: src/modules/registrar/lookup.c

---

Diff:  https://github.com/kamailio/kamailio/commit/622f02d0f817c5b6c70783cc98745cf06a986f84.diff
Patch: https://github.com/kamailio/kamailio/commit/622f02d0f817c5b6c70783cc98745cf06a986f84.patch

---

diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml
index e310636f01..cafd8bbcf3 100644
--- a/src/modules/registrar/doc/registrar_admin.xml
+++ b/src/modules/registrar/doc/registrar_admin.xml
@@ -1109,6 +1109,14 @@ end
 				rlf_bflags - e.g., $xavp(reg=>rlf_bflags).
 			</para>
 		</listitem>
+		<listitem>
+			<para>
+				<emphasis>2</emphasis> - apply the active tcp connection filter
+				- return only contact records that have the associated TCP/TLS/WSS
+				connection active. UDP and SCTP contacts are not filtered, all
+				are returned.
+			</para>
+		</listitem>
 	</itemizedlist>
 		<para>
 		<emphasis>
diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c
index 81f9b7afd9..b58fbd6f7d 100644
--- a/src/modules/registrar/lookup.c
+++ b/src/modules/registrar/lookup.c
@@ -45,6 +45,8 @@
 #include "lookup.h"
 #include "config.h"
 
+#define REG_LOOKUP_FILTER_BFLAG        (1<<0)
+#define REG_LOOKUP_FILTER_TCPCON       (1<<1)
 
 extern int reg_lookup_filter_mode;
 
@@ -60,12 +62,13 @@ static void reg_lookup_filter_init(void)
 	str filter_bflags = str_init("rlf_bflags");
 	sr_xavp_t *vavp = NULL;
 
-	if(reg_lookup_filter_mode==0 || reg_xavp_cfg.s==NULL) {
+	if(reg_lookup_filter_mode==0) {
 		return;
 	}
 	memset(&_reg_lookup_filter, 0, sizeof(reg_lookup_filter_t));
 
-	if((reg_lookup_filter_mode & 1)
+	if((reg_lookup_filter_mode & REG_LOOKUP_FILTER_BFLAG)
+			&& (reg_xavp_cfg.s != NULL && reg_xavp_cfg.len > 0)
 			&& (vavp = xavp_get_child_with_ival(&reg_xavp_cfg,
 					&filter_bflags)) != NULL) {
 		if(vavp->val.v.i != 0) {
@@ -73,24 +76,45 @@ static void reg_lookup_filter_init(void)
 			_reg_lookup_filter.factive = 1;
 		}
 	}
+
+	if(reg_lookup_filter_mode & REG_LOOKUP_FILTER_TCPCON) {
+		_reg_lookup_filter.factive = 1;
+	}
 	return;
 }
 
 static int reg_lookup_filter_match(ucontact_t* ptr)
 {
-	if(reg_lookup_filter_mode==0 || reg_xavp_cfg.s==NULL) {
-		return 1;
-	}
-	if(_reg_lookup_filter.factive==0) {
+	tcp_connection_t *con = NULL;
+
+	if(reg_lookup_filter_mode==0 || _reg_lookup_filter.factive==0) {
 		return 1;
 	}
-	if(_reg_lookup_filter.bflags!=0) {
+
+	if((reg_lookup_filter_mode & REG_LOOKUP_FILTER_BFLAG)
+			&& _reg_lookup_filter.bflags!=0) {
 		if((_reg_lookup_filter.bflags & ptr->cflags)==0) {
 			return 0;
 		}
 	}
-	return 1;
 
+	if(reg_lookup_filter_mode & REG_LOOKUP_FILTER_TCPCON) {
+		if(ptr->tcpconn_id > 0) {
+			con = tcpconn_get(ptr->tcpconn_id, 0, 0, 0, 0);
+			if (unlikely(con == NULL)) {
+				LM_DBG("connection id %d does not exist\n", ptr->tcpconn_id);
+				return 0;
+			}
+			if (con->state != S_CONN_OK) {
+				LM_DBG("connection id %d not in state ok\n", ptr->tcpconn_id);
+				tcpconn_put(con);
+				return 0;
+			}
+			tcpconn_put(con);
+		}
+	}
+
+	return 1;
 }
 
 static int has_to_tag(struct sip_msg* msg)
@@ -485,7 +509,9 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode)
 	if (!cfg_get(registrar, registrar_cfg, append_branches)) goto done;
 
 	for( ; ptr ; ptr = ptr->next ) {
-		if ((VALID_CONTACT(ptr, act_time) || cfg_get(registrar,registrar_cfg,use_expired_contacts)) && allowed_method(_m, ptr)
+		if ((VALID_CONTACT(ptr, act_time)
+					|| cfg_get(registrar,registrar_cfg,use_expired_contacts))
+				&& allowed_method(_m, ptr)
 				&& reg_lookup_filter_match(ptr)) {
 			path_dst.len = 0;
 			if(ptr->path.s && ptr->path.len) {
@@ -500,7 +526,8 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode)
 						continue;
 					}
 					if (check_self(&(path_uri.host), 0, 0)) {
-						/* first hop in path vector is local - check for additional hops and if present, point to next one */
+						/* first hop in path vector is local
+						 * - check for additional hops and if present, point to next one */
 						if (path_str.len > (path_dst.len + 3)) {
 							path_str.s = path_str.s + path_dst.len + 3;
 							path_str.len = path_str.len - path_dst.len - 3;