diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-12 19:08:20 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-12 19:08:20 +0000 |
commit | f84b02a71d0968338c22758b24cc14e15e3864a4 (patch) | |
tree | 464a2032e05934a867493f45e5a2605929fceb8a /apps | |
parent | ac54a25ad7440165f775131b2859ab56aa3c5a92 (diff) |
Adds DAHDI support alongside Zaptel. DAHDI usage favored, but all Zap stuff should continue working. Release announcement to follow.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@122314 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_chanspy.c | 4 | ||||
-rw-r--r-- | apps/app_dahdibarge.c (renamed from apps/app_zapbarge.c) | 34 | ||||
-rw-r--r-- | apps/app_dahdiras.c (renamed from apps/app_zapras.c) | 30 | ||||
-rw-r--r-- | apps/app_dahdiscan.c (renamed from apps/app_zapscan.c) | 35 | ||||
-rw-r--r-- | apps/app_disa.c | 2 | ||||
-rw-r--r-- | apps/app_flash.c | 21 | ||||
-rw-r--r-- | apps/app_getcpeid.c | 2 | ||||
-rw-r--r-- | apps/app_meetme.c | 85 | ||||
-rw-r--r-- | apps/app_page.c | 2 | ||||
-rw-r--r-- | apps/app_queue.c | 5 | ||||
-rw-r--r-- | apps/app_read.c | 2 | ||||
-rw-r--r-- | apps/app_rpt.c | 218 |
12 files changed, 236 insertions, 204 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 6432f1bbb..2cc2975e6 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -461,6 +461,7 @@ static struct chanspy_ds *next_channel(struct ast_channel *chan, const char *exten, const char *context, struct chanspy_ds *chanspy_ds) { struct ast_channel *this; + char channel_name[AST_CHANNEL_NAME]; redo: if (spec) @@ -473,7 +474,8 @@ redo: if (!this) return NULL; - if (!strncmp(this->name, "Zap/pseudo", 10)) { + snprintf(channel_name, AST_CHANNEL_NAME, "%s/pseudo", dahdi_chan_name); + if (!strncmp(this->name, channel_name, 10)) { ast_channel_unlock(this); goto redo; } else if (this == chan) { diff --git a/apps/app_zapbarge.c b/apps/app_dahdibarge.c index 735020f60..b807923a4 100644 --- a/apps/app_zapbarge.c +++ b/apps/app_dahdibarge.c @@ -32,7 +32,7 @@ */ /*** MODULEINFO - <depend>zaptel</depend> + <depend>dahdi</depend> ***/ #include "asterisk.h" @@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <unistd.h> #include <errno.h> #include <sys/ioctl.h> -#include <zaptel/zaptel.h> #include "asterisk/lock.h" #include "asterisk/file.h" @@ -60,7 +59,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/say.h" #include "asterisk/utils.h" -static char *app = "ZapBarge"; +#include "asterisk/dahdi_compat.h" + +static char *app = "DAHDIBarge"; +static char *deprecated_app = "ZapBarge"; static char *synopsis = "Barge in (monitor) Zap channel"; @@ -94,7 +96,7 @@ static int careful_write(int fd, unsigned char *data, int len) static int conf_run(struct ast_channel *chan, int confno, int confflags) { int fd; - struct zt_confinfo ztc; + DAHDI_CONFINFO ztc; struct ast_frame *f; struct ast_channel *c; struct ast_frame fr; @@ -107,7 +109,7 @@ static int conf_run(struct ast_channel *chan, int confno, int confflags) int origfd; int ret = -1; - ZT_BUFFERINFO bi; + DAHDI_BUFFERINFO bi; char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET]; char *buf = __buf + AST_FRIENDLY_OFFSET; @@ -147,10 +149,10 @@ zapretry: /* Setup buffering information */ memset(&bi, 0, sizeof(bi)); bi.bufsize = CONF_SIZE; - bi.txbufpolicy = ZT_POLICY_IMMEDIATE; - bi.rxbufpolicy = ZT_POLICY_IMMEDIATE; + bi.txbufpolicy = DAHDI_POLICY_IMMEDIATE; + bi.rxbufpolicy = DAHDI_POLICY_IMMEDIATE; bi.numbufs = 4; - if (ioctl(fd, ZT_SET_BUFINFO, &bi)) { + if (ioctl(fd, DAHDI_SET_BUFINFO, &bi)) { ast_log(LOG_WARNING, "Unable to set buffering information: %s\n", strerror(errno)); close(fd); goto outrun; @@ -164,7 +166,7 @@ zapretry: memset(&ztc, 0, sizeof(ztc)); /* Check to see if we're in a conference... */ ztc.chan = 0; - if (ioctl(fd, ZT_GETCONF, &ztc)) { + if (ioctl(fd, DAHDI_GETCONF, &ztc)) { ast_log(LOG_WARNING, "Error getting conference\n"); close(fd); goto outrun; @@ -181,9 +183,9 @@ zapretry: /* Add us to the conference */ ztc.chan = 0; ztc.confno = confno; - ztc.confmode = ZT_CONF_MONITORBOTH; + ztc.confmode = DAHDI_CONF_MONITORBOTH; - if (ioctl(fd, ZT_SETCONF, &ztc)) { + if (ioctl(fd, DAHDI_SETCONF, &ztc)) { ast_log(LOG_WARNING, "Error setting conference\n"); close(fd); goto outrun; @@ -247,7 +249,7 @@ zapretry: ztc.chan = 0; ztc.confno = 0; ztc.confmode = 0; - if (ioctl(fd, ZT_SETCONF, &ztc)) { + if (ioctl(fd, DAHDI_SETCONF, &ztc)) { ast_log(LOG_WARNING, "Error setting conference\n"); } } @@ -299,6 +301,13 @@ 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) { int res; @@ -312,6 +321,7 @@ 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); } diff --git a/apps/app_zapras.c b/apps/app_dahdiras.c index c3ccf30d9..3f9b68935 100644 --- a/apps/app_zapras.c +++ b/apps/app_dahdiras.c @@ -26,7 +26,7 @@ */ /*** MODULEINFO - <depend>zaptel</depend> + <depend>dahdi</depend> ***/ #include "asterisk.h" @@ -48,7 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <errno.h> #include <stdio.h> #include <fcntl.h> -#include <zaptel/zaptel.h> #include "asterisk/lock.h" #include "asterisk/file.h" @@ -58,7 +57,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/module.h" #include "asterisk/options.h" -static char *app = "ZapRAS"; +#include "asterisk/dahdi_compat.h" + +static char *app = "DAHDIRAS"; +static char *deprecated_app = "ZapRAS"; static char *synopsis = "Executes Zaptel ISDN RAS application"; @@ -143,10 +145,10 @@ static void run_ras(struct ast_channel *chan, char *args) int status; int res; int signalled = 0; - struct zt_bufferinfo savebi; + DAHDI_BUFFERINFO savebi; int x; - res = ioctl(chan->fds[0], ZT_GET_BUFINFO, &savebi); + res = ioctl(chan->fds[0], DAHDI_GET_BUFINFO, &savebi); if(res) { ast_log(LOG_WARNING, "Unable to check buffer policy on channel %s\n", chan->name); return; @@ -184,10 +186,10 @@ static void run_ras(struct ast_channel *chan, char *args) } /* Throw back into audio mode */ x = 1; - ioctl(chan->fds[0], ZT_AUDIOMODE, &x); + ioctl(chan->fds[0], DAHDI_AUDIOMODE, &x); /* Restore saved values */ - res = ioctl(chan->fds[0], ZT_SET_BUFINFO, &savebi); + res = ioctl(chan->fds[0], DAHDI_SET_BUFINFO, &savebi); if (res < 0) { ast_log(LOG_WARNING, "Unable to set buffer policy on channel %s\n", chan->name); } @@ -201,7 +203,7 @@ static int zapras_exec(struct ast_channel *chan, void *data) int res=-1; char *args; struct ast_module_user *u; - ZT_PARAMS ztp; + DAHDI_PARAMS ztp; if (!data) data = ""; @@ -221,9 +223,9 @@ static int zapras_exec(struct ast_channel *chan, void *data) sleep(2); } else { memset(&ztp, 0, sizeof(ztp)); - if (ioctl(chan->fds[0], ZT_GET_PARAMS, &ztp)) { + if (ioctl(chan->fds[0], DAHDI_GET_PARAMS, &ztp)) { ast_log(LOG_WARNING, "Unable to get zaptel parameters\n"); - } else if (ztp.sigtype != ZT_SIG_CLEAR) { + } else if (ztp.sigtype != DAHDI_SIG_CLEAR) { if (option_verbose > 1) ast_verbose(VERBOSE_PREFIX_2 "Channel %s is not a clear channel\n", chan->name); } else { @@ -238,6 +240,13 @@ static int zapras_exec(struct ast_channel *chan, void *data) return res; } +static int zapras_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 zapras_exec(chan, data); +} + + static int unload_module(void) { int res; @@ -251,6 +260,7 @@ static int unload_module(void) static int load_module(void) { + ast_register_application(deprecated_app, zapras_exec_warn, synopsis, descrip); return ast_register_application(app, zapras_exec, synopsis, descrip); } diff --git a/apps/app_zapscan.c b/apps/app_dahdiscan.c index 690d9a5cc..ae270e484 100644 --- a/apps/app_zapscan.c +++ b/apps/app_dahdiscan.c @@ -31,7 +31,7 @@ */ /*** MODULEINFO - <depend>zaptel</depend> + <depend>dahdi</depend> ***/ #include "asterisk.h" @@ -44,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <unistd.h> #include <errno.h> #include <sys/ioctl.h> -#include <zaptel/zaptel.h> #include "asterisk/lock.h" #include "asterisk/file.h" @@ -59,7 +58,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/cli.h" #include "asterisk/say.h" -static char *app = "ZapScan"; +#include "asterisk/dahdi_compat.h" + +static char *app = "DAHDIScan"; +static char *deprecated_app = "ZapScan"; static char *synopsis = "Scan Zap channels to monitor calls"; @@ -74,7 +76,7 @@ static char *descrip = static struct ast_channel *get_zap_channel_locked(int num) { char name[80]; - snprintf(name,sizeof(name),"Zap/%d-1",num); + snprintf(name,sizeof(name),"%s/%d-1", dahdi_chan_name, num); return ast_get_channel_by_name_locked(name); } @@ -99,7 +101,7 @@ static int careful_write(int fd, unsigned char *data, int len) static int conf_run(struct ast_channel *chan, int confno, int confflags) { int fd; - struct zt_confinfo ztc; + DAHDI_CONFINFO ztc; struct ast_frame *f; struct ast_channel *c; struct ast_frame fr; @@ -114,7 +116,7 @@ static int conf_run(struct ast_channel *chan, int confno, int confflags) char input[4]; int ic=0; - ZT_BUFFERINFO bi; + DAHDI_BUFFERINFO bi; char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET]; char *buf = __buf + AST_FRIENDLY_OFFSET; @@ -154,10 +156,10 @@ static int conf_run(struct ast_channel *chan, int confno, int confflags) /* Setup buffering information */ memset(&bi, 0, sizeof(bi)); bi.bufsize = CONF_SIZE; - bi.txbufpolicy = ZT_POLICY_IMMEDIATE; - bi.rxbufpolicy = ZT_POLICY_IMMEDIATE; + bi.txbufpolicy = DAHDI_POLICY_IMMEDIATE; + bi.rxbufpolicy = DAHDI_POLICY_IMMEDIATE; bi.numbufs = 4; - if (ioctl(fd, ZT_SET_BUFINFO, &bi)) { + if (ioctl(fd, DAHDI_SET_BUFINFO, &bi)) { ast_log(LOG_WARNING, "Unable to set buffering information: %s\n", strerror(errno)); close(fd); goto outrun; @@ -171,7 +173,7 @@ static int conf_run(struct ast_channel *chan, int confno, int confflags) memset(&ztc, 0, sizeof(ztc)); /* Check to see if we're in a conference... */ ztc.chan = 0; - if (ioctl(fd, ZT_GETCONF, &ztc)) { + if (ioctl(fd, DAHDI_GETCONF, &ztc)) { ast_log(LOG_WARNING, "Error getting conference\n"); close(fd); goto outrun; @@ -188,9 +190,9 @@ static int conf_run(struct ast_channel *chan, int confno, int confflags) /* Add us to the conference */ ztc.chan = 0; ztc.confno = confno; - ztc.confmode = ZT_CONF_MONITORBOTH; + ztc.confmode = DAHDI_CONF_MONITORBOTH; - if (ioctl(fd, ZT_SETCONF, &ztc)) { + if (ioctl(fd, DAHDI_SETCONF, &ztc)) { ast_log(LOG_WARNING, "Error setting conference\n"); close(fd); goto outrun; @@ -274,7 +276,7 @@ static int conf_run(struct ast_channel *chan, int confno, int confflags) ztc.chan = 0; ztc.confno = 0; ztc.confmode = 0; - if (ioctl(fd, ZT_SETCONF, &ztc)) { + if (ioctl(fd, DAHDI_SETCONF, &ztc)) { ast_log(LOG_WARNING, "Error setting conference\n"); } } @@ -361,6 +363,12 @@ 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) { int res; @@ -374,6 +382,7 @@ 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); } diff --git a/apps/app_disa.c b/apps/app_disa.c index 4b7852a13..f0c9aced7 100644 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -98,7 +98,7 @@ static char *descrip = static void play_dialtone(struct ast_channel *chan, char *mailbox) { - const struct tone_zone_sound *ts = NULL; + const struct ind_tone_zone_sound *ts = NULL; if(ast_app_has_voicemail(mailbox, NULL)) ts = ast_get_indication_tone(chan->zone, "dialrecall"); else diff --git a/apps/app_flash.c b/apps/app_flash.c index 1aa099d71..05a372f9e 100644 --- a/apps/app_flash.c +++ b/apps/app_flash.c @@ -26,7 +26,7 @@ */ /*** MODULEINFO - <depend>zaptel</depend> + <depend>dahdi</depend> ***/ #include "asterisk.h" @@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <string.h> #include <errno.h> #include <sys/ioctl.h> -#include <zaptel/zaptel.h> #include "asterisk/lock.h" #include "asterisk/file.h" @@ -50,6 +49,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/image.h" #include "asterisk/options.h" +#include "asterisk/dahdi_compat.h" + static char *app = "Flash"; static char *synopsis = "Flashes a Zap Trunk"; @@ -65,9 +66,9 @@ static inline int zt_wait_event(int fd) { /* Avoid the silly zt_waitevent which ignores a bunch of events */ int i,j=0; - i = ZT_IOMUX_SIGEVENT; - if (ioctl(fd, ZT_IOMUX, &i) == -1) return -1; - if (ioctl(fd, ZT_GETEVENT, &j) == -1) return -1; + i = DAHDI_IOMUX_SIGEVENT; + if (ioctl(fd, DAHDI_IOMUX, &i) == -1) return -1; + if (ioctl(fd, DAHDI_GETEVENT, &j) == -1) return -1; return j; } @@ -76,15 +77,15 @@ static int flash_exec(struct ast_channel *chan, void *data) int res = -1; int x; struct ast_module_user *u; - struct zt_params ztp; + DAHDI_PARAMS ztp; u = ast_module_user_add(chan); if (!strcasecmp(chan->tech->type, "Zap")) { memset(&ztp, 0, sizeof(ztp)); - res = ioctl(chan->fds[0], ZT_GET_PARAMS, &ztp); + res = ioctl(chan->fds[0], DAHDI_GET_PARAMS, &ztp); if (!res) { - if (ztp.sigtype & __ZT_SIG_FXS) { - x = ZT_FLASH; - res = ioctl(chan->fds[0], ZT_HOOK, &x); + if (ztp.sigtype & __DAHDI_SIG_FXS) { + x = DAHDI_FLASH; + res = ioctl(chan->fds[0], DAHDI_HOOK, &x); if (!res || (errno == EINPROGRESS)) { if (res) { /* Wait for the event to finish */ diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c index f0c5d1b07..bebc60e9b 100644 --- a/apps/app_getcpeid.c +++ b/apps/app_getcpeid.c @@ -49,7 +49,7 @@ static char *synopsis = "Get ADSI CPE ID"; static char *descrip = " GetCPEID: Obtains and displays ADSI CPE ID and other information in order\n" -"to properly setup zapata.conf for on-hook operations.\n"; +"to properly setup chan_dahdi.conf for on-hook operations.\n"; static int cpeid_setstatus(struct ast_channel *chan, char *stuff[], int voice) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 990913b1e..5eabaa293 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -30,7 +30,7 @@ */ /*** MODULEINFO - <depend>zaptel</depend> + <depend>dahdi</depend> ***/ #include "asterisk.h" @@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/ioctl.h> #include <sys/stat.h> #include <sys/types.h> -#include <zaptel/zaptel.h> #include "asterisk/lock.h" #include "asterisk/file.h" @@ -69,6 +68,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/dial.h" #include "asterisk/causes.h" +#include "asterisk/dahdi_compat.h" + #include "enter.h" #include "leave.h" @@ -580,8 +581,8 @@ static int careful_write(int fd, unsigned char *data, int len, int block) while (len) { if (block) { - x = ZT_IOMUX_WRITE | ZT_IOMUX_SIGEVENT; - res = ioctl(fd, ZT_IOMUX, &x); + x = DAHDI_IOMUX_WRITE | DAHDI_IOMUX_SIGEVENT; + res = ioctl(fd, DAHDI_IOMUX, &x); } else res = 0; if (res >= 0) @@ -741,7 +742,7 @@ static void conf_play(struct ast_channel *chan, struct ast_conference *conf, enu static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin, int make, int dynamic, int refcount) { struct ast_conference *cnf; - struct zt_confinfo ztc = { 0, }; + DAHDI_CONFINFO ztc = { 0, }; int confno_int = 0; AST_LIST_LOCK(&confs); @@ -768,9 +769,9 @@ static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin /* Setup a new zap conference */ ztc.confno = -1; - ztc.confmode = ZT_CONF_CONFANN | ZT_CONF_CONFANNMON; + ztc.confmode = DAHDI_CONF_CONFANN | DAHDI_CONF_CONFANNMON; cnf->fd = open("/dev/zap/pseudo", O_RDWR); - if (cnf->fd < 0 || ioctl(cnf->fd, ZT_SETCONF, &ztc)) { + if (cnf->fd < 0 || ioctl(cnf->fd, DAHDI_SETCONF, &ztc)) { ast_log(LOG_WARNING, "Unable to open pseudo device\n"); if (cnf->fd >= 0) close(cnf->fd); @@ -788,8 +789,8 @@ static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin ast_set_write_format(cnf->chan, AST_FORMAT_SLINEAR); ztc.chan = 0; ztc.confno = cnf->zapconf; - ztc.confmode = ZT_CONF_CONFANN | ZT_CONF_CONFANNMON; - if (ioctl(cnf->chan->fds[0], ZT_SETCONF, &ztc)) { + ztc.confmode = DAHDI_CONF_CONFANN | DAHDI_CONF_CONFANNMON; + if (ioctl(cnf->chan->fds[0], DAHDI_SETCONF, &ztc)) { ast_log(LOG_WARNING, "Error setting conference\n"); if (cnf->chan) ast_hangup(cnf->chan); @@ -1218,8 +1219,8 @@ static void conf_flush(int fd, struct ast_channel *chan) } /* flush any data sitting in the pseudo channel */ - x = ZT_FLUSH_ALL; - if (ioctl(fd, ZT_FLUSH, &x)) + x = DAHDI_FLUSH_ALL; + if (ioctl(fd, DAHDI_FLUSH, &x)) ast_log(LOG_WARNING, "Error flushing channel\n"); } @@ -1372,7 +1373,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c struct ast_conf_user *user = NULL; struct ast_conf_user *usr = NULL; int fd; - struct zt_confinfo ztc, ztc_empty; + DAHDI_CONFINFO ztc, ztc_empty; struct ast_frame *f; struct ast_channel *c; struct ast_frame fr; @@ -1405,7 +1406,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c char members[10] = ""; int dtmf, opt_waitmarked_timeout = 0; time_t timeout = 0; - ZT_BUFFERINFO bi; + DAHDI_BUFFERINFO bi; char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET]; char *buf = __buf + AST_FRIENDLY_OFFSET; int setusercount = 0; @@ -1444,8 +1445,8 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c ast_set_write_format(conf->lchan, AST_FORMAT_SLINEAR); ztc.chan = 0; ztc.confno = conf->zapconf; - ztc.confmode = ZT_CONF_CONFANN | ZT_CONF_CONFANNMON; - if (ioctl(conf->lchan->fds[0], ZT_SETCONF, &ztc)) { + ztc.confmode = DAHDI_CONF_CONFANN | DAHDI_CONF_CONFANNMON; + if (ioctl(conf->lchan->fds[0], DAHDI_SETCONF, &ztc)) { ast_log(LOG_WARNING, "Error starting listen channel\n"); ast_hangup(conf->lchan); conf->lchan = NULL; @@ -1616,16 +1617,16 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c /* Setup buffering information */ memset(&bi, 0, sizeof(bi)); bi.bufsize = CONF_SIZE/2; - bi.txbufpolicy = ZT_POLICY_IMMEDIATE; - bi.rxbufpolicy = ZT_POLICY_IMMEDIATE; + bi.txbufpolicy = DAHDI_POLICY_IMMEDIATE; + bi.rxbufpolicy = DAHDI_POLICY_IMMEDIATE; bi.numbufs = audio_buffers; - if (ioctl(fd, ZT_SET_BUFINFO, &bi)) { + if (ioctl(fd, DAHDI_SET_BUFINFO, &bi)) { ast_log(LOG_WARNING, "Unable to set buffering information: %s\n", strerror(errno)); close(fd); goto outrun; } x = 1; - if (ioctl(fd, ZT_SETLINEAR, &x)) { + if (ioctl(fd, DAHDI_SETLINEAR, &x)) { ast_log(LOG_WARNING, "Unable to set linear mode: %s\n", strerror(errno)); close(fd); goto outrun; @@ -1640,7 +1641,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c memset(&ztc_empty, 0, sizeof(ztc_empty)); /* Check to see if we're in a conference... */ ztc.chan = 0; - if (ioctl(fd, ZT_GETCONF, &ztc)) { + if (ioctl(fd, DAHDI_GETCONF, &ztc)) { ast_log(LOG_WARNING, "Error getting conference\n"); close(fd); goto outrun; @@ -1670,15 +1671,15 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c } if (confflags & CONFFLAG_WAITMARKED && !conf->markedusers) - ztc.confmode = ZT_CONF_CONF; + ztc.confmode = DAHDI_CONF_CONF; else if (confflags & CONFFLAG_MONITOR) - ztc.confmode = ZT_CONF_CONFMON | ZT_CONF_LISTENER; + ztc.confmode = DAHDI_CONF_CONFMON | DAHDI_CONF_LISTENER; else if (confflags & CONFFLAG_TALKER) - ztc.confmode = ZT_CONF_CONF | ZT_CONF_TALKER; + ztc.confmode = DAHDI_CONF_CONF | DAHDI_CONF_TALKER; else - ztc.confmode = ZT_CONF_CONF | ZT_CONF_TALKER | ZT_CONF_LISTENER; + ztc.confmode = DAHDI_CONF_CONF | DAHDI_CONF_TALKER | DAHDI_CONF_LISTENER; - if (ioctl(fd, ZT_SETCONF, &ztc)) { + if (ioctl(fd, DAHDI_SETCONF, &ztc)) { ast_log(LOG_WARNING, "Error setting conference\n"); close(fd); ast_mutex_unlock(&conf->playlock); @@ -1796,8 +1797,8 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c if(confflags & CONFFLAG_MARKEDEXIT) break; else { - ztc.confmode = ZT_CONF_CONF; - if (ioctl(fd, ZT_SETCONF, &ztc)) { + ztc.confmode = DAHDI_CONF_CONF; + if (ioctl(fd, DAHDI_SETCONF, &ztc)) { ast_log(LOG_WARNING, "Error setting conference\n"); close(fd); goto outrun; @@ -1812,12 +1813,12 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c /* Marked user entered, so cancel timeout */ timeout = 0; if (confflags & CONFFLAG_MONITOR) - ztc.confmode = ZT_CONF_CONFMON | ZT_CONF_LISTENER; + ztc.confmode = DAHDI_CONF_CONFMON | DAHDI_CONF_LISTENER; else if (confflags & CONFFLAG_TALKER) - ztc.confmode = ZT_CONF_CONF | ZT_CONF_TALKER; + ztc.confmode = DAHDI_CONF_CONF | DAHDI_CONF_TALKER; else - ztc.confmode = ZT_CONF_CONF | ZT_CONF_TALKER | ZT_CONF_LISTENER; - if (ioctl(fd, ZT_SETCONF, &ztc)) { + ztc.confmode = DAHDI_CONF_CONF | DAHDI_CONF_TALKER | DAHDI_CONF_LISTENER; + if (ioctl(fd, DAHDI_SETCONF, &ztc)) { ast_log(LOG_WARNING, "Error setting conference\n"); close(fd); goto outrun; @@ -1858,9 +1859,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c /* Check if my modes have changed */ /* If I should be muted but am still talker, mute me */ - if ((user->adminflags & (ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED)) && (ztc.confmode & ZT_CONF_TALKER)) { - ztc.confmode ^= ZT_CONF_TALKER; - if (ioctl(fd, ZT_SETCONF, &ztc)) { + if ((user->adminflags & (ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED)) && (ztc.confmode & DAHDI_CONF_TALKER)) { + ztc.confmode ^= DAHDI_CONF_TALKER; + if (ioctl(fd, DAHDI_SETCONF, &ztc)) { ast_log(LOG_WARNING, "Error setting conference - Un/Mute \n"); ret = -1; break; @@ -1876,9 +1877,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c } /* If I should be un-muted but am not talker, un-mute me */ - if (!(user->adminflags & (ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED)) && !(confflags & CONFFLAG_MONITOR) && !(ztc.confmode & ZT_CONF_TALKER)) { - ztc.confmode |= ZT_CONF_TALKER; - if (ioctl(fd, ZT_SETCONF, &ztc)) { + if (!(user->adminflags & (ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED)) && !(confflags & CONFFLAG_MONITOR) && !(ztc.confmode & DAHDI_CONF_TALKER)) { + ztc.confmode |= DAHDI_CONF_TALKER; + if (ioctl(fd, DAHDI_SETCONF, &ztc)) { ast_log(LOG_WARNING, "Error setting conference - Un/Mute \n"); ret = -1; break; @@ -1992,7 +1993,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c } else if (((f->frametype == AST_FRAME_DTMF) && (f->subclass == '*') && (confflags & CONFFLAG_STARMENU)) || ((f->frametype == AST_FRAME_DTMF) && menu_active)) { if (confflags & CONFFLAG_PASS_DTMF) conf_queue_dtmf(conf, user, f); - if (ioctl(fd, ZT_SETCONF, &ztc_empty)) { + if (ioctl(fd, DAHDI_SETCONF, &ztc_empty)) { ast_log(LOG_WARNING, "Error setting conference\n"); close(fd); ast_frfree(f); @@ -2138,7 +2139,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c if (musiconhold) ast_moh_start(chan, NULL, NULL); - if (ioctl(fd, ZT_SETCONF, &ztc)) { + if (ioctl(fd, DAHDI_SETCONF, &ztc)) { ast_log(LOG_WARNING, "Error setting conference\n"); close(fd); ast_frfree(f); @@ -2245,7 +2246,7 @@ bailoutandtrynormal: ztc.chan = 0; ztc.confno = 0; ztc.confmode = 0; - if (ioctl(fd, ZT_SETCONF, &ztc)) { + if (ioctl(fd, DAHDI_SETCONF, &ztc)) { ast_log(LOG_WARNING, "Error setting conference\n"); } } @@ -3112,9 +3113,9 @@ static void load_config_meetme(void) if ((sscanf(val, "%d", &audio_buffers) != 1)) { ast_log(LOG_WARNING, "audiobuffers setting must be a number, not '%s'\n", val); audio_buffers = DEFAULT_AUDIO_BUFFERS; - } else if ((audio_buffers < ZT_DEFAULT_NUM_BUFS) || (audio_buffers > ZT_MAX_NUM_BUFS)) { + } else if ((audio_buffers < DAHDI_DEFAULT_NUM_BUFS) || (audio_buffers > DAHDI_MAX_NUM_BUFS)) { ast_log(LOG_WARNING, "audiobuffers setting must be between %d and %d\n", - ZT_DEFAULT_NUM_BUFS, ZT_MAX_NUM_BUFS); + DAHDI_DEFAULT_NUM_BUFS, DAHDI_MAX_NUM_BUFS); audio_buffers = DEFAULT_AUDIO_BUFFERS; } if (audio_buffers != DEFAULT_AUDIO_BUFFERS) diff --git a/apps/app_page.c b/apps/app_page.c index 00574b943..c3c383ea1 100644 --- a/apps/app_page.c +++ b/apps/app_page.c @@ -26,7 +26,7 @@ */ /*** MODULEINFO - <depend>zaptel</depend> + <depend>dahdi</depend> <depend>app_meetme</depend> ***/ diff --git a/apps/app_queue.c b/apps/app_queue.c index 23930ae13..01fdcf3aa 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1565,9 +1565,8 @@ static int say_position(struct queue_ent *qe) /* If the hold time is >1 min, if it's enabled, and if it's not supposed to be only once and we have already said it, say it */ - if ((avgholdmins+avgholdsecs) > 0 && qe->parent->announceholdtime && - ((qe->parent->announceholdtime == ANNOUNCEHOLDTIME_ONCE && !qe->last_pos) || - !(qe->parent->announceholdtime == ANNOUNCEHOLDTIME_ONCE))) { + if ((avgholdmins+avgholdsecs) > 0 && (qe->parent->announceholdtime) && + (!(qe->parent->announceholdtime == ANNOUNCEHOLDTIME_ONCE) && qe->last_pos)) { res = play_file(qe->chan, qe->parent->sound_holdtime); if (res) goto playout; diff --git a/apps/app_read.c b/apps/app_read.c index bb3dd669b..897ddd2fe 100644 --- a/apps/app_read.c +++ b/apps/app_read.c @@ -92,7 +92,7 @@ static int read_exec(struct ast_channel *chan, void *data) int maxdigits = 255; int tries = 1, to = 0, x = 0; char *argcopy = NULL; - struct tone_zone_sound *ts; + struct ind_tone_zone_sound *ts; struct ast_flags flags = {0}; AST_DECLARE_APP_ARGS(arglist, diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 952fdd0b1..8465a2627 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -2609,9 +2609,9 @@ static struct morse_bits mbits[] = { */ for(i = 0; i < 20 ; i++){ - flags = ZT_IOMUX_WRITEEMPTY | ZT_IOMUX_NOWAIT; - res = ioctl(chan->fds[0], ZT_IOMUX, &flags); - if(flags & ZT_IOMUX_WRITEEMPTY) + flags = DAHDI_IOMUX_WRITEEMPTY | ZT_IOMUX_NOWAIT; + res = ioctl(chan->fds[0], DAHDI_IOMUX, &flags); + if(flags & DAHDI_IOMUX_WRITEEMPTY) break; if( ast_safe_sleep(chan, 50)){ res = -1; @@ -2660,9 +2660,9 @@ static int send_tone_telemetry(struct ast_channel *chan, char *tonestring) */ for(i = 0; i < 20 ; i++){ - flags = ZT_IOMUX_WRITEEMPTY | ZT_IOMUX_NOWAIT; - res = ioctl(chan->fds[0], ZT_IOMUX, &flags); - if(flags & ZT_IOMUX_WRITEEMPTY) + flags = DAHDI_IOMUX_WRITEEMPTY | ZT_IOMUX_NOWAIT; + res = ioctl(chan->fds[0], DAHDI_IOMUX, &flags); + if(flags & DAHDI_IOMUX_WRITEEMPTY) break; if( ast_safe_sleep(chan, 50)){ res = -1; @@ -2905,7 +2905,7 @@ static int split_freq(char *mhz, char *decimals, char *freq); static void *rpt_tele_thread(void *this) { -ZT_CONFINFO ci; /* conference info */ +DAHDI_CONFINFO ci; /* conference info */ int res = 0,haslink,hastx,hasremote,imdone = 0, unkeys_queued, x; struct rpt_tele *mytele = (struct rpt_tele *)this; struct rpt_tele *tlist; @@ -2959,9 +2959,9 @@ struct zt_params par; ci.confno = (((mytele->mode == ID) || (mytele->mode == IDTALKOVER) || (mytele->mode == UNKEY) || (mytele->mode == TAILMSG) || (mytele->mode == LINKUNKEY)) || (mytele->mode == TIMEOUT) ? myrpt->txconf : myrpt->conf); - ci.confmode = ZT_CONF_CONFANN; + ci.confmode = DAHDI_CONF_CONFANN; /* first put the channel on the conference in announce mode */ - if (ioctl(mychannel->fds[0],ZT_SETCONF,&ci) == -1) + if (ioctl(mychannel->fds[0],DAHDI_SETCONF,&ci) == -1) { ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n"); rpt_mutex_lock(&myrpt->lock); @@ -3144,9 +3144,9 @@ struct zt_params par; /* set for all to hear */ ci.chan = 0; ci.confno = myrpt->conf; - ci.confmode = ZT_CONF_CONFANN; + ci.confmode = DAHDI_CONF_CONFANN; /* first put the channel on the conference in announce mode */ - if (ioctl(mychannel->fds[0],ZT_SETCONF,&ci) == -1) + if (ioctl(mychannel->fds[0],DAHDI_SETCONF,&ci) == -1) { ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n"); rpt_mutex_lock(&myrpt->lock); @@ -3174,9 +3174,9 @@ struct zt_params par; /* set for all to hear */ ci.chan = 0; ci.confno = myrpt->txconf; - ci.confmode = ZT_CONF_CONFANN; + ci.confmode = DAHDI_CONF_CONFANN; /* first put the channel on the conference in announce mode */ - if (ioctl(mychannel->fds[0],ZT_SETCONF,&ci) == -1) + if (ioctl(mychannel->fds[0],DAHDI_SETCONF,&ci) == -1) { ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n"); rpt_mutex_lock(&myrpt->lock); @@ -3385,15 +3385,15 @@ struct zt_params par; res = -1; break; } - i = ZT_FLUSH_EVENT; - if (ioctl(myrpt->zaptxchannel->fds[0],ZT_FLUSH,&i) == -1) + i = DAHDI_FLUSH_EVENT; + if (ioctl(myrpt->zaptxchannel->fds[0],DAHDI_FLUSH,&i) == -1) { ast_mutex_unlock(&myrpt->remlock); ast_log(LOG_ERROR,"Cant flush events"); res = -1; break; } - if (ioctl(myrpt->zaprxchannel->fds[0],ZT_GET_PARAMS,&par) == -1) + if (ioctl(myrpt->zaprxchannel->fds[0],DAHDI_GET_PARAMS,&par) == -1) { ast_mutex_unlock(&myrpt->remlock); ast_log(LOG_ERROR,"Cant get params"); @@ -4161,7 +4161,7 @@ pthread_attr_t attr; static void *rpt_call(void *this) { -ZT_CONFINFO ci; /* conference info */ +DAHDI_CONFINFO ci; /* conference info */ struct rpt *myrpt = (struct rpt *)this; int res; int stopped,congstarted,dialtimer,lastcidx,aborted; @@ -4181,10 +4181,10 @@ struct ast_channel *mychannel,*genchannel; #endif ci.chan = 0; ci.confno = myrpt->conf; /* use the pseudo conference */ - ci.confmode = ZT_CONF_REALANDPSEUDO | ZT_CONF_TALKER | ZT_CONF_LISTENER - | ZT_CONF_PSEUDO_TALKER | ZT_CONF_PSEUDO_LISTENER; + ci.confmode = DAHDI_CONF_REALANDPSEUDO | ZT_CONF_TALKER | ZT_CONF_LISTENER + | DAHDI_CONF_PSEUDO_TALKER | ZT_CONF_PSEUDO_LISTENER; /* first put the channel on the conference */ - if (ioctl(mychannel->fds[0],ZT_SETCONF,&ci) == -1) + if (ioctl(mychannel->fds[0],DAHDI_SETCONF,&ci) == -1) { ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n"); ast_hangup(mychannel); @@ -4204,10 +4204,10 @@ struct ast_channel *mychannel,*genchannel; #endif ci.chan = 0; ci.confno = myrpt->conf; - ci.confmode = ZT_CONF_REALANDPSEUDO | ZT_CONF_TALKER | ZT_CONF_LISTENER - | ZT_CONF_PSEUDO_TALKER | ZT_CONF_PSEUDO_LISTENER; + ci.confmode = DAHDI_CONF_REALANDPSEUDO | ZT_CONF_TALKER | ZT_CONF_LISTENER + | DAHDI_CONF_PSEUDO_TALKER | ZT_CONF_PSEUDO_LISTENER; /* first put the channel on the conference */ - if (ioctl(genchannel->fds[0],ZT_SETCONF,&ci) == -1) + if (ioctl(genchannel->fds[0],DAHDI_SETCONF,&ci) == -1) { ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n"); ast_hangup(mychannel); @@ -4232,7 +4232,7 @@ struct ast_channel *mychannel,*genchannel; pthread_exit(NULL); } /* start dialtone if patchquiet is 0. Special patch modes don't send dial tone */ - if ((!myrpt->patchquiet) && (tone_zone_play_tone(mychannel->fds[0],ZT_TONE_DIALTONE) < 0)) + if ((!myrpt->patchquiet) && (tone_zone_play_tone(mychannel->fds[0],DAHDI_TONE_DIALTONE) < 0)) { ast_log(LOG_WARNING, "Cannot start dialtone\n"); ast_hangup(mychannel); @@ -4274,7 +4274,7 @@ struct ast_channel *mychannel,*genchannel; if(!congstarted){ congstarted = 1; /* start congestion tone */ - tone_zone_play_tone(mychannel->fds[0],ZT_TONE_CONGESTION); + tone_zone_play_tone(mychannel->fds[0],DAHDI_TONE_CONGESTION); } } res = ast_safe_sleep(mychannel, MSWAIT); @@ -4346,10 +4346,10 @@ struct ast_channel *mychannel,*genchannel; /* set appropriate conference for the pseudo */ ci.chan = 0; ci.confno = myrpt->conf; - ci.confmode = (myrpt->p.duplex == 2) ? ZT_CONF_CONFANNMON : - (ZT_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER); + ci.confmode = (myrpt->p.duplex == 2) ? DAHDI_CONF_CONFANNMON : + (DAHDI_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER); /* first put the channel on the conference in announce mode */ - if (ioctl(myrpt->pchannel->fds[0],ZT_SETCONF,&ci) == -1) + if (ioctl(myrpt->pchannel->fds[0],DAHDI_SETCONF,&ci) == -1) { ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n"); ast_hangup(mychannel); @@ -4373,7 +4373,7 @@ struct ast_channel *mychannel,*genchannel; myrpt->callmode = 4; rpt_mutex_unlock(&myrpt->lock); /* start congestion tone */ - tone_zone_play_tone(genchannel->fds[0],ZT_TONE_CONGESTION); + tone_zone_play_tone(genchannel->fds[0],DAHDI_TONE_CONGESTION); rpt_mutex_lock(&myrpt->lock); } } @@ -4401,10 +4401,10 @@ struct ast_channel *mychannel,*genchannel; /* set appropriate conference for the pseudo */ ci.chan = 0; ci.confno = myrpt->conf; - ci.confmode = ((myrpt->p.duplex == 2) || (myrpt->p.duplex == 4)) ? ZT_CONF_CONFANNMON : - (ZT_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER); + ci.confmode = ((myrpt->p.duplex == 2) || (myrpt->p.duplex == 4)) ? DAHDI_CONF_CONFANNMON : + (DAHDI_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER); /* first put the channel on the conference in announce mode */ - if (ioctl(myrpt->pchannel->fds[0],ZT_SETCONF,&ci) == -1) + if (ioctl(myrpt->pchannel->fds[0],DAHDI_SETCONF,&ci) == -1) { ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n"); } @@ -4471,7 +4471,7 @@ static int connect_link(struct rpt *myrpt, char* node, int mode, int perma) struct rpt_link *l; int reconnects = 0; int i,n; - ZT_CONFINFO ci; /* conference info */ + DAHDI_CONFINFO ci; /* conference info */ val = node_lookup(myrpt,node); if (!val){ @@ -4610,9 +4610,9 @@ static int connect_link(struct rpt *myrpt, char* node, int mode, int perma) /* make a conference for the tx */ ci.chan = 0; ci.confno = myrpt->conf; - ci.confmode = ZT_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER; + ci.confmode = DAHDI_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER; /* first put the channel on the conference in proper mode */ - if (ioctl(l->pchan->fds[0], ZT_SETCONF, &ci) == -1) + if (ioctl(l->pchan->fds[0], DAHDI_SETCONF, &ci) == -1) { ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n"); ast_hangup(l->chan); @@ -5850,17 +5850,17 @@ static void rbi_out(struct rpt *myrpt,unsigned char *data) struct zt_radio_param r; memset(&r,0,sizeof(struct zt_radio_param)); - r.radpar = ZT_RADPAR_REMMODE; - r.data = ZT_RADPAR_REM_RBI1; + r.radpar = DAHDI_RADPAR_REMMODE; + r.data = DAHDI_RADPAR_REM_RBI1; /* if setparam ioctl fails, its probably not a pciradio card */ - if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_SETPARAM,&r) == -1) + if (ioctl(myrpt->zaprxchannel->fds[0],DAHDI_RADIO_SETPARAM,&r) == -1) { rbi_out_parallel(myrpt,data); return; } - r.radpar = ZT_RADPAR_REMCOMMAND; + r.radpar = DAHDI_RADPAR_REMCOMMAND; memcpy(&r.data,data,5); - if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_SETPARAM,&r) == -1) + if (ioctl(myrpt->zaprxchannel->fds[0],DAHDI_RADIO_SETPARAM,&r) == -1) { ast_log(LOG_WARNING,"Cannot send RBI command for channel %s\n",myrpt->zaprxchannel->name); return; @@ -5909,47 +5909,47 @@ static int serial_remote_io(struct rpt *myrpt, unsigned char *txbuf, int txbytes /* if not a zap channel, cant use pciradio stuff */ if (myrpt->rxchannel != myrpt->zaprxchannel) return -1; - prm.radpar = ZT_RADPAR_UIOMODE; - if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_GETPARAM,&prm) == -1) return -1; + prm.radpar = DAHDI_RADPAR_UIOMODE; + if (ioctl(myrpt->zaprxchannel->fds[0],DAHDI_RADIO_GETPARAM,&prm) == -1) return -1; oldmode = prm.data; - prm.radpar = ZT_RADPAR_UIODATA; - if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_GETPARAM,&prm) == -1) return -1; + prm.radpar = DAHDI_RADPAR_UIODATA; + if (ioctl(myrpt->zaprxchannel->fds[0],DAHDI_RADIO_GETPARAM,&prm) == -1) return -1; olddata = prm.data; - prm.radpar = ZT_RADPAR_REMMODE; - if (asciiflag & 1) prm.data = ZT_RADPAR_REM_SERIAL_ASCII; - else prm.data = ZT_RADPAR_REM_SERIAL; - if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_SETPARAM,&prm) == -1) return -1; + prm.radpar = DAHDI_RADPAR_REMMODE; + if (asciiflag & 1) prm.data = DAHDI_RADPAR_REM_SERIAL_ASCII; + else prm.data = DAHDI_RADPAR_REM_SERIAL; + if (ioctl(myrpt->zaprxchannel->fds[0],DAHDI_RADIO_SETPARAM,&prm) == -1) return -1; if (asciiflag & 2) { - i = ZT_ONHOOK; - if (ioctl(myrpt->zaprxchannel->fds[0],ZT_HOOK,&i) == -1) return -1; + i = DAHDI_ONHOOK; + if (ioctl(myrpt->zaprxchannel->fds[0],DAHDI_HOOK,&i) == -1) return -1; usleep(100000); } - prm.radpar = ZT_RADPAR_REMCOMMAND; + prm.radpar = DAHDI_RADPAR_REMCOMMAND; prm.data = rxmaxbytes; memcpy(prm.buf,txbuf,txbytes); prm.index = txbytes; - if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_SETPARAM,&prm) == -1) return -1; + if (ioctl(myrpt->zaprxchannel->fds[0],DAHDI_RADIO_SETPARAM,&prm) == -1) return -1; if (rxbuf) { *rxbuf = 0; memcpy(rxbuf,prm.buf,prm.index); } index = prm.index; - prm.radpar = ZT_RADPAR_REMMODE; - prm.data = ZT_RADPAR_REM_NONE; - if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_SETPARAM,&prm) == -1) return -1; + prm.radpar = DAHDI_RADPAR_REMMODE; + prm.data = DAHDI_RADPAR_REM_NONE; + if (ioctl(myrpt->zaprxchannel->fds[0],DAHDI_RADIO_SETPARAM,&prm) == -1) return -1; if (asciiflag & 2) { - i = ZT_OFFHOOK; - if (ioctl(myrpt->zaprxchannel->fds[0],ZT_HOOK,&i) == -1) return -1; + i = DAHDI_OFFHOOK; + if (ioctl(myrpt->zaprxchannel->fds[0],DAHDI_HOOK,&i) == -1) return -1; } - prm.radpar = ZT_RADPAR_UIOMODE; + prm.radpar = DAHDI_RADPAR_UIOMODE; prm.data = oldmode; - if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_SETPARAM,&prm) == -1) return -1; - prm.radpar = ZT_RADPAR_UIODATA; + if (ioctl(myrpt->zaprxchannel->fds[0],DAHDI_RADIO_SETPARAM,&prm) == -1) return -1; + prm.radpar = DAHDI_RADPAR_UIODATA; prm.data = olddata; - if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_SETPARAM,&prm) == -1) return -1; + if (ioctl(myrpt->zaprxchannel->fds[0],DAHDI_RADIO_SETPARAM,&prm) == -1) return -1; return(index); } @@ -8763,7 +8763,7 @@ char *tele,*idtalkover,c; int ms = MSWAIT,i,lasttx=0,val,remrx=0,identqueued,othertelemqueued; int tailmessagequeued,ctqueued,dtmfed; struct ast_channel *who; -ZT_CONFINFO ci; /* conference info */ +DAHDI_CONFINFO ci; /* conference info */ time_t t; struct rpt_link *l,*m; struct rpt_tele *telem; @@ -8963,9 +8963,9 @@ char tmpstr[300],lstr[MAXLINKLIST]; /* make a conference for the tx */ ci.chan = 0; ci.confno = -1; /* make a new conf */ - ci.confmode = ZT_CONF_CONF | ZT_CONF_LISTENER; + ci.confmode = DAHDI_CONF_CONF | ZT_CONF_LISTENER; /* first put the channel on the conference in proper mode */ - if (ioctl(myrpt->zaptxchannel->fds[0],ZT_SETCONF,&ci) == -1) + if (ioctl(myrpt->zaptxchannel->fds[0],DAHDI_SETCONF,&ci) == -1) { ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n"); rpt_mutex_unlock(&myrpt->lock); @@ -8982,10 +8982,10 @@ char tmpstr[300],lstr[MAXLINKLIST]; /* make a conference for the pseudo */ ci.chan = 0; ci.confno = -1; /* make a new conf */ - ci.confmode = ((myrpt->p.duplex == 2) || (myrpt->p.duplex == 4)) ? ZT_CONF_CONFANNMON : - (ZT_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER); + ci.confmode = ((myrpt->p.duplex == 2) || (myrpt->p.duplex == 4)) ? DAHDI_CONF_CONFANNMON : + (DAHDI_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER); /* first put the channel on the conference in announce mode */ - if (ioctl(myrpt->pchannel->fds[0],ZT_SETCONF,&ci) == -1) + if (ioctl(myrpt->pchannel->fds[0],DAHDI_SETCONF,&ci) == -1) { ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n"); rpt_mutex_unlock(&myrpt->lock); @@ -9005,7 +9005,7 @@ char tmpstr[300],lstr[MAXLINKLIST]; (myrpt->zaptxchannel == myrpt->txchannel)) { /* get tx channel's port number */ - if (ioctl(myrpt->txchannel->fds[0],ZT_CHANNO,&ci.confno) == -1) + if (ioctl(myrpt->txchannel->fds[0],DAHDI_CHANNO,&ci.confno) == -1) { ast_log(LOG_WARNING, "Unable to set tx channel's chan number\n"); rpt_mutex_unlock(&myrpt->lock); @@ -9017,15 +9017,15 @@ char tmpstr[300],lstr[MAXLINKLIST]; myrpt->rpt_thread = AST_PTHREADT_STOP; pthread_exit(NULL); } - ci.confmode = ZT_CONF_MONITORTX; + ci.confmode = DAHDI_CONF_MONITORTX; } else { ci.confno = myrpt->txconf; - ci.confmode = ZT_CONF_CONFANNMON; + ci.confmode = DAHDI_CONF_CONFANNMON; } /* first put the channel on the conference in announce mode */ - if (ioctl(myrpt->monchannel->fds[0],ZT_SETCONF,&ci) == -1) + if (ioctl(myrpt->monchannel->fds[0],DAHDI_SETCONF,&ci) == -1) { ast_log(LOG_WARNING, "Unable to set conference mode for monitor\n"); rpt_mutex_unlock(&myrpt->lock); @@ -9057,9 +9057,9 @@ char tmpstr[300],lstr[MAXLINKLIST]; /* make a conference for the tx */ ci.chan = 0; ci.confno = myrpt->txconf; - ci.confmode = ZT_CONF_CONF | ZT_CONF_TALKER ; + ci.confmode = DAHDI_CONF_CONF | ZT_CONF_TALKER ; /* first put the channel on the conference in proper mode */ - if (ioctl(myrpt->txpchannel->fds[0],ZT_SETCONF,&ci) == -1) + if (ioctl(myrpt->txpchannel->fds[0],DAHDI_SETCONF,&ci) == -1) { ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n"); rpt_mutex_unlock(&myrpt->lock); @@ -9786,7 +9786,7 @@ char tmpstr[300],lstr[MAXLINKLIST]; /* apply inbound filters, if any */ rpt_filter(myrpt,f->data,f->datalen / 2); #endif - if (ioctl(myrpt->zaprxchannel->fds[0], ZT_GETCONFMUTE, &ismuted) == -1) + if (ioctl(myrpt->zaprxchannel->fds[0], DAHDI_GETCONFMUTE, &ismuted) == -1) { ismuted = 0; } @@ -10076,7 +10076,7 @@ char tmpstr[300],lstr[MAXLINKLIST]; if (l->phonemode) { - if (ioctl(l->chan->fds[0], ZT_GETCONFMUTE, &ismuted) == -1) + if (ioctl(l->chan->fds[0], DAHDI_GETCONFMUTE, &ismuted) == -1) { ismuted = 0; } @@ -10568,8 +10568,8 @@ static int rpt_exec(struct ast_channel *chan, void *data) struct ast_channel *who; struct ast_channel *cs[20]; struct rpt_link *l; - ZT_CONFINFO ci; /* conference info */ - ZT_PARAMS par; + DAHDI_CONFINFO ci; /* conference info */ + DAHDI_PARAMS par; int ms,elap,nullfd; time_t t,last_timeout_warning; struct zt_radio_param z; @@ -10948,9 +10948,9 @@ static int rpt_exec(struct ast_channel *chan, void *data) /* make a conference for the tx */ ci.chan = 0; ci.confno = myrpt->conf; - ci.confmode = ZT_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER; + ci.confmode = DAHDI_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER; /* first put the channel on the conference in proper mode */ - if (ioctl(l->pchan->fds[0],ZT_SETCONF,&ci) == -1) + if (ioctl(l->pchan->fds[0],DAHDI_SETCONF,&ci) == -1) { ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n"); pthread_exit(NULL); @@ -11115,9 +11115,9 @@ static int rpt_exec(struct ast_channel *chan, void *data) /* make a conference for the pseudo */ ci.chan = 0; ci.confno = -1; /* make a new conf */ - ci.confmode = ZT_CONF_CONFANNMON ; + ci.confmode = DAHDI_CONF_CONFANNMON ; /* first put the channel on the conference in announce/monitor mode */ - if (ioctl(myrpt->pchannel->fds[0],ZT_SETCONF,&ci) == -1) + if (ioctl(myrpt->pchannel->fds[0],DAHDI_SETCONF,&ci) == -1) { ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n"); rpt_mutex_unlock(&myrpt->lock); @@ -11144,28 +11144,28 @@ static int rpt_exec(struct ast_channel *chan, void *data) memset(&z,0,sizeof(z)); if ((myrpt->iofd < 1) && (myrpt->txchannel == myrpt->zaptxchannel)) { - z.radpar = ZT_RADPAR_REMMODE; - z.data = ZT_RADPAR_REM_NONE; - res = ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z); + z.radpar = DAHDI_RADPAR_REMMODE; + z.data = DAHDI_RADPAR_REM_NONE; + res = ioctl(myrpt->zaptxchannel->fds[0],DAHDI_RADIO_SETPARAM,&z); /* if PCIRADIO and kenwood selected */ if ((!res) && (!strcmp(myrpt->remote,remote_rig_kenwood))) { - z.radpar = ZT_RADPAR_UIOMODE; + z.radpar = DAHDI_RADPAR_UIOMODE; z.data = 1; - if (ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z) == -1) + if (ioctl(myrpt->zaptxchannel->fds[0],DAHDI_RADIO_SETPARAM,&z) == -1) { ast_log(LOG_ERROR,"Cannot set UIOMODE\n"); return -1; } - z.radpar = ZT_RADPAR_UIODATA; + z.radpar = DAHDI_RADPAR_UIODATA; z.data = 3; - if (ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z) == -1) + if (ioctl(myrpt->zaptxchannel->fds[0],DAHDI_RADIO_SETPARAM,&z) == -1) { ast_log(LOG_ERROR,"Cannot set UIODATA\n"); return -1; } - i = ZT_OFFHOOK; - if (ioctl(myrpt->zaptxchannel->fds[0],ZT_HOOK,&i) == -1) + i = DAHDI_OFFHOOK; + if (ioctl(myrpt->zaptxchannel->fds[0],DAHDI_HOOK,&i) == -1) { ast_log(LOG_ERROR,"Cannot set hook\n"); return -1; @@ -11175,23 +11175,23 @@ static int rpt_exec(struct ast_channel *chan, void *data) } if (myrpt->txchannel == myrpt->zaptxchannel) { - i = ZT_ONHOOK; - ioctl(myrpt->zaptxchannel->fds[0],ZT_HOOK,&i); + i = DAHDI_ONHOOK; + ioctl(myrpt->zaptxchannel->fds[0],DAHDI_HOOK,&i); /* if PCIRADIO and Yaesu ft897/ICOM IC-706 selected */ if ((myrpt->iofd < 1) && (!res) && (!strcmp(myrpt->remote,remote_rig_ft897) || (!strcmp(myrpt->remote,remote_rig_ic706)))) { - z.radpar = ZT_RADPAR_UIOMODE; + z.radpar = DAHDI_RADPAR_UIOMODE; z.data = 1; - if (ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z) == -1) + if (ioctl(myrpt->zaptxchannel->fds[0],DAHDI_RADIO_SETPARAM,&z) == -1) { ast_log(LOG_ERROR,"Cannot set UIOMODE\n"); return -1; } - z.radpar = ZT_RADPAR_UIODATA; + z.radpar = DAHDI_RADPAR_UIODATA; z.data = 3; - if (ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z) == -1) + if (ioctl(myrpt->zaptxchannel->fds[0],DAHDI_RADIO_SETPARAM,&z) == -1) { ast_log(LOG_ERROR,"Cannot set UIODATA\n"); return -1; @@ -11227,7 +11227,7 @@ static int rpt_exec(struct ast_channel *chan, void *data) if (myrpt->remote && (myrpt->rxchannel == myrpt->txchannel)) { i = 128; - ioctl(myrpt->zaprxchannel->fds[0],ZT_ECHOCANCEL,&i); + ioctl(myrpt->zaprxchannel->fds[0],DAHDI_ECHOCANCEL,&i); } if (chan->_state != AST_STATE_UP) { ast_answer(chan); @@ -11235,7 +11235,7 @@ static int rpt_exec(struct ast_channel *chan, void *data) if (myrpt->rxchannel == myrpt->zaprxchannel) { - if (ioctl(myrpt->zaprxchannel->fds[0],ZT_GET_PARAMS,&par) != -1) + if (ioctl(myrpt->zaprxchannel->fds[0],DAHDI_GET_PARAMS,&par) != -1) { if (par.rxisoffhook) { @@ -11500,9 +11500,9 @@ static int rpt_exec(struct ast_channel *chan, void *data) time(&myrpt->last_activity_time); if ((iskenwood_pci4) && (myrpt->txchannel == myrpt->zaptxchannel)) { - z.radpar = ZT_RADPAR_UIODATA; + z.radpar = DAHDI_RADPAR_UIODATA; z.data = 1; - if (ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z) == -1) + if (ioctl(myrpt->zaptxchannel->fds[0],DAHDI_RADIO_SETPARAM,&z) == -1) { ast_log(LOG_ERROR,"Cannot set UIODATA\n"); return -1; @@ -11524,9 +11524,9 @@ static int rpt_exec(struct ast_channel *chan, void *data) } if ((iskenwood_pci4) && (myrpt->txchannel == myrpt->zaptxchannel)) { - z.radpar = ZT_RADPAR_UIODATA; + z.radpar = DAHDI_RADPAR_UIODATA; z.data = 3; - if (ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z) == -1) + if (ioctl(myrpt->zaptxchannel->fds[0],DAHDI_RADIO_SETPARAM,&z) == -1) { ast_log(LOG_ERROR,"Cannot set UIODATA\n"); return -1; @@ -11576,7 +11576,7 @@ static int rpt_exec(struct ast_channel *chan, void *data) } if (f->frametype == AST_FRAME_VOICE) { - if (ioctl(chan->fds[0], ZT_GETCONFMUTE, &ismuted) == -1) + if (ioctl(chan->fds[0], DAHDI_GETCONFMUTE, &ismuted) == -1) { ismuted = 0; } @@ -11801,22 +11801,22 @@ static int rpt_exec(struct ast_channel *chan, void *data) myrpt->lastf2 = NULL; if ((iskenwood_pci4) && (myrpt->txchannel == myrpt->zaptxchannel)) { - z.radpar = ZT_RADPAR_UIOMODE; + z.radpar = DAHDI_RADPAR_UIOMODE; z.data = 3; - if (ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z) == -1) + if (ioctl(myrpt->zaptxchannel->fds[0],DAHDI_RADIO_SETPARAM,&z) == -1) { ast_log(LOG_ERROR,"Cannot set UIOMODE\n"); return -1; } - z.radpar = ZT_RADPAR_UIODATA; + z.radpar = DAHDI_RADPAR_UIODATA; z.data = 3; - if (ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z) == -1) + if (ioctl(myrpt->zaptxchannel->fds[0],DAHDI_RADIO_SETPARAM,&z) == -1) { ast_log(LOG_ERROR,"Cannot set UIODATA\n"); return -1; } - i = ZT_OFFHOOK; - if (ioctl(myrpt->zaptxchannel->fds[0],ZT_HOOK,&i) == -1) + i = DAHDI_OFFHOOK; + if (ioctl(myrpt->zaptxchannel->fds[0],DAHDI_HOOK,&i) == -1) { ast_log(LOG_ERROR,"Cannot set hook\n"); return -1; |