[asterisk-commits] irroot: branch irroot/distrotech-customers-10 r351030 - in /team/irroot/distr...

[SVN commits to the Asterisk project]

Author: irroot
Date: Mon Jan 16 13:14:20 2012
New Revision: 351030

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=351030
Log:
Multiple revisions 350938,350976,350978

........
  r350938 | seanbright | 2012-01-16 16:27:57 +0200 (Mon, 16 Jan 2012) | 5 lines
  
  Sort the output of 'database show' by key.
  
  This more closely mimics the behavior of 'database show' before the conversion
  to sqlite3.
........
  r350976 | file | 2012-01-16 19:06:05 +0200 (Mon, 16 Jan 2012) | 5 lines
  
  Add missing code to set direct RTP setup information during dialing.
  ........
  
  Merged revisions 350975 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
  r350978 | seanbright | 2012-01-16 19:11:39 +0200 (Mon, 16 Jan 2012) | 5 lines
  
  Sort the output of 'database showkey' as well.
  
  You can pass wildcards (%) to the database CLI commands, so this will sort the
  returned list of matches.
........

Merged revisions 350938,350976,350978 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    team/irroot/distrotech-customers-10/   (props changed)
    team/irroot/distrotech-customers-10/main/db.c
    team/irroot/distrotech-customers-10/main/rtp_engine.c

Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 16 13:14:20 2012
@@ -1,1 +1,1 @@
-/branches/10:1-350936
+/branches/10:1-351026

Modified: team/irroot/distrotech-customers-10/main/db.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/main/db.c?view=diff&rev=351030&r1=351029&r2=351030
==============================================================================
--- team/irroot/distrotech-customers-10/main/db.c (original)
+++ team/irroot/distrotech-customers-10/main/db.c Mon Jan 16 13:14:20 2012
@@ -119,9 +119,9 @@
 DEFINE_SQL_STATEMENT(del_stmt, "DELETE FROM astdb WHERE key=?")
 DEFINE_SQL_STATEMENT(deltree_stmt, "DELETE FROM astdb WHERE key || '/' LIKE ? || '/' || '%'")
 DEFINE_SQL_STATEMENT(deltree_all_stmt, "DELETE FROM astdb")
-DEFINE_SQL_STATEMENT(gettree_stmt, "SELECT key, value FROM astdb WHERE key || '/' LIKE ? || '/' || '%'")
-DEFINE_SQL_STATEMENT(gettree_all_stmt, "SELECT key, value FROM astdb")
-DEFINE_SQL_STATEMENT(showkey_stmt, "SELECT key, value FROM astdb WHERE key LIKE '%' || '/' || ?")
+DEFINE_SQL_STATEMENT(gettree_stmt, "SELECT key, value FROM astdb WHERE key || '/' LIKE ? || '/' || '%' ORDER BY key")
+DEFINE_SQL_STATEMENT(gettree_all_stmt, "SELECT key, value FROM astdb ORDER BY key")
+DEFINE_SQL_STATEMENT(showkey_stmt, "SELECT key, value FROM astdb WHERE key LIKE '%' || '/' || ? ORDER BY key")
 DEFINE_SQL_STATEMENT(create_astdb_stmt, "CREATE TABLE IF NOT EXISTS astdb(key VARCHAR(256), value VARCHAR(256), PRIMARY KEY(key))")
 
 static int init_stmt(sqlite3_stmt **stmt, const char *sql, size_t len)

Modified: team/irroot/distrotech-customers-10/main/rtp_engine.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/main/rtp_engine.c?view=diff&rev=351030&r1=351029&r2=351030
==============================================================================
--- team/irroot/distrotech-customers-10/main/rtp_engine.c (original)
+++ team/irroot/distrotech-customers-10/main/rtp_engine.c Mon Jan 16 13:14:20 2012
@@ -1504,6 +1504,10 @@
 		ast_rtp_codecs_payloads_copy(&tinstance0->codecs, &tinstance1->codecs, tinstance1);
 	}
 
+        if (glue0->update_peer(c0, instance1, vinstance1, tinstance1, cap1, 0)) {
+                ast_log(LOG_WARNING, "Channel '%s' failed to setup early bridge to '%s'\n", c0->name, c1 ? c1->name : "<unspecified>");
+        }
+
 	res = 0;
 
 done: