[svn-commits] mjordan: branch group/asterisk-13-sipit r424645 - in /team/group/asterisk-13-...

[SVN commits to the Digium repositories]

Author: mjordan
Date: Mon Oct  6 07:18:32 2014
New Revision: 424645

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424645
Log:
Resolve conflicts

Modified:
    team/group/asterisk-13-sipit/   (props changed)
    team/group/asterisk-13-sipit/channels/pjsip/dialplan_functions.c
    team/group/asterisk-13-sipit/res/res_pjsip/pjsip_distributor.c
    team/group/asterisk-13-sipit/res/res_pjsip_pubsub.c

Propchange: team/group/asterisk-13-sipit/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/asterisk-13-sipit/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Propchange: team/group/asterisk-13-sipit/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct  6 07:18:32 2014
@@ -1,1 +1,1 @@
-/branches/13:1-424584
+/branches/13:1-424644

Modified: team/group/asterisk-13-sipit/channels/pjsip/dialplan_functions.c
URL: http://svnview.digium.com/svn/asterisk/team/group/asterisk-13-sipit/channels/pjsip/dialplan_functions.c?view=diff&rev=424645&r1=424644&r2=424645
==============================================================================
--- team/group/asterisk-13-sipit/channels/pjsip/dialplan_functions.c (original)
+++ team/group/asterisk-13-sipit/channels/pjsip/dialplan_functions.c Mon Oct  6 07:18:32 2014
@@ -707,7 +707,7 @@
 
 	/* Sanity check */
 	if (strcmp(ast_channel_tech(chan)->type, "PJSIP")) {
-		ast_log(LOG_ERROR, "Cannot call %s on a non-PJSIP channel\n", cmd);
+		ast_log(LOG_WARNING, "Cannot call %s on a non-PJSIP channel\n", cmd);
 		return 0;
 	}
 
@@ -866,6 +866,11 @@
 		return -1;
 	}
 
+	if (strcmp(ast_channel_tech(chan)->type, "PJSIP")) {
+		ast_log(LOG_WARNING, "Cannot call %s on a non-PJSIP channel\n", cmd);
+		return -1;
+	}
+
 	channel = ast_channel_tech_pvt(chan);
 
 	if (!strcmp(data, "audio")) {
@@ -889,6 +894,11 @@
 		return -1;
 	}
 
+	if (strcmp(ast_channel_tech(chan)->type, "PJSIP")) {
+		ast_log(LOG_WARNING, "Cannot call %s on a non-PJSIP channel\n", cmd);
+		return -1;
+	}
+
 	channel = ast_channel_tech_pvt(chan);
 	mdata.session = channel->session;
 

Modified: team/group/asterisk-13-sipit/res/res_pjsip/pjsip_distributor.c
URL: http://svnview.digium.com/svn/asterisk/team/group/asterisk-13-sipit/res/res_pjsip/pjsip_distributor.c?view=diff&rev=424645&r1=424644&r2=424645
==============================================================================
--- team/group/asterisk-13-sipit/res/res_pjsip/pjsip_distributor.c (original)
+++ team/group/asterisk-13-sipit/res/res_pjsip/pjsip_distributor.c Mon Oct  6 07:18:32 2014
@@ -101,7 +101,6 @@
 	pj_str_t *remote_tag;
 
 	if (!rdata->msg_info.msg) {
-		/* EEEK */
 		return NULL;
 	}
 

Modified: team/group/asterisk-13-sipit/res/res_pjsip_pubsub.c
URL: http://svnview.digium.com/svn/asterisk/team/group/asterisk-13-sipit/res/res_pjsip_pubsub.c?view=diff&rev=424645&r1=424644&r2=424645
==============================================================================
--- team/group/asterisk-13-sipit/res/res_pjsip_pubsub.c (original)
+++ team/group/asterisk-13-sipit/res/res_pjsip_pubsub.c Mon Oct  6 07:18:32 2014
@@ -1365,7 +1365,7 @@
 		sub_tree = create_subscription_tree(handler, endpoint, &rdata, resource, generator, &tree);
 		if (!sub_tree) {
 			ast_sorcery_delete(ast_sip_get_sorcery(), persistence);
-			ast_log(LOG_ERROR, "FAILED to re-create subscription\n");
+			ast_log(LOG_WARNING, "Failed to re-create subscription for %s\n", persistence->endpoint);
 			return 0;
 		}
 		sub_tree->persistence = ao2_bump(persistence);