[svn-commits] pcadach: trunk r44196 - in /trunk: ./ configs/users.conf.sample pbx/pbx_config.c

[svn-commits at lists.digium.com]

Author: pcadach
Date: Mon Oct  2 14:01:10 2006
New Revision: 44196

URL: http://svn.digium.com/view/asterisk?rev=44196&view=rev
Log:
Merged revisions 44186 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44186 | pcadach | 2006-10-03 00:52:56 +0600 (Втр, 03 Окт 2006) | 1 line

Missed part of userconf functionality for chan_h323
........

Modified:
    trunk/   (props changed)
    trunk/configs/users.conf.sample
    trunk/pbx/pbx_config.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/configs/users.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/users.conf.sample?rev=44196&r1=44195&r2=44196&view=diff
==============================================================================
--- trunk/configs/users.conf.sample (original)
+++ trunk/configs/users.conf.sample Mon Oct  2 14:01:10 2006
@@ -34,6 +34,10 @@
 ;
 hasiax = yes
 ;
+; Create H.323 friend
+;
+;hash323 = yes
+;
 ; Create manager entry
 ;
 hasmanager = no
@@ -59,6 +63,7 @@
 ;hasvoicemail = yes
 ;hassip = yes
 ;hasiax = no
+;hash323 = no
 ;hasmanager = no
 ;callwaiting = no
 ;context = international

Modified: trunk/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/pbx_config.c?rev=44196&r1=44195&r2=44196&view=diff
==============================================================================
--- trunk/pbx/pbx_config.c (original)
+++ trunk/pbx/pbx_config.c Mon Oct  2 14:01:10 2006
@@ -1536,6 +1536,10 @@
 			snprintf(tmp, sizeof(tmp), "IAX/%s", cat);
 			append_interface(iface, sizeof(iface), tmp);
 		}
+		if (ast_true(ast_config_option(cfg, cat, "hash323"))) {
+			snprintf(tmp, sizeof(tmp), "H323/%s", cat);
+			append_interface(iface, sizeof(iface), tmp);
+		}
 		hasexten = ast_config_option(cfg, cat, "hasexten");
 		if (hasexten && !ast_true(hasexten))
 			continue;