diff --git a/apps/app_dahdibarge.c b/apps/app_dahdibarge.c
index 6487a4ddb51167b72bd28c3d84d29bc8ed7c2ca7..a59edc9af1cac56484c67d73eeeb889045b19847 100644
--- a/apps/app_dahdibarge.c
+++ b/apps/app_dahdibarge.c
@@ -53,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/utils.h"
static char *app = "DAHDIBarge";
-static char *deprecated_app = "ZapBarge";
static char *synopsis = "Barge in (monitor) DAHDI channel";
@@ -287,12 +286,6 @@ out:
return res;
}
-static int conf_exec_warn(struct ast_channel *chan, void *data)
-{
- ast_log(LOG_WARNING, "Use of the command %s is deprecated, please use %s instead.\n", deprecated_app, app);
- return conf_exec(chan, data);
-}
-
static int unload_module(void)
{
return ast_unregister_application(app);
@@ -300,7 +293,6 @@ static int unload_module(void)
static int load_module(void)
{
- ast_register_application(deprecated_app, conf_exec_warn, synopsis, descrip);
return ((ast_register_application(app, conf_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c
index 4cc1926043bc32424b39d55a4b243614bf40eade..61848a347b1b0ff642e99b2784bfd42a308fcdfd 100644
--- a/apps/app_dahdiras.c
+++ b/apps/app_dahdiras.c
@@ -53,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/app.h"
static char *app = "DAHDIRAS";
-static char *deprecated_app = "ZapRAS";
static char *synopsis = "Executes DAHDI ISDN RAS application";
@@ -212,12 +211,6 @@ static int dahdiras_exec(struct ast_channel *chan, void *data)
return res;
}
-static int dahdiras_exec_warn(struct ast_channel *chan, void *data)
-{
- ast_log(LOG_WARNING, "Use of the command %s is deprecated, please use %s instead.\n", deprecated_app, app);
- return dahdiras_exec(chan, data);
-}
-
static int unload_module(void)
{
return ast_unregister_application(app);
@@ -225,7 +218,6 @@ static int unload_module(void)
static int load_module(void)
{
- ast_register_application(deprecated_app, dahdiras_exec_warn, synopsis, descrip);
return ((ast_register_application(app, dahdiras_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
diff --git a/apps/app_dahdiscan.c b/apps/app_dahdiscan.c
index 70335b3345f6c3bd627252969b4f689de399bc8f..1f2a0f8fd515d19c7bf11f49f1fc5f4eb9d9788e 100644
--- a/apps/app_dahdiscan.c
+++ b/apps/app_dahdiscan.c
@@ -53,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/options.h"
static char *app = "DAHDIScan";
-static char *deprecated_app = "ZapScan";
static char *synopsis = "Scan DAHDI channels to monitor calls";
@@ -357,12 +356,6 @@ static int conf_exec(struct ast_channel *chan, void *data)
return res;
}
-static int conf_exec_warn(struct ast_channel *chan, void *data)
-{
- ast_log(LOG_WARNING, "Use of the command %s is deprecated, please use %s instead.\n", deprecated_app, app);
- return conf_exec(chan, data);
-}
-
static int unload_module(void)
{
return ast_unregister_application(app);
@@ -370,7 +363,6 @@ static int unload_module(void)
static int load_module(void)
{
- ast_register_application(deprecated_app, conf_exec_warn, synopsis, descrip);
return ((ast_register_application(app, conf_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c
index b0e95dafa329ce4fa4832297afa365a621f29133..40b9c3370a0a84c1ff568cf12035c203d66ba6c0 100644
--- a/apps/app_parkandannounce.c
+++ b/apps/app_parkandannounce.c
@@ -95,7 +95,7 @@ static int parkandannounce_exec(struct ast_channel *chan, void *data)
timeout = atoi(args.timeout) * 1000;
if (ast_strlen_zero(args.dial)) {
- ast_log(LOG_WARNING, "PARK: A dial resource must be specified i.e: Console/dsp or Zap/g1/5551212\n");
+ ast_log(LOG_WARNING, "PARK: A dial resource must be specified i.e: Console/dsp or DAHDI/g1/5551212\n");
return -1;
}
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index fc20f2107d907e4de7f1eecf41939a0719526b8a..5073897ee6d5f53cdf4392a28ef1b1dbcbaba22c 100644
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -10,7 +10,7 @@
</member>
<member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage">
</member>
- <member name="LOTS_OF_SPANS" displayname="More than 32 Zaptel spans">
+ <member name="LOTS_OF_SPANS" displayname="More than 32 DAHDI spans">
</member>
<member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
</member>
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 89da5e690b7ec56736a61e2dca0b304783c2fde3..a48f17c109a968ee773cf0a414b6ad5b6b4cadcb 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -11912,24 +11912,6 @@ static char *dahdi_destroy_channel(struct ast_cli_entry *e, int cmd, struct ast_
return ( RESULT_SUCCESS == ret ) ? CLI_SUCCESS : CLI_FAILURE;
}
-static char *handle_cli_zap_destroy_channel_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "zap destroy channel";
- e->usage =
- "Usage: zap destroy channel <chan num>\n"
- " DON'T USE THIS UNLESS YOU KNOW WHAT YOU ARE DOING. Immediately removes a given channel, whether it is in use or not\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- case CLI_HANDLER:
- return dahdi_destroy_channel(e, cmd, a);
- }
-
- return CLI_FAILURE;
-}
-
static int setup_dahdi(int reload);
static int dahdi_restart(void)
{
@@ -11970,27 +11952,6 @@ static char *dahdi_restart_cmd(struct ast_cli_entry *e, int cmd, struct ast_cli_
return CLI_SUCCESS;
}
-static char *handle_cli_zap_restart_cmd_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "zap restart";
- e->usage =
- "Usage: zap restart\n"
- " Restarts the zap channels: destroys them all and then\n"
- " re-reads them from chan_dahdi.conf.\n"
- " Note that this will STOP any running CALL on zap channels.\n"
- "";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- case CLI_HANDLER:
- return dahdi_restart_cmd(e, cmd, a);
- }
-
- return CLI_FAILURE;
-}
-
static int action_dahdirestart(struct mansession *s, const struct message *m)
{
if (dahdi_restart() != 0) {
@@ -12125,25 +12086,6 @@ static char *dahdi_show_channels(struct ast_cli_entry *e, int cmd, struct ast_cl
#undef FORMAT2
}
-static char *handle_cli_zap_show_channels_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "zap show channels [trunkgroup|group|context]";
- e->usage =
- "Usage: zap show channels [ trunkgroup <trunkgroup> | group <group> | context <context> ]\n"
- " Shows a list of available channels with optional filtering\n"
- " <group> must be a number between 0 and 63\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- case CLI_HANDLER:
- return dahdi_show_channels(e, cmd, a);
- }
-
- return CLI_FAILURE;
-}
-
static char *dahdi_show_channel(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
int channel;
@@ -12321,24 +12263,6 @@ static char *dahdi_show_channel(struct ast_cli_entry *e, int cmd, struct ast_cli
return CLI_FAILURE;
}
-static char *handle_cli_zap_show_channel_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "zap show channel";
- e->usage =
- "Usage: zap show channel <chan num>\n"
- " Detailed information about a given channel\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- case CLI_HANDLER:
- return dahdi_show_channel(e, cmd, a);
- }
-
- return CLI_FAILURE;
-}
-
static char *handle_dahdi_show_cadences(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
int i, j;
@@ -12375,24 +12299,6 @@ static char *handle_dahdi_show_cadences(struct ast_cli_entry *e, int cmd, struct
return CLI_SUCCESS;
}
-static char *handle_cli_zap_show_cadences_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch(cmd) {
- case CLI_INIT:
- e->command = "zap show cadences";
- e->usage =
- "Usage: zap show cadences\n"
- " Shows all cadences currently defined\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- case CLI_HANDLER:
- return handle_dahdi_show_cadences(e, cmd, a);
- }
-
- return CLI_FAILURE;
-}
-
/* Based on irqmiss.c */
static char *dahdi_show_status(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
@@ -12487,24 +12393,6 @@ static char *dahdi_show_status(struct ast_cli_entry *e, int cmd, struct ast_cli_
#undef FORMAT2
}
-static char *handle_cli_zap_show_status_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "zap show status";
- e->usage =
- "Usage: zap show status\n"
- " Shows a list of zap cards with status\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- case CLI_HANDLER:
- return dahdi_show_status(e, cmd, a);
- }
-
- return CLI_FAILURE;
-}
-
static char *dahdi_show_version(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
int pseudo_fd = -1;
@@ -12538,24 +12426,6 @@ static char *dahdi_show_version(struct ast_cli_entry *e, int cmd, struct ast_cli
return CLI_SUCCESS;
}
-static char *handle_cli_zap_show_version_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "zap show version";
- e->usage =
- "Usage: zap show version\n"
- " Shows the zap version in use\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- case CLI_HANDLER:
- return dahdi_show_version(e, cmd, a);
- }
-
- return CLI_FAILURE;
-}
-
static char *dahdi_set_hwgain(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
int channel;
@@ -12625,29 +12495,6 @@ static char *dahdi_set_hwgain(struct ast_cli_entry *e, int cmd, struct ast_cli_a
}
-static char *handle_cli_zap_set_hwgain_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "zap set hwgain";
- e->usage =
- "Usage: zap set hwgain <rx|tx> <chan#> <gain>\n"
- " Sets the hardware gain on a a given channel, overriding the\n"
- " value provided at module loadtime, whether the channel is in\n"
- " use or not. Changes take effect immediately.\n"
- " <rx|tx> which direction do you want to change (relative to our module)\n"
- " <chan num> is the channel number relative to the device\n"
- " <gain> is the gain in dB (e.g. -3.5 for -3.5dB)\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- case CLI_HANDLER:
- return dahdi_set_hwgain(e, cmd, a);
- }
-
- return CLI_FAILURE;
-}
-
static char *dahdi_set_swgain(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
int channel;
@@ -12722,29 +12569,6 @@ static char *dahdi_set_swgain(struct ast_cli_entry *e, int cmd, struct ast_cli_a
}
-static char *handle_cli_zap_set_swgain_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "zap set swgain";
- e->usage =
- "Usage: zap set swgain <rx|tx> <chan#> <gain>\n"
- " Sets the software gain on a a given channel, overriding the\n"
- " value provided at module loadtime, whether the channel is in\n"
- " use or not. Changes take effect immediately.\n"
- " <rx|tx> which direction do you want to change (relative to our module)\n"
- " <chan num> is the channel number relative to the device\n"
- " <gain> is the gain in dB (e.g. -3.5 for -3.5dB)\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- case CLI_HANDLER:
- return dahdi_set_swgain(e, cmd, a);
- }
-
- return CLI_FAILURE;
-}
-
static char *dahdi_set_dnd(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
int channel;
@@ -12802,50 +12626,17 @@ static char *dahdi_set_dnd(struct ast_cli_entry *e, int cmd, struct ast_cli_args
return CLI_SUCCESS;
}
-static char *handle_cli_zap_set_dnd_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "zap set dnd";
- e->usage =
- "Usage: zap set dnd <chan#> <on|off>\n"
- " Sets/resets DND (Do Not Disturb) mode on a channel.\n"
- " Changes take effect immediately.\n"
- " <chan num> is the channel number\n"
- " <on|off> Enable or disable DND mode?\n"
- ;
- return NULL;
- case CLI_GENERATE:
- return NULL;
- case CLI_HANDLER:
- return dahdi_set_dnd(e, cmd, a);
- }
-
- return CLI_FAILURE;
-}
-
-static struct ast_cli_entry cli_zap_show_cadences_deprecated = AST_CLI_DEFINE(handle_cli_zap_show_cadences_deprecated, "List cadences");
-static struct ast_cli_entry cli_zap_show_channels_deprecated = AST_CLI_DEFINE(handle_cli_zap_show_channels_deprecated, "Show active channels");
-static struct ast_cli_entry cli_zap_show_channel_deprecated = AST_CLI_DEFINE(handle_cli_zap_show_channel_deprecated, "Show information on a channel");
-static struct ast_cli_entry cli_zap_destroy_channel_deprecated = AST_CLI_DEFINE(handle_cli_zap_destroy_channel_deprecated, "Destroy a channel");
-static struct ast_cli_entry cli_zap_restart_cmd_deprecated = AST_CLI_DEFINE(handle_cli_zap_restart_cmd_deprecated, "Fully restart channels");
-static struct ast_cli_entry cli_zap_show_status_deprecated = AST_CLI_DEFINE(handle_cli_zap_show_status_deprecated, "Show all cards status");
-static struct ast_cli_entry cli_zap_show_version_deprecated = AST_CLI_DEFINE(handle_cli_zap_show_version_deprecated, "Show DAHDI version in use");
-static struct ast_cli_entry cli_zap_set_hwgain_deprecated = AST_CLI_DEFINE(handle_cli_zap_set_hwgain_deprecated, "Set hardware gain on a channel");
-static struct ast_cli_entry cli_zap_set_swgain_deprecated = AST_CLI_DEFINE(handle_cli_zap_set_swgain_deprecated, "Set software gain on a channel");
-static struct ast_cli_entry cli_zap_set_dnd_deprecated = AST_CLI_DEFINE(handle_cli_zap_set_dnd_deprecated, "Set software gain on a channel");
-
static struct ast_cli_entry dahdi_cli[] = {
- AST_CLI_DEFINE(handle_dahdi_show_cadences, "List cadences", .deprecate_cmd = &cli_zap_show_cadences_deprecated),
- AST_CLI_DEFINE(dahdi_show_channels, "Show active DAHDI channels", .deprecate_cmd = &cli_zap_show_channels_deprecated),
- AST_CLI_DEFINE(dahdi_show_channel, "Show information on a channel", .deprecate_cmd = &cli_zap_show_channel_deprecated),
- AST_CLI_DEFINE(dahdi_destroy_channel, "Destroy a channel", .deprecate_cmd = &cli_zap_destroy_channel_deprecated),
- AST_CLI_DEFINE(dahdi_restart_cmd, "Fully restart DAHDI channels", .deprecate_cmd = &cli_zap_restart_cmd_deprecated),
- AST_CLI_DEFINE(dahdi_show_status, "Show all DAHDI cards status", .deprecate_cmd = &cli_zap_show_status_deprecated),
- AST_CLI_DEFINE(dahdi_show_version, "Show the DAHDI version in use", .deprecate_cmd = &cli_zap_show_version_deprecated),
- AST_CLI_DEFINE(dahdi_set_hwgain, "Set hardware gain on a channel", .deprecate_cmd = &cli_zap_set_hwgain_deprecated),
- AST_CLI_DEFINE(dahdi_set_swgain, "Set software gain on a channel", .deprecate_cmd = &cli_zap_set_swgain_deprecated),
- AST_CLI_DEFINE(dahdi_set_dnd, "Set software gain on a channel", .deprecate_cmd = &cli_zap_set_dnd_deprecated),
+ AST_CLI_DEFINE(handle_dahdi_show_cadences, "List cadences"),
+ AST_CLI_DEFINE(dahdi_show_channels, "Show active DAHDI channels"),
+ AST_CLI_DEFINE(dahdi_show_channel, "Show information on a channel"),
+ AST_CLI_DEFINE(dahdi_destroy_channel, "Destroy a channel"),
+ AST_CLI_DEFINE(dahdi_restart_cmd, "Fully restart DAHDI channels"),
+ AST_CLI_DEFINE(dahdi_show_status, "Show all DAHDI cards status"),
+ AST_CLI_DEFINE(dahdi_show_version, "Show the DAHDI version in use"),
+ AST_CLI_DEFINE(dahdi_set_hwgain, "Set hardware gain on a channel"),
+ AST_CLI_DEFINE(dahdi_set_swgain, "Set software gain on a channel"),
+ AST_CLI_DEFINE(dahdi_set_dnd, "Set software gain on a channel"),
};
#define TRANSFER 0
diff --git a/configs/chan_dahdi.conf.sample b/configs/chan_dahdi.conf.sample
index 7b4e72f1e51b444f114152f6a13bd5beeed9b45b..9c486b13d01c4f4c1d8f0ede91aca24c38a12214 100644
--- a/configs/chan_dahdi.conf.sample
+++ b/configs/chan_dahdi.conf.sample
@@ -464,13 +464,12 @@ callreturn=yes
;
echocancel=yes
;
-; As of Zaptel 1.4.8, some DAHDI echo cancellers (software and hardware)
-; support adjustable parameters; these parameters can be supplied as
-; additional options to the 'echocancel' setting. Note that Asterisk
-; does not attempt to validate the parameters or their values, so if you
-; supply an invalid parameter you will not know the specific reason it
-; failed without checking the kernel message log for the error(s)
-; put there by DAHDI.
+; Some DAHDI echo cancellers (software and hardware) support adjustable
+; parameters; these parameters can be supplied as additional options to
+; the 'echocancel' setting. Note that Asterisk does not attempt to
+; validate the parameters or their values, so if you supply an invalid
+; parameter you will not know the specific reason it failed without
+; checking the kernel message log for the error(s) put there by DAHDI.
;
;echocancel=128,param1=32,param2=0,param3=14
;
diff --git a/contrib/scripts/autosupport b/contrib/scripts/autosupport
index 300d2202389a9b2bbaea27931724c06fe430edeb..3eeb706e011e1acc7b959404f51ea4c9837035f1 100644
--- a/contrib/scripts/autosupport
+++ b/contrib/scripts/autosupport
@@ -149,16 +149,15 @@ if [ "$ans" = "y" ]; then
echo >> $OUTPUT;
echo >> $OUTPUT;
- #jpeeler: REVISIT
echo "------------------" >> $OUTPUT;
- echo "ZAPTEL CONFIG" >> $OUTPUT;
+ echo "DAHDI CONFIG" >> $OUTPUT;
echo "------------------" >> $OUTPUT;
- grep -v '^#' /etc/dahdi.conf >> $OUTPUT;
+ grep -v '^#' /etc/dahdi/system.conf >> $OUTPUT;
echo >> $OUTPUT;
echo >> $OUTPUT;
echo "------------------" >> $OUTPUT;
- echo "ZAPATA CONFIG" >> $OUTPUT;
+ echo "CHAN_DAHDI CONFIG" >> $OUTPUT;
echo "------------------" >> $OUTPUT;
grep -v '^;' /etc/asterisk/chan_dahdi.conf >> $OUTPUT;
echo >> $OUTPUT;
diff --git a/doc/osp.txt b/doc/osp.txt
index 6bad3a25cb6f033ec39683e7099a040f98c2acd6..a0cd42968168c9305c153454da113ad2c074ee07 100644
--- a/doc/osp.txt
+++ b/doc/osp.txt
@@ -304,7 +304,7 @@ defaultprotocol=SIP
3.1.3 extensions.conf
OSP functions are implemented as dial plan functions in the extensions.conf file. To add OSP support to your Asterisk server, simply copy and paste the text box below to your extensions.conf file. These functions will enable your Asterisk server to support all OSP call scenarios. Configuration of your Asterisk server for OSP is now complete.
[globals]
-DIALOUT=Zap/1
+DIALOUT=DAHDI/1
[SrcGW] ; OSP Source Gateway
exten => _XXXX.,1,NoOp(OSPSrcGW)
diff --git a/doc/ss7.txt b/doc/ss7.txt
index 94d01a0b015b1c204e41bf7176edea9e4fda2a92..0e4bb0bc5df453209ce09d7749517e174ecfb8a1 100644
--- a/doc/ss7.txt
+++ b/doc/ss7.txt
@@ -79,25 +79,25 @@ defaultdpc = 3 ; The point code of the switch you want to send your ISUP
; Now we configure our Bearer channels (CICs)
-cicbeginswith = 1 ; Number to start counting the CICs from. So if Zap/1 to
- ; Zap/15 are CICs 1-15, you would set this to 1 before you
+cicbeginswith = 1 ; Number to start counting the CICs from. So if DAHDI/1 to
+ ; DAHDI/15 are CICs 1-15, you would set this to 1 before you
; declare channel=1-15
-channel=1-15 ; Use Zap/1-15 and assign them to CICs 1-15
+channel=1-15 ; Use DAHDI/1-15 and assign them to CICs 1-15
-cicbeginswith = 17 ; Now for Zap/17 to Zap/31, they are CICs 17-31 so we initialize
+cicbeginswith = 17 ; Now for DAHDI/17 to DAHDI/31, they are CICs 17-31 so we initialize
; cicbeginswith to 17 before we declare those channels
channel = 17-31 ; This assigns CICs 17-31 to channels 17-31
-sigchan = 16 ; This is where you declare which Zap channel is your signalling
- ; channel. In our case it is Zap/16. You can add redundant
+sigchan = 16 ; This is where you declare which DAHDI channel is your signalling
+ ; channel. In our case it is DAHDI/16. You can add redundant
; signalling channels by adding additional sigchan= lines.
; If we want an alternate redundant signalling channel add this
sigchan = 48 ; This would put two signalling channels in our linkset, one at
- ; Zap/16 and one at Zap/48 which both would be used to send/receive
+ ; DAHDI/16 and one at DAHDI/48 which both would be used to send/receive
; ISUP traffic.
; End of chan_dahdi.conf
diff --git a/main/channel.c b/main/channel.c
index 1b396084cf24ac84afd0bde48b70590f4ea09634..3a9726393857363c6ad8b5408661c3c2da075d0b 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -3426,11 +3426,6 @@ struct ast_channel *ast_request(const char *type, int format, void *data, int *c
return NULL;
}
- if (!strcasecmp(type, "Zap")) {
- type = "DAHDI";
- ast_log(LOG_NOTICE, "Zap interface translated to DAHDI.\n");
- }
-
AST_LIST_TRAVERSE(&backends, chan, list) {
if (strcasecmp(type, chan->tech->type))
continue;
diff --git a/main/loader.c b/main/loader.c
index 6fe6b78c40708de5dad780feeed0dc7172b4d657..735459f040c0038d0852bc29dec80611a232ca7d 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -755,22 +755,6 @@ static struct load_order_entry *add_to_load_order(const char *resource, struct l
return order;
}
-static int translate_module_name(const char *oldname, char *newname)
-{
- if (!strcasecmp(oldname, "app_zapbarge.so"))
- ast_copy_string(newname, "app_dahdibarge.so", 18);
- else if(!strcasecmp(oldname, "app_zapras.so"))
- ast_copy_string(newname, "app_dahdiras.so", 16);
- else if(!strcasecmp(oldname, "app_zapscan.so"))
- ast_copy_string(newname, "app_dahdiscan.so", 17);
- else if(!strcasecmp(oldname, "codec_zap.so"))
- ast_copy_string(newname, "codec_dahdi.so", 16);
- else
- return -1; /* no use for newname, oldname is fine */
-
- return 0;
-}
-
int load_modules(unsigned int preload_only)
{
struct ast_config *cfg;
@@ -783,8 +767,6 @@ int load_modules(unsigned int preload_only)
struct ast_flags config_flags = { 0 };
int modulecount = 0;
- int translate_status;
- char newname[18]; /* although this would normally be 80, max length in translate_module_name is 18 */
#ifdef LOADABLE_MODULES
struct dirent *dirent;
DIR *dir;
@@ -813,10 +795,7 @@ int load_modules(unsigned int preload_only)
/* first, find all the modules we have been explicitly requested to load */
for (v = ast_variable_browse(cfg, "modules"); v; v = v->next) {
if (!strcasecmp(v->name, preload_only ? "preload" : "load")) {
- translate_status = translate_module_name(v->value, newname);
- if (!translate_status)
- ast_log(LOG_WARNING, "Use of old module name %s is deprecated, please use %s instead.\n", v->value, newname);
- add_to_load_order(translate_status ? v->value : newname, &load_order);
+ add_to_load_order(v->value, &load_order);
}
}
@@ -873,10 +852,7 @@ int load_modules(unsigned int preload_only)
continue;
AST_LIST_TRAVERSE_SAFE_BEGIN(&load_order, order, entry) {
- translate_status = translate_module_name(v->value, newname);
- if (!resource_name_match(order->resource, translate_status ? v->value : newname)) {
- if (!translate_status)
- ast_log(LOG_WARNING, "Use of old module name %s is deprecated, please use %s instead.\n", v->value, newname);
+ if (!resource_name_match(order->resource, v->value)) {
AST_LIST_REMOVE_CURRENT(entry);
ast_free(order->resource);
ast_free(order);
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index ca667ffe7846f802e4bffcaf64c2c72b3c15884a..bc27ccc1a7857ddf8cebcce50f551ad86b8abf01 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1620,16 +1620,6 @@ static void pbx_load_users(void)
dahdichan = ast_variable_retrieve(cfg, cat, "dahdichan");
if (!dahdichan)
dahdichan = ast_variable_retrieve(cfg, "general", "dahdichan");
- if (!dahdichan) {
- /* no dahdichan, but look for zapchan too */
- dahdichan = ast_variable_retrieve(cfg, cat, "zapchan");
- if (!dahdichan) {
- dahdichan = ast_variable_retrieve(cfg, "general", "zapchan");
- }
- if (!ast_strlen_zero(dahdichan)) {
- ast_log(LOG_WARNING, "Use of zapchan in users.conf is deprecated. Please update configuration to use dahdichan instead.\n");
- }
- }
if (!ast_strlen_zero(dahdichan)) {
ast_copy_string(dahdicopy, dahdichan, sizeof(dahdicopy));
c = dahdicopy;
diff --git a/sample.call b/sample.call
index eed62cfde8904c15a43fabc37358c61a48eaf742..819e4e970aefd5beffa8e8c9877bb4c63f572f6c 100644
--- a/sample.call
+++ b/sample.call
@@ -13,7 +13,7 @@
# Obviously, you MUST specify at least a channel in the same format as you
# would for the "Dial" application. Only one channel name is permitted.
#
-Channel: Zap/1
+Channel: DAHDI/1
#
# You can specify codecs for the call
Codecs: alaw, speex, h264