From: Kinsey Moore <kmoore@digium.com>
Date: Thu, 16 Jan 2014 19:33:28 +0000 (+0000)
Subject: PJSIP: Fix outbound OPTIONS support
X-Git-Tag: 13.0.0-beta1~643
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc241d6f52f82f65a9ba99c1fae00be89834fa02;p=thirdparty%2Fasterisk.git

PJSIP: Fix outbound OPTIONS support

When path support was added and contacts were made available during
request creation and transmission, the code path used by outbound
qualify support was not modified correctly and was causing request
creation to fail. This ensures that outbound request creation with only
a contact and no dialog, endpoint, or uri can succeed which restores
qualify support.

Reported by: gtjoseph
Reported by: kharwell
........

Merged revisions 405743 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@405744 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index bd8418152b..a74f23268c 100644
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -1629,7 +1629,7 @@ static int create_out_of_dialog_request(const pjsip_method *method, struct ast_s
 	pjsip_tpselector selector = { .type = PJSIP_TPSELECTOR_NONE, };
 
 	if (ast_strlen_zero(uri)) {
-		if (!endpoint) {
+		if (!endpoint && !contact) {
 			ast_log(LOG_ERROR, "An endpoint and/or uri must be specified\n");
 			return -1;
 		}