Changeset 6595

Timestamp:

09/07/08 13:42:10 (3 months ago)

Author:

pnlarsson

Message:

Fix for #3077 - DAHDI support, commit no 2 for core

Files:

• freepbx/branches/2.5/amp_conf/astetc/chan_dahdi.conf.template (added)
• freepbx/branches/2.5/amp_conf/bin/freepbx_engine (modified) (1 diff)
• freepbx/branches/2.5/amp_conf/bin/libfreepbx.confgen.php (modified) (3 diffs)
• freepbx/branches/2.5/amp_conf/bin/retrieve_conf (modified) (1 diff)
• freepbx/branches/2.5/amp_conf/htdocs/admin/extensions.class.php (modified) (1 diff)
• freepbx/branches/2.5/amp_conf/htdocs/admin/functions.inc.php (modified) (2 diffs)
• freepbx/branches/2.5/amp_conf/htdocs/recordings/includes/main.conf.php (modified) (1 diff)

freepbx/branches/2.5/amp_conf/bin/freepbx_engine

@@ -96 +96 @@
-        # Ensure that various hardware devices are owned correctly.
-        [ -e /dev/zap ] && chown -R $AMPDEVUSER:$AMPDEVGROUP /dev/zap 
+        [ -e /dev/dahdi ] && chown -R $AMPDEVUSER:$AMPDEVGROUP /dev/dahdi 
-        [ -e /dev/capi20 ] && chown -R $AMPDEVUSER:$AMPDEVGROUP /dev/capi20
-        [ -e /dev/misdn ] && chown -R $AMPDEVUSER:$AMPDEVGROUP /dev/misdn

freepbx/branches/2.5/amp_conf/bin/libfreepbx.confgen.php

@@ -170 +170 @@
-
-function generate_configurations_zap($ast_version) {
-
+
-        global $amp_conf;
-        global $db;
@@ -177 +177 @@
-
-        $zap_conf = $amp_conf['ASTETCDIR']."/zapata_additional.conf";
+        $channel_name = 'ZAP';
+        if ($chan_dahdi) {
+                $zap_conf = $amp_conf['ASTETCDIR']."/chan_dahdi_additional.conf";
+                $channel_name = 'DAHDI';
+        }
-
-        $table_name = "zap";
@@ -184 +189 @@
-        $zap_conf_fh = fopen($zap_conf,"w");
-        if ($zap_conf_fh === false) {
-ZAP configurations"),sprintf(_("Failed creating/overwriting Zapata
+$channel_name configurations"),sprintf(_("Failed creating/overwriting $channel_name
-        }
-

freepbx/branches/2.5/amp_conf/bin/retrieve_conf

@@ -370 +370 @@
-$engine = $engineinfo['engine'];
-$version = $engineinfo['version'];
+$chan_dahdi = ast_with_dahdi();
-
-// Check for and report any extension conflicts

freepbx/branches/2.5/amp_conf/htdocs/admin/extensions.class.php

@@ -929 +929 @@
-class ext_zapbarge extends extension {
-        function output() {
-
+
+
+
+
+
+
+
+
-        }
-}

freepbx/branches/2.5/amp_conf/htdocs/admin/functions.inc.php

@@ -729 +729 @@
-        'AMPENABLEDEVELDEBUG'=> array('bool' , false),
-        'AMPMPG123'      => array('bool' , true),
+        'ZAP2DAHDICOMPAT' => array('bool' , false),
-);
-
@@ -1273 +1274 @@
-        else
-                return false;
+}
+
+/**
+ * returns true if asterisk is running with chan_dahdi
+ *
+ * @return bool
+ */
+function ast_with_dahdi() {
+        global $version;
+        global $astman;
+        global $amp_conf;
+        
+        if (!$amp_conf['ZAP2DAHDICOMPAT']) {
+                return false;
+        }
+        
+        if (empty($version)) {
+                $engine_info = engine_getinfo();
+                $version = $engine_info['version'];
+        }
+                
+        if (version_compare($version, '1.4', 'ge') && $amp_conf['AMPENGINE'] == 'asterisk') {           
+                if (isset($astman) && $astman->connected()) {
+                        $response = $astman->send_request('Command', array('Command' => 'module show like chan_dahdi'));
+                        if (preg_match('/1 modules loaded/', $response['data'])) {
+                                return true;
+                        }
+                }
+        }
+        return false;
-}
-

freepbx/branches/2.5/amp_conf/htdocs/recordings/includes/main.conf.php

@@ -263 +263 @@
-$ASTERISK_PROTOCOLS['sip']['config_files'] = "/etc/asterisk/sip.conf;/etc/asterisk/sip_additional.conf";
-$ASTERISK_PROTOCOLS['zap']['table'] = "zap";
-
+;/etc/asterisk/chan_dahdi.conf;/etc/asterisk/chan_dahdi_additional.conf
-
-# Settings for Follow-Me Select Boxes in seconds