[svn-commits] oej: branch group/pinana-publish-1.4 r297071 - /team/group/pinana-publish-1.4...

[SVN commits to the Digium repositories]

Author: oej
Date: Wed Dec  1 11:48:29 2010
New Revision: 297071

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=297071
Log:
- Don't add Contact on Publish, doesn't make sense
- Use proper Event name on publish

Modified:
    team/group/pinana-publish-1.4/channels/chan_sip.c

Modified: team/group/pinana-publish-1.4/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pinana-publish-1.4/channels/chan_sip.c?view=diff&rev=297071&r1=297070&r2=297071
==============================================================================
--- team/group/pinana-publish-1.4/channels/chan_sip.c (original)
+++ team/group/pinana-publish-1.4/channels/chan_sip.c Wed Dec  1 11:48:29 2010
@@ -1914,7 +1914,7 @@
 /*! \brief EPA declaration of dialog-info publish notifications */
 static const struct epa_static_data dlginfo_epa_static_data  = {
 	.event = DIALOG_INFO_XML,
-	.name = "dialog-info",
+	.name = "dialog",
 	.handle_error = dlginfo_handle_publish_error,
 	.destructor = dlginfo_epa_destructor,
 };
@@ -6983,7 +6983,7 @@
 		add_header(req, "To", of);
 	}
 	/* Do not add Contact for MESSAGE, BYE and Cancel requests */
-	if (sipmethod != SIP_BYE && sipmethod != SIP_CANCEL && sipmethod != SIP_MESSAGE)
+	if (sipmethod != SIP_BYE && sipmethod != SIP_CANCEL && sipmethod != SIP_MESSAGE && sipmethod != SIP_PUBLISH)
 		add_header(req, "Contact", p->our_contact);
 
 	copy_header(req, orig, "Call-ID");
@@ -8118,7 +8118,7 @@
 
 	add_header(&req, "Allow", ALLOWED_METHODS);
 	add_header(&req, "Supported", SUPPORTED_EXTENSIONS);
-	if (p->options && p->options->addsipheaders && p->owner) {
+	if (sipmethod != SIP_PUBLISH && p->options && p->options->addsipheaders && p->owner) {
 		struct ast_channel *chan = p->owner; /* The owner channel */
 		struct varshead *headp;