Changeset 5450

Timestamp:

12/11/07 09:06:25 (1 year ago)

Author:

p_lindheimer

Message:

moved all sip.conf and iax.conf settings into _general_additional.conf files for auto-generation and modified core_conf to add iax file, as well as added the auto-generation of the required core settings

Files:

• modules/branches/2.4/core/etc/extensions.conf (modified) (1 diff)
• modules/branches/2.4/core/etc/iax.conf (modified) (1 diff)
• modules/branches/2.4/core/etc/sip.conf (modified) (2 diffs)
• modules/branches/2.4/core/functions.inc.php (modified) (6 diffs)
• modules/branches/2.4/core/module.xml (modified) (1 diff)

modules/branches/2.4/core/etc/extensions.conf

@@ +1 @@
+; do not edit this file, this is an auto-generated file by freepbx
+; all modifications must be done from the web gui
+
-; FreePBX
-; Copyright (C) 2004 Coalescent Systems Inc (Canada)
-; Copyright (C) 2006 Why Pay More 4 Less Pty Ltd (Australia)
+; Copyright (C) 2007 Astrogen LLC (USA)
-; Released under the GNU GPL Licence version 2.
-

modules/branches/2.4/core/etc/iax.conf

@@ +1 @@
+; do not edit this file, this is an auto-generated file by freepbx
+; all modifications must be done from the web gui
+
-[general]
-bindport = 4569           ; Port to bind to (IAX is 4569)
-bindaddr = 0.0.0.0    ; Address to bind to (all addresses on machine)
-disallow=all
-allow=ulaw
-allow=alaw
-allow=gsm
-mailboxdetail=yes
-
+; These will all be included in the [general] context
+#include iax_general_additional.conf
-#include iax_general_custom.conf
-#include iax_registrations_custom.conf
-#include iax_registrations.conf
+
+; These should all be expected to come after the [general] context
+;
-#include iax_custom.conf
-#include iax_additional.conf

modules/branches/2.4/core/etc/sip.conf

@@ -1 @@
-
-
-
+
+
-
-[general]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-; enable and force the sip jitterbuffer. If these settings are desired
-; they should be set in the sip_general_custom.conf file as this file
@@ -32 +11 @@
-; jbforce=yes
-
-
-
+
+
+
-#include sip_general_custom.conf
-#include sip_nat.conf
-#include sip_registrations_custom.conf
-#include sip_registrations.conf
+
+; These should all be expected to come after the [general] context
+;
-#include sip_custom.conf
-#include sip_additional.conf

modules/branches/2.4/core/functions.inc.php

@@ -15 +15 @@
-                        $files[] = 'sip_general_additional.conf';
-                }
+                if (isset($this->_iax_general) && is_array($this->_iax_general)) {
+                        $files[] = 'iax_general_additional.conf';
+                }
-                return $files;
-        }
@@ -32 +35 @@
-                                return $this->generate_sip_registrations($version);
-                                break;
+                        case 'iax_general_additional.conf':
+                                return $this->generate_iax_general_additional($version);
+                                break;
-                        case 'iax_additional.conf':
-                                return $this->generate_iax_additional($version);
@@ -45 +51 @@
-
-        function addSipGeneral($key, $value) {
-$key] = $value
+] = array('key' => $key, 'value' => $value)
-        }
-
@@ -52 +58 @@
-
-                if (isset($this->_sip_general) && is_array($this->_sip_general)) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                }
@@ -403 +424 @@
-        global $version;  // this is not the best way to pass this, this should be passetd together with $engine
-        global $amp_conf;
+        global $core_conf;
-
-        $modulename = "core";
@@ -408 +430 @@
-        switch($engine) {
-                case "asterisk":
+
+                        // Now add to sip_general_addtional.conf
+                        //
+                        if (isset($core_conf) && is_a($core_conf, "core_conf")) {
+                                $core_conf->addSipGeneral('bindport','5060');
+                                $core_conf->addSipGeneral('bindaddr','0.0.0.0');
+                                $core_conf->addSipGeneral('disallow','all');
+                                $core_conf->addSipGeneral('allow','ulaw');
+                                $core_conf->addSipGeneral('allow','alaw');
+                                $core_conf->addSipGeneral('context','from-sip-external');
+                                $core_conf->addSipGeneral('callerid','Unknown');
+                                $core_conf->addSipGeneral('tos','0x68'); // This really doesn't do anything with astersk not running as root
+                                $core_conf->addSipGeneral('notifyringing','yes');
+                                if (version_compare($ast_version, "1.4", "ge")) { 
+                                        $core_conf->addSipGeneral('notifyhold','yes');
+                                        $core_conf->addSipGeneral('limitonpeers','yes');
+                                }
+                                $core_conf->addIaxGeneral('bindport','4569');
+                                $core_conf->addIaxGeneral('bindaddr','0.0.0.0');
+                                $core_conf->addIaxGeneral('disallow','all');
+                                $core_conf->addIaxGeneral('allow','ulaw');
+                                $core_conf->addIaxGeneral('allow','alaw');
+                                $core_conf->addIaxGeneral('allow','gsm');
+                                $core_conf->addIaxGeneral('mailboxdetail','yes');
+                        }
+
-                        // FeatureCodes
-                        $fcc = new featurecode($modulename, 'userlogon');

modules/branches/2.4/core/module.xml

@@ -4 +4 @@
-        <category>Basic</category>
-        <name>Core</name>
-0
+1
-        <candisable>no</candisable>
-        <canuninstall>no</canuninstall>
-        <changelog>
+                *2.4.0beta1.1* moved all sip.conf and iax.conf settings into _general_additional.conf files for auto-generation
-                *2.4.0beta1.0* addition of zapchandids page and removal of Channel in inbound routes, Extension/Destination Registry support, Adhoc Device
-                               and login/out improvments. Added ringing to Terminate Call Destinations,  #2493, #1974, #2470, #1697, #2357, #2393 pinless dialing