mid_registrar: Simplify lookup() code

OpenSIPS · Jul 9, 2020 · eb018ad · eb018ad
1 parent 9643221
commit eb018ad
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/lib/reg/lookup.c b/lib/reg/lookup.c
@@ -65,16 +65,14 @@ lookup_rc lookup(struct sip_msg *req, udomain_t *d, str *sflags, str *aor_uri,
 	str sip_instance = STR_NULL, call_id = STR_NULL;
 	regex_t ua_re;
 
-	if (!ZSTRP(sflags)) {
-		if (parse_lookup_flags(sflags, &flags, &ua_re, &regexp_flags,
-		                       &max_latency) != 0) {
-			LM_ERR("failed to parse flags: %.*s\n", sflags->len, sflags->s);
-			return LOOKUP_ERROR;
-		}
-
-		single_branch = flags & REG_LOOKUP_NOBRANCH_FLAG;
+	if (parse_lookup_flags(sflags, &flags, &ua_re, &regexp_flags,
+	                       &max_latency) != 0) {
+		LM_ERR("failed to parse flags: %.*s\n", sflags->len, sflags->s);
+		return LOOKUP_ERROR;
 	}
 
+	single_branch = flags & REG_LOOKUP_NOBRANCH_FLAG;
+
 	if (flags & REG_BRANCH_AOR_LOOKUP_FLAG) {
 		/* extract all the branches for further usage */
 		while (
@@ -346,6 +344,9 @@ int parse_lookup_flags(const str *input, unsigned int *flags, regex_t *ua_re,
 	int i, re_len = 0;
 
 	*flags = 0;
+	if (ZSTRP(input))
+		return 0;
+
 	for (i = 0; i < input->len; i++) {
 		switch (input->s[i]) {
 		case 'm': *flags |= REG_LOOKUP_METHODFILTER_FLAG; break;

diff --git a/modules/mid_registrar/lookup.c b/modules/mid_registrar/lookup.c
@@ -62,16 +62,14 @@ int mid_reg_lookup(struct sip_msg *req, udomain_t *d, str *sflags, str *uri)
 	if (reg_mode == MID_REG_THROTTLE_AOR)
 		return lookup(req, d, sflags, uri, 0, 1);
 
-	if (!ZSTRP(sflags)) {
-		if (parse_lookup_flags(sflags, &flags, &ua_re, &regexp_flags,
-		                       &max_latency) != 0) {
-			LM_ERR("failed to parse flags: %.*s\n", sflags->len, sflags->s);
-			return LOOKUP_ERROR;
-		}
-
-		ruri_is_pushed = flags & REG_LOOKUP_NO_RURI_FLAG;
+	if (parse_lookup_flags(sflags, &flags, &ua_re, &regexp_flags,
+	                       &max_latency) != 0) {
+		LM_ERR("failed to parse flags: %.*s\n", sflags->len, sflags->s);
+		return LOOKUP_ERROR;
 	}
 
+	ruri_is_pushed = flags & REG_LOOKUP_NO_RURI_FLAG;
+
 	if (!uri)
 		uri = GET_RURI(req);