res_pjsip/pjsip_distributor.c: Pull some assignments out of if tests.

Change-Id: I3d30d638b53a4bbe9bf9aad853c649d583894112

diff --git a/res/res_pjsip/pjsip_distributor.c b/res/res_pjsip/pjsip_distributor.c
index 7f512d1bb7c2b7de1d19c8498cdc5639c32c4195..a0d0bdbb56ad221ac842742cc02ca65d55e57b2f 100644 (file)
--- a/res/res_pjsip/pjsip_distributor.c
+++ b/res/res_pjsip/pjsip_distributor.c
@@ -690,7 +690,8 @@ static pj_bool_t endpoint_lookup(pjsip_rx_data *rdata)
                 * the find without OBJ_UNLINK to prevent the unnecessary write lock, then unlink
                 * if needed.
                 */
-               if ((unid = ao2_find(unidentified_requests, rdata->pkt_info.src_name, OBJ_SEARCH_KEY))) {
+               unid = ao2_find(unidentified_requests, rdata->pkt_info.src_name, OBJ_SEARCH_KEY);
+               if (unid) {
                        ao2_unlink(unidentified_requests, unid);
                        ao2_ref(unid, -1);
                }
@@ -699,14 +700,14 @@ static pj_bool_t endpoint_lookup(pjsip_rx_data *rdata)
 
        endpoint = ast_sip_identify_endpoint(rdata);
        if (endpoint) {
-               if ((unid = ao2_find(unidentified_requests, rdata->pkt_info.src_name, OBJ_SEARCH_KEY))) {
+               unid = ao2_find(unidentified_requests, rdata->pkt_info.src_name, OBJ_SEARCH_KEY);
+               if (unid) {
                        ao2_unlink(unidentified_requests, unid);
                        ao2_ref(unid, -1);
                }
        }
 
        if (!endpoint) {
-
                /* always use an artificial endpoint - per discussion no reason
                   to have "alwaysauthreject" as an option.  It is felt using it
                   was a bug fix and it is not needed since we are not worried about
@@ -715,9 +716,10 @@ static pj_bool_t endpoint_lookup(pjsip_rx_data *rdata)
                endpoint = ast_sip_get_artificial_endpoint();
        }
 
+       /* endpoint ref held by mod_data[] */
        rdata->endpt_info.mod_data[endpoint_mod.id] = endpoint;
 
-       if ((endpoint == artificial_endpoint) && !is_ack) {
+       if (endpoint == artificial_endpoint && !is_ack) {
                char name[AST_UUID_STR_LEN] = "";
                pjsip_uri *from = rdata->msg_info.from->uri;
 
@@ -726,17 +728,20 @@ static pj_bool_t endpoint_lookup(pjsip_rx_data *rdata)
                        ast_copy_pj_str(name, &sip_from->user, sizeof(name));
                }
 
-               if ((unid = ao2_find(unidentified_requests, rdata->pkt_info.src_name, OBJ_SEARCH_KEY))) {
+               unid = ao2_find(unidentified_requests, rdata->pkt_info.src_name, OBJ_SEARCH_KEY);
+               if (unid) {
                        check_endpoint(rdata, unid, name);
                        ao2_ref(unid, -1);
                } else if (using_auth_username) {
                        ao2_wrlock(unidentified_requests);
-                       /* The check again with the write lock held allows us to eliminate the DUPS_REPLACE and sort_fn */
-                       if ((unid = ao2_find(unidentified_requests, rdata->pkt_info.src_name, OBJ_SEARCH_KEY | OBJ_NOLOCK))) {
+                       /* Checking again with the write lock held allows us to eliminate the DUPS_REPLACE and sort_fn */
+                       unid = ao2_find(unidentified_requests, rdata->pkt_info.src_name,
+                               OBJ_SEARCH_KEY | OBJ_NOLOCK);
+                       if (unid) {
                                check_endpoint(rdata, unid, name);
                        } else {
-                               unid = ao2_alloc_options(sizeof(*unid) + strlen(rdata->pkt_info.src_name) + 1, NULL,
-                                       AO2_ALLOC_OPT_LOCK_RWLOCK);
+                               unid = ao2_alloc_options(sizeof(*unid) + strlen(rdata->pkt_info.src_name) + 1,
+                                       NULL, AO2_ALLOC_OPT_LOCK_RWLOCK);
                                if (!unid) {
                                        ao2_unlock(unidentified_requests);
                                        return PJ_TRUE;
@@ -860,7 +865,8 @@ static pj_bool_t authenticate(pjsip_rx_data *rdata)
                        return PJ_TRUE;
                case AST_SIP_AUTHENTICATION_SUCCESS:
                        /* See note in endpoint_lookup about not holding an unnecessary write lock */
-                       if ((unid = ao2_find(unidentified_requests, rdata->pkt_info.src_name, OBJ_SEARCH_KEY))) {
+                       unid = ao2_find(unidentified_requests, rdata->pkt_info.src_name, OBJ_SEARCH_KEY);
+                       if (unid) {
                                ao2_unlink(unidentified_requests, unid);
                                ao2_ref(unid, -1);
                        }