[asterisk-commits] kmoore: branch kmoore/stasis-bridging-channel_events r385975 - in /team/kmoor...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Wed Apr 17 13:20:11 2013
New Revision: 385975

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=385975
Log:
res_xmpp and res_jabber need to search 'cachable' in the attrib section of the received IE, not data.

(issue ASTERISK-20175)
(closes issue ASTERISK-21429)
(closes issue ASTERISK-21069)
(closes issue ASTERISK-21164)

Reported by: alecdavis
Tested by: alecdavis
alecdavis (license 585)

Review https://reviewboard.asterisk.org/r/2452/
........

Merged revisions 385939 from file:///srv/subversion/repos/asterisk/trunk
........

Merged revisions 385940 from http://svn.asterisk.org/svn/asterisk/team/group/bridge_construction

Modified:
    team/kmoore/stasis-bridging-channel_events/   (props changed)
    team/kmoore/stasis-bridging-channel_events/res/res_jabber.c
    team/kmoore/stasis-bridging-channel_events/res/res_xmpp.c

Propchange: team/kmoore/stasis-bridging-channel_events/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Propchange: team/kmoore/stasis-bridging-channel_events/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 17 13:20:11 2013
@@ -1,1 +1,1 @@
-/team/group/bridge_construction:1-385913
+/team/group/bridge_construction:1-385974

Modified: team/kmoore/stasis-bridging-channel_events/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridging-channel_events/res/res_jabber.c?view=diff&rev=385975&r1=385974&r2=385975
==============================================================================
--- team/kmoore/stasis-bridging-channel_events/res/res_jabber.c (original)
+++ team/kmoore/stasis-bridging-channel_events/res/res_jabber.c Wed Apr 17 13:20:11 2013
@@ -3355,10 +3355,10 @@
 		return IKS_FILTER_EAT;
 	}
 	if (!strcasecmp(iks_name(item_content), "state")) {
+		if ((cachable_str = iks_find_attrib(item_content, "cachable"))) {
+			sscanf(cachable_str, "%30d", &cachable);
+		}
 		device_state = iks_find_cdata(item, "state");
-		if ((cachable_str = iks_find_cdata(item, "cachable"))) {
-			sscanf(cachable_str, "%30d", &cachable);
-		}
 		ast_publish_device_state_full(item_id,
 						ast_devstate_val(device_state),
 						cachable == AST_DEVSTATE_CACHABLE ? AST_DEVSTATE_CACHABLE : AST_DEVSTATE_NOT_CACHABLE,

Modified: team/kmoore/stasis-bridging-channel_events/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridging-channel_events/res/res_xmpp.c?view=diff&rev=385975&r1=385974&r2=385975
==============================================================================
--- team/kmoore/stasis-bridging-channel_events/res/res_xmpp.c (original)
+++ team/kmoore/stasis-bridging-channel_events/res/res_xmpp.c Wed Apr 17 13:20:11 2013
@@ -1470,10 +1470,10 @@
 		return IKS_FILTER_EAT;
 	}
 	if (!strcasecmp(iks_name(item_content), "state")) {
+		if ((cachable_str = iks_find_attrib(item_content, "cachable"))) {
+			sscanf(cachable_str, "%30d", &cachable);
+		}
 		device_state = iks_find_cdata(item, "state");
-		if ((cachable_str = iks_find_cdata(item, "cachable"))) {
-			sscanf(cachable_str, "%30d", &cachable);
-		}
 		ast_publish_device_state_full(item_id,
 						ast_devstate_val(device_state),
 						cachable == AST_DEVSTATE_CACHABLE ? AST_DEVSTATE_CACHABLE : AST_DEVSTATE_NOT_CACHABLE,