[Pkg-voip-commits] r5789 - /asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager

[paravoid at alioth.debian.org]

Author: paravoid
Date: Sun May 25 19:27:07 2008
New Revision: 5789

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5789
Log:
Another minor change of bristuff 0.4.0-RC1

Modified:
    asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager

Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager?rev=5789&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager Sun May 25 19:27:07 2008
@@ -74,7 +74,20 @@
  	if (!chan) {
  		char buf[BUFSIZ];
  		snprintf(buf, sizeof(buf), "Channel does not exist: %s", name);
-@@ -1707,9 +1728,9 @@ static int action_redirect(struct manses
+@@ -1697,8 +1724,11 @@ static int action_redirect(struct manses
+ 		ast_channel_unlock(chan);
+ 		return 0;
+ 	}
+-	if (!ast_strlen_zero(name2))
++ 	if (!ast_strlen_zero(uniqueid2)) {
++ 	    chan2 = ast_get_channel_by_uniqueid_locked(uniqueid2);
++ 	} else if (!ast_strlen_zero(name2)) {
+ 		chan2 = ast_get_channel_by_name_locked(name2);
++	}
+ 	if (chan2 && ast_check_hangup(chan2)) {
+ 		astman_send_error(s, m, "Redirect failed, extra channel not up.\n");
+ 		ast_channel_unlock(chan);
+@@ -1707,9 +1737,9 @@ static int action_redirect(struct manses
  	}
  	res = ast_async_goto(chan, context, exten, pi);
  	if (!res) {