[sr-dev] git:master:0fff35bd: usrloc: fix define name typo for the new keepalive management

Daniel-Constantin Mierla miconda at gmail.com
Fri May 8 21:52:47 CEST 2020


Module: kamailio
Branch: master
Commit: 0fff35bd8368bc0a2a2236a6ee01456db1807911
URL: https://github.com/kamailio/kamailio/commit/0fff35bd8368bc0a2a2236a6ee01456db1807911

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2020-05-08T21:48:29+02:00

usrloc: fix define name typo for the new keepalive management

- user right db value index for null checking
- ensure ending 0 doesn't overflow on aor building

---

Modified: src/modules/usrloc/dlist.c

---

Diff:  https://github.com/kamailio/kamailio/commit/0fff35bd8368bc0a2a2236a6ee01456db1807911.diff
Patch: https://github.com/kamailio/kamailio/commit/0fff35bd8368bc0a2a2236a6ee01456db1807911.patch

---

diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c
index a78f0aff54..cba8ec425c 100644
--- a/src/modules/usrloc/dlist.c
+++ b/src/modules/usrloc/dlist.c
@@ -101,8 +101,8 @@ int ul_ka_db_records(int partidx)
 	int proto = 0;
 	str host = STR_NULL;
 	char *p = NULL;
-#define ULKA_AURBUF_SIZE 1024
-	char aorbuf[ULKA_AURBUF_SIZE];
+#define ULKA_AORBUF_SIZE 1024
+	char aorbuf[ULKA_AORBUF_SIZE];
 	int i = 0;
 
 	/* select fields */
@@ -231,12 +231,12 @@ int ul_ka_db_records(int partidx)
 
 			/* user */
 			p  = (char*)VAL_STRING(ROW_VALUES(row) + 6);
-			if (VAL_NULL(ROW_VALUES(row)+1) || p==0 || p[0]==0) {
+			if (VAL_NULL(ROW_VALUES(row)+6) || p==0 || p[0]==0) {
 				LM_ERR("empty username -> skipping\n");
 				continue;
 			}
 			ur.aor.len = strlen(p);
-			if(ur.aor.len >= ULKA_AURBUF_SIZE) {
+			if(ur.aor.len >= ULKA_AORBUF_SIZE) {
 				LM_DBG("long username ->skipping\n");
 				continue;
 			}
@@ -244,8 +244,8 @@ int ul_ka_db_records(int partidx)
 
 			/* domain */
 			p  = (char*)VAL_STRING(ROW_VALUES(row) + 7);
-			if (!(VAL_NULL(ROW_VALUES(row)+1) || p==0 || p[0]==0)) {
-				if(ur.aor.len + strlen(p) >= ULKA_AURBUF_SIZE - 1) {
+			if (!(VAL_NULL(ROW_VALUES(row)+7) || p==0 || p[0]==0)) {
+				if(ur.aor.len + strlen(p) >= ULKA_AORBUF_SIZE - 2) {
 					LM_DBG("long aor ->skipping\n");
 					continue;
 				}




More information about the sr-dev mailing list