aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/app_dahdibarge.c8
-rw-r--r--apps/app_parkandannounce.c2
-rw-r--r--build_tools/cflags.xml2
-rw-r--r--channels/chan_dahdi.c239
-rw-r--r--configs/chan_dahdi.conf.sample13
-rw-r--r--contrib/scripts/autosupport7
-rw-r--r--doc/osp.txt2
-rw-r--r--doc/ss7.txt14
-rw-r--r--main/channel.c5
-rw-r--r--main/features.c2
-rw-r--r--main/file.c6
-rw-r--r--main/loader.c28
-rw-r--r--pbx/pbx_config.c10
-rw-r--r--sample.call2
14 files changed, 36 insertions, 304 deletions
diff --git a/apps/app_dahdibarge.c b/apps/app_dahdibarge.c
index 25b6f0268..04c6af045 100644
--- a/apps/app_dahdibarge.c
+++ b/apps/app_dahdibarge.c
@@ -54,7 +54,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";
@@ -288,12 +287,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);
@@ -301,7 +294,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 8f47248d0..dc1d4c8c5 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 78622a39e..d85165085 100644
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -14,7 +14,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 e16a37601..30a91a12f 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -1676,15 +1676,9 @@ static void dahdi_disable_ec(struct dahdi_pvt *p)
int res;
if (p->echocanon) {
-#if defined(HAVE_ZAPTEL_ECHOCANPARAMS)
struct dahdi_echocanparams ecp = { .tap_length = 0 };
res = ioctl(p->subs[SUB_REAL].zfd, DAHDI_ECHOCANCEL_PARAMS, &ecp);
-#else
- int x = 0;
-
- res = ioctl(p->subs[SUB_REAL].zfd, DAHDI_ECHOCANCEL, &x);
-#endif
if (res)
ast_log(LOG_WARNING, "Unable to disable echo cancellation on channel %d: %s\n", p->channel, strerror(errno));
@@ -4158,9 +4152,7 @@ static int get_alarms(struct dahdi_pvt *p)
{
int res;
DAHDI_SPANINFO zi;
-#if defined(HAVE_ZAPTEL_CHANALARMS)
struct dahdi_params params;
-#endif
memset(&zi, 0, sizeof(zi));
zi.spanno = p->span;
@@ -4173,11 +4165,9 @@ static int get_alarms(struct dahdi_pvt *p)
return 0;
}
-#if defined(HAVE_ZAPTEL_CHANALARMS)
/* No alarms on the span. Check for channel alarms. */
if ((res = ioctl(p->subs[SUB_REAL].zfd, DAHDI_GET_PARAMS, &params)) >= 0)
return params.chan_alarms;
-#endif
ast_log(LOG_WARNING, "Unable to determine alarm on channel %d\n", p->channel);
@@ -11740,24 +11730,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)
{
@@ -11798,27 +11770,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) {
@@ -11953,25 +11904,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;
@@ -12148,24 +12080,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;
@@ -12202,24 +12116,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)
{
@@ -12314,24 +12210,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;
@@ -12365,24 +12243,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;
@@ -12452,29 +12312,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;
@@ -12549,29 +12386,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;
@@ -12629,50 +12443,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 7b4e72f1e..9c486b13d 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 300d22023..3eeb706e0 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 6bad3a25c..a0cd42968 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 94d01a0b0..0e4bb0bc5 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 a287893e8..dfedb60b2 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -3408,11 +3408,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/features.c b/main/features.c
index c6e741cca..e374b9185 100644
--- a/main/features.c
+++ b/main/features.c
@@ -2193,7 +2193,7 @@ static void *do_parking_thread(void *ignore)
if (pu->peername[0]) {
char *peername = ast_strdupa(pu->peername);
char *cp = strrchr(peername, '-');
- char peername_flat[AST_MAX_EXTENSION]; /* using something like Zap/52 for an extension name is NOT a good idea */
+ char peername_flat[AST_MAX_EXTENSION]; /* using something like DAHDI/52 for an extension name is NOT a good idea */
int i;
if (cp)
diff --git a/main/file.c b/main/file.c
index a8e5a6569..ca38d187d 100644
--- a/main/file.c
+++ b/main/file.c
@@ -661,15 +661,15 @@ static enum fsread_res ast_readaudio_callback(struct ast_filestream *s)
if (whennext != s->lasttimeout) {
#ifdef HAVE_DAHDI
if (s->owner->timingfd > -1) {
- int zap_timer_samples = whennext;
+ int dahdi_timer_samples = whennext;
int rate;
/* whennext is in samples, but DAHDI timers operate in 8 kHz samples. */
if ((rate = ast_format_rate(s->fmt->format)) != 8000) {
float factor;
factor = ((float) rate) / ((float) 8000.0);
- zap_timer_samples = (int) ( ((float) zap_timer_samples) / factor );
+ dahdi_timer_samples = (int) ( ((float) dahdi_timer_samples) / factor );
}
- ast_settimeout(s->owner, zap_timer_samples, ast_fsread_audio, s);
+ ast_settimeout(s->owner, dahdi_timer_samples, ast_fsread_audio, s);
} else
#endif
s->owner->streamid = ast_sched_add(s->owner->sched,
diff --git a/main/loader.c b/main/loader.c
index 3e71af867..616dc76aa 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -751,22 +751,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;
@@ -779,8 +763,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;
@@ -809,10 +791,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);
}
}
@@ -869,10 +848,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 cbed1e020..b63fedd1e 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1602,16 +1602,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 f83cb52bb..cd50d4697 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 may also specify a wait time (default is 45 seconds) for how long to
# wait for the channel to be answered, a retry time (default is 5 mins)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 19:02:12 +0000