[asterisk-commits] file: branch file/pimp_my_publish r391771 - /team/file/pimp_my_publish/res/

[SVN commits to the Asterisk project]

Author: file
Date: Fri Jun 14 09:45:14 2013
New Revision: 391771

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=391771
Log:
Minor tweaking... nothing to see here.

Modified:
    team/file/pimp_my_publish/res/res_sip_pubsub.c

Modified: team/file/pimp_my_publish/res/res_sip_pubsub.c
URL: http://svnview.digium.com/svn/asterisk/team/file/pimp_my_publish/res/res_sip_pubsub.c?view=diff&rev=391771&r1=391770&r2=391771
==============================================================================
--- team/file/pimp_my_publish/res/res_sip_pubsub.c (original)
+++ team/file/pimp_my_publish/res/res_sip_pubsub.c Fri Jun 14 09:45:14 2013
@@ -763,13 +763,8 @@
 
 	publish_type = determine_sip_publish_type(rdata, etag_hdr, &expires, &entity_id);
 
-	if (publish_type == SIP_PUBLISH_UNKNOWN) {
-		pjsip_endpt_respond_stateless(ast_sip_get_pjsip_endpoint(), rdata, 400, NULL, NULL, NULL);
-		return PJ_TRUE;
-	}
-
 	/* If this is not an initial publish ensure that a publication is present */
-	if (publish_type != SIP_PUBLISH_INITIAL) {
+	if ((publish_type != SIP_PUBLISH_INITIAL) && (publish_type != SIP_PUBLISH_UNKNOWN)) {
 		if (!(publication = ao2_find(handler->publications, &entity_id, OBJ_KEY | OBJ_UNLINK))) {
 			static const pj_str_t str_conditional_request_failed = { "Conditional Request Failed", 26 };
 
@@ -786,9 +781,6 @@
 	}
 
 	switch (publish_type) {
-		case SIP_PUBLISH_UNKNOWN:
-			/* This will never get reached as we short circuit early */
-			break;
 		case SIP_PUBLISH_INITIAL:
 			publication = publish_request_initial(endpoint, rdata, handler);
 			break;
@@ -802,6 +794,7 @@
 		case SIP_PUBLISH_REMOVE:
 			handler->publish_termination(publication, rdata);
 			break;
+		case SIP_PUBLISH_UNKNOWN:
 		default:
 			pjsip_endpt_respond_stateless(ast_sip_get_pjsip_endpoint(), rdata, 400, NULL, NULL, NULL);
 			break;