From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 29 Jun 2017 23:22:33 +0000 (-0500)
Subject: pjsip_distributor.c: Fix unidentified_requests hash functions.
X-Git-Tag: 13.17.0-rc1~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=905d18e8bf52ea7657acaaf2ec0cbe58531fb625;p=thirdparty%2Fasterisk.git

pjsip_distributor.c: Fix unidentified_requests hash functions.

The OBJ_SEARCH_xxx defines should not be used as if they were individual
bits.  They represent a multi-bit enumeration value field.

Change-Id: I32abc9a475396dab02402a7014357dd94284e17b
---

diff --git a/res/res_pjsip/pjsip_distributor.c b/res/res_pjsip/pjsip_distributor.c
index dadde25771..77783539f7 100644
--- a/res/res_pjsip/pjsip_distributor.c
+++ b/res/res_pjsip/pjsip_distributor.c
@@ -827,7 +827,7 @@ static int suspects_compare(void *obj, void *arg, int flags)
 		/* Fall through */
 	case OBJ_SEARCH_KEY:
 		if (strcmp(object_left->src_name, right_key) == 0) {
-			cmp = CMP_MATCH | CMP_STOP;
+			cmp = CMP_MATCH;
 		}
 		break;
 	case OBJ_SEARCH_PARTIAL_KEY:
@@ -842,15 +842,25 @@ static int suspects_compare(void *obj, void *arg, int flags)
 	return cmp;
 }
 
-static int suspects_hash(const void *obj, int flags) {
-	const struct unidentified_request *object_left = obj;
+static int suspects_hash(const void *obj, int flags)
+{
+	const struct unidentified_request *object;
+	const char *key;
 
-	if (flags & OBJ_SEARCH_OBJECT) {
-		return ast_str_hash(object_left->src_name);
-	} else if (flags & OBJ_SEARCH_KEY) {
-		return ast_str_hash(obj);
+	switch (flags & OBJ_SEARCH_MASK) {
+	case OBJ_SEARCH_KEY:
+		key = obj;
+		break;
+	case OBJ_SEARCH_OBJECT:
+		object = obj;
+		key = object->src_name;
+		break;
+	default:
+		/* Hash can only work on something with a full key. */
+		ast_assert(0);
+		return 0;
 	}
-	return -1;
+	return ast_str_hash(key);
 }
 
 static struct ao2_container *cli_unid_get_container(const char *regex)