Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@122234 f38db490-d61c-443f-a65b-d21fe96a405b

6 files changed, 35 insertions, 80 deletions

diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index d219a1eb7..99aa3ca2a 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -173,6 +173,12 @@
 /* Define to indicate the ${CURSES_DESCRIP} library version */
 #undef HAVE_CURSES_VERSION
 
+/* Define if your system has the DAHDI headers. */
+#undef HAVE_DAHDI
+
+/* Define DAHDI headers version */
+#undef HAVE_DAHDI_VERSION
+
 /* Define to 1 if your system has /dev/urandom. */
 #undef HAVE_DEV_URANDOM
 
@@ -1053,54 +1059,6 @@
 /* Define to indicate the ${X11_DESCRIP} library version */
 #undef HAVE_X11_VERSION
 
-/* Define this to indicate the ${ZAPTEL_DESCRIP} library */
-#undef HAVE_ZAPTEL
-
-/* Define if your system has the ZAPTEL_CHANALARMS headers. */
-#undef HAVE_ZAPTEL_CHANALARMS
-
-/* Define ZAPTEL_CHANALARMS headers version */
-#undef HAVE_ZAPTEL_CHANALARMS_VERSION
-
-/* Define if your system has the ZAPTEL_ECHOCANPARAMS headers. */
-#undef HAVE_ZAPTEL_ECHOCANPARAMS
-
-/* Define ZAPTEL_ECHOCANPARAMS headers version */
-#undef HAVE_ZAPTEL_ECHOCANPARAMS_VERSION
-
-/* Define if your system has the ZAPTEL_HWGAIN headers. */
-#undef HAVE_ZAPTEL_HWGAIN
-
-/* Define ZAPTEL_HWGAIN headers version */
-#undef HAVE_ZAPTEL_HWGAIN_VERSION
-
-/* Define if your system has the ZAPTEL_NEONMWI headers. */
-#undef HAVE_ZAPTEL_NEONMWI
-
-/* Define ZAPTEL_NEONMWI headers version */
-#undef HAVE_ZAPTEL_NEONMWI_VERSION
-
-/* Define if your system has the ZAPTEL_SIG_MTP2 headers. */
-#undef HAVE_ZAPTEL_SIG_MTP2
-
-/* Define ZAPTEL_SIG_MTP2 headers version */
-#undef HAVE_ZAPTEL_SIG_MTP2_VERSION
-
-/* Define if your system has the ZAPTEL_TRANSCODE headers. */
-#undef HAVE_ZAPTEL_TRANSCODE
-
-/* Define ZAPTEL_TRANSCODE headers version */
-#undef HAVE_ZAPTEL_TRANSCODE_VERSION
-
-/* Define to indicate the ${ZAPTEL_DESCRIP} library version */
-#undef HAVE_ZAPTEL_VERSION
-
-/* Define this to indicate the ${ZAPTEL_VLDTMF_DESCRIP} library */
-#undef HAVE_ZAPTEL_VLDTMF
-
-/* Define to indicate the ${ZAPTEL_VLDTMF_DESCRIP} library version */
-#undef HAVE_ZAPTEL_VLDTMF_VERSION
-
 /* Define this to indicate the ${ZLIB_DESCRIP} library */
 #undef HAVE_ZLIB
 
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 96dc52c0f..1aa4a083e 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -28,7 +28,7 @@
 	A phone call through Asterisk consists of an incoming
 	connection and an outbound connection. Each call comes
 	in through a channel driver that supports one technology,
-	like SIP, ZAP, IAX2 etc. 
+	like SIP, DAHDI, IAX2 etc. 
 	\par
 	Each channel driver, technology, has it's own private
 	channel or dialog structure, that is technology-dependent.
@@ -92,7 +92,7 @@
 	them together.
 	
 	The conference bridge (meetme) handles several channels simultaneously
-	with the support of an external timer (zaptel timer). This is used
+	with the support of an external timer (DAHDI timer). This is used
 	not only by the Conference application (meetme) but also by the
 	page application and the SLA system introduced in 1.4.
 	The conference bridge does not handle video.
@@ -224,10 +224,10 @@ struct ast_datastore {
  * 
  * SIP and IAX2 has utf8 encoded Unicode caller ID names.
  * In some cases, we also have an alternative (RPID) E.164 number that can be used
- * as caller ID on numeric E.164 phone networks (zaptel or SIP/IAX2 to pstn gateway).
+ * as caller ID on numeric E.164 phone networks (DAHDI or SIP/IAX2 to pstn gateway).
  *
  * \todo Implement settings for transliteration between UTF8 caller ID names in
- *       to Ascii Caller ID's (Zaptel). Östen Åsklund might be transliterated into
+ *       to Ascii Caller ID's (DAHDI). Östen Åsklund might be transliterated into
  *	 Osten Asklund or Oesten Aasklund depending upon language and person...
  *	 We need automatic routines for incoming calls and static settings for
  * 	 our own accounts.
@@ -249,7 +249,7 @@ struct ast_callerid {
 	See for examples:
 	\arg chan_iax2.c - The Inter-Asterisk exchange protocol
 	\arg chan_sip.c - The SIP channel driver
-	\arg chan_zap.c - PSTN connectivity (TDM, PRI, T1/E1, FXO, FXS)
+	\arg chan_dahdi.c - PSTN connectivity (TDM, PRI, T1/E1, FXO, FXS)
 
 	If you develop your own channel driver, this is where you
 	tell the PBX at registration of your driver what properties
@@ -1423,7 +1423,7 @@ int ast_autoservice_start(struct ast_channel *chan);
  */
 int ast_autoservice_stop(struct ast_channel *chan);
 
-/* If built with zaptel optimizations, force a scheduled expiration on the
+/* If built with dahdi optimizations, force a scheduled expiration on the
    timer fd, at which point we call the callback function / data */
 int ast_settimeout(struct ast_channel *c, int samples, int (*func)(const void *data), void *data);
 
diff --git a/include/asterisk/zapata.h b/include/asterisk/dahdi.h
index 50df73a58..0a37b891d 100644
--- a/include/asterisk/zapata.h
+++ b/include/asterisk/dahdi.h
@@ -18,31 +18,25 @@
  */
 
 /*! \file
- * \brief Stub to find zaptel headers
+ * \brief Stub to find DAHDI headers
 *
- * Stub to find the zaptel headers. The configure script will
- * define HAVE_ZAPTEL_VERSION according to what it has found.
- * Applications should include "zapata.h" and not (directly)
- * <foo/zaptel.h> or <foo/tonezone.h>.
+ * Stub to find the DAHDI headers. The configure script will
+ * define HAVE_DAHDI_VERSION according to what it has found.
+ * Applications should include "user.h" and not (directly)
+ * <foo/user.h>
  * For the mapping of version numbers to location see below.
  *
  */
-#ifndef _AST_ZAPATA_H
-#define	_AST_ZAPATA_H
+#ifndef _AST_DAHDI_H
+#define	_AST_DAHDI_H
 
-#ifdef HAVE_ZAPTEL
+#ifdef HAVE_DAHDI
 #include <sys/ioctl.h>
 
-#if defined(HAVE_ZAPTEL_VERSION) && HAVE_ZAPTEL_VERSION < 100
-/* Very old versions of zaptel drivers on FreeBSD install in ${PREFIX} */
-#include <zaptel.h>
-#include <tonezone.h>
-#else
-/* newer versions install in ${PREFIX}/zaptel */
-#include <zaptel/zaptel.h>
-#include <zaptel/tonezone.h>
-#endif	/* HAVE_ZAPTEL_VERSION < 100 */
+/* newer versions install in ${PREFIX}/dahdi */
+#include <dahdi/user.h>
+#include <dahdi/tonezone.h>
 
-#endif	/* HAVE_ZAPTEL */
+#endif	/* HAVE_DAHDI */
 
-#endif	/* _AST_ZAPATA_H */
+#endif	/* _AST_DAHDI_H */
diff --git a/include/asterisk/doxyref.h b/include/asterisk/doxyref.h
index 6fbe462ec..710da354c 100644
--- a/include/asterisk/doxyref.h
+++ b/include/asterisk/doxyref.h
@@ -225,7 +225,7 @@ DUNDi is not itself a Voice-over IP signaling or media protocol. Instead, it pub
  * \arg \link Config_sip SIP configuration  \endlink
  * \arg \link Config_mgcp MGCP configuration  \endlink
  * \arg \link Config_rtp RTP configuration  \endlink
- * \arg \link Config_zap Zaptel configuration  \endlink
+ * \arg \link Config_dahdi DAHDI configuration  \endlink
  * \arg \link Config_oss OSS (sound card) configuration  \endlink
  * \arg \link Config_alsa ALSA (sound card) configuration  \endlink
  * \arg \link Config_agent Agent (proxy channel) configuration  \endlink
@@ -339,10 +339,10 @@ DUNDi is not itself a Voice-over IP signaling or media protocol. Instead, it pub
  * \verbinclude voicemail.conf.sample
  */
 
-/*! \page Config_zap Zaptel configuration
- * \section zapconf zapata.conf
- * \arg Implemented in \ref chan_zap.c
- * \verbinclude zapata.conf.sample
+/*! \page Config_dahdi DAHDI configuration
+ * \section dahdiconf dahdi.conf
+ * \arg Implemented in \ref chan_dahdi.c
+ * \verbinclude dahdi.conf.sample
  */
 
 /*! \page Config_h323 H.323 channel driver information
diff --git a/include/asterisk/dsp.h b/include/asterisk/dsp.h
index 871a51ac9..5193ff4dd 100644
--- a/include/asterisk/dsp.h
+++ b/include/asterisk/dsp.h
@@ -143,7 +143,7 @@ int ast_dsp_init(void);
  *
  * This is called from ast_frame_free if AST_FRFLAG_FROM_DSP is set. This occurs
  * because it is possible for the dsp to be freed while someone still holds a reference
- * to the frame that is in that dsp. This has been known to happen when the dsp on a Zap
+ * to the frame that is in that dsp. This has been known to happen when the dsp on a DAHDI
  * channel detects a busy signal. The channel is hung up, and the application that read the
  * frame to begin with still has a reference to the frame.
  *
diff --git a/include/asterisk/options.h b/include/asterisk/options.h
index 3b639e6b9..c961d9175 100644
--- a/include/asterisk/options.h
+++ b/include/asterisk/options.h
@@ -29,6 +29,8 @@ extern "C" {
 
 #define AST_CACHE_DIR_LEN 	512
 #define AST_FILENAME_MAX	80
+#define AST_CHANNEL_NAME    80  /*!< Max length of an ast_channel name */
+
 
 /*! \ingroup main_options */
 enum ast_option_flags {
@@ -70,7 +72,7 @@ enum ast_option_flags {
 	AST_OPT_FLAG_DONT_WARN = (1 << 18),
 	/*! End CDRs before the 'h' extension */
 	AST_OPT_FLAG_END_CDR_BEFORE_H_EXTEN = (1 << 19),
-	/*! Use Zaptel Timing for generators if available */
+	/*! Use DAHDI Timing for generators if available */
 	AST_OPT_FLAG_INTERNAL_TIMING = (1 << 20),
 	/*! Always fork, even if verbose or debug settings are non-zero */
 	AST_OPT_FLAG_ALWAYS_FORK = (1 << 21),
@@ -139,6 +141,7 @@ extern struct timeval ast_lastreloadtime;
 extern pid_t ast_mainpid;
 
 extern char record_cache_dir[AST_CACHE_DIR_LEN];
+extern char dahdi_chan_name[AST_CHANNEL_NAME];
 
 extern int ast_language_is_prefix;