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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44196 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/users.conf.sample b/configs/users.conf.sample
index 0e3ca2237173a344fd6a65f3ec335573b4815d57..b03d7d3ce786fc07c83d4681843d5363b0bb7047 100644 (file)
--- a/configs/users.conf.sample
+++ b/configs/users.conf.sample
@@ -34,6 +34,10 @@ hassip = yes
 ;
 hasiax = yes
 ;
+; Create H.323 friend
+;
+;hash323 = yes
+;
 ; Create manager entry
 ;
 hasmanager = no
@@ -59,6 +63,7 @@ pickupgroup = 1
 ;hasvoicemail = yes
 ;hassip = yes
 ;hasiax = no
+;hash323 = no
 ;hasmanager = no
 ;callwaiting = no
 ;context = international

diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index d76aa68dbbea2b2e08992fcef89f2a2a7ef2f43d..b295c57d6311c6f64983e1a0964466c153ebfbde 100644 (file)
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1536,6 +1536,10 @@ static void pbx_load_users(void)
                        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;