[svn-commits] file: branch file/pjsip-outbound-publish r419940 - in /team/file/pjsip-outbou...

[SVN commits to the Digium repositories]

Author: file
Date: Mon Aug  4 14:14:18 2014
New Revision: 419940

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=419940
Log:
Incorporate some feedback.

Modified:
    team/file/pjsip-outbound-publish/include/asterisk/res_pjsip_outbound_publish.h
    team/file/pjsip-outbound-publish/res/res_pjsip_outbound_publish.c

Modified: team/file/pjsip-outbound-publish/include/asterisk/res_pjsip_outbound_publish.h
URL: http://svnview.digium.com/svn/asterisk/team/file/pjsip-outbound-publish/include/asterisk/res_pjsip_outbound_publish.h?view=diff&rev=419940&r1=419939&r2=419940
==============================================================================
--- team/file/pjsip-outbound-publish/include/asterisk/res_pjsip_outbound_publish.h (original)
+++ team/file/pjsip-outbound-publish/include/asterisk/res_pjsip_outbound_publish.h Mon Aug  4 14:14:18 2014
@@ -88,7 +88,7 @@
  * \retval non-NULL success
  *
  * \note The publish client is returned with its reference count increased and must be released using
- *       using ao2_cleanup.
+ *       ao2_cleanup.
  */
 struct ast_sip_outbound_publish_client *ast_sip_publish_client_get(const char *name);
 

Modified: team/file/pjsip-outbound-publish/res/res_pjsip_outbound_publish.c
URL: http://svnview.digium.com/svn/asterisk/team/file/pjsip-outbound-publish/res/res_pjsip_outbound_publish.c?view=diff&rev=419940&r1=419939&r2=419940
==============================================================================
--- team/file/pjsip-outbound-publish/res/res_pjsip_outbound_publish.c (original)
+++ team/file/pjsip-outbound-publish/res/res_pjsip_outbound_publish.c Mon Aug  4 14:14:18 2014
@@ -47,11 +47,10 @@
 				<description><para>
 					Publish is <emphasis>COMPLETELY</emphasis> separate from the rest of
 					<literal>pjsip.conf</literal>. A minimal configuration consists of
-					setting a <literal>server_uri</literal>, <literal>event</literal>,
-					<literal>type</literal> and <literal>subtype</literal>.
+					setting a <literal>server_uri</literal> and <literal>event</literal>.
 				</para></description>
 				<configOption name="expiration" default="3600">
-					<synopsis>Expiration time for registrations in seconds</synopsis>
+					<synopsis>Expiration time for publications in seconds</synopsis>
 				</configOption>
 				<configOption name="outbound_auth" default="">
 					<synopsis>Authentication object to be used for outbound publishes.</synopsis>
@@ -63,7 +62,7 @@
 					<synopsis>SIP URI of the server and entity to publish to</synopsis>
 					<description><para>
 						This is the URI at which to find the entity and server to send the outbound PUBLISH to.
-						This URI is used as the request URI of the outbound PUBLISH Request from Asterisk.
+						This URI is used as the request URI of the outbound PUBLISH request from Asterisk.
 					</para></description>
 				</configOption>
 				<configOption name="from_uri">
@@ -446,6 +445,7 @@
 
 	if (!ast_strlen_zero(message->body.type) && !ast_strlen_zero(message->body.subtype) &&
 		ast_sip_add_body(tdata, &message->body)) {
+		pjsip_tx_data_dec_ref(tdata);
 		goto fatal;
 	}
 
@@ -618,7 +618,7 @@
 
 		expires = pjsip_msg_find_hdr(param->rdata->msg_info.msg, PJSIP_H_MIN_EXPIRES, NULL);
 		if (!expires || !expires->ivalue) {
-			ast_log(LOG_ERROR, "Received 402 response on outbound publish '%s' without a Min-Expires header\n",
+			ast_log(LOG_ERROR, "Received 423 response on outbound publish '%s' without a Min-Expires header\n",
 				ast_sorcery_object_get_id(publish));
 			return;
 		}