mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Adds DAHDI support alongside Zaptel. DAHDI usage favored, but all Zap stuff should continue working. Release announcement to follow.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@122314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -85,7 +85,7 @@ char *playtones_desc=
|
||||
*/
|
||||
static int handle_add_indication(int fd, int argc, char *argv[])
|
||||
{
|
||||
struct tone_zone *tz;
|
||||
struct ind_tone_zone *tz;
|
||||
int created_country = 0;
|
||||
if (argc != 5) return RESULT_SHOWUSAGE;
|
||||
|
||||
@@ -119,7 +119,7 @@ static int handle_add_indication(int fd, int argc, char *argv[])
|
||||
*/
|
||||
static int handle_remove_indication(int fd, int argc, char *argv[])
|
||||
{
|
||||
struct tone_zone *tz;
|
||||
struct ind_tone_zone *tz;
|
||||
if (argc != 3 && argc != 4) return RESULT_SHOWUSAGE;
|
||||
|
||||
if (argc == 3) {
|
||||
@@ -148,7 +148,7 @@ static int handle_remove_indication(int fd, int argc, char *argv[])
|
||||
*/
|
||||
static int handle_show_indications(int fd, int argc, char *argv[])
|
||||
{
|
||||
struct tone_zone *tz = NULL;
|
||||
struct ind_tone_zone *tz = NULL;
|
||||
char buf[256];
|
||||
int found_country = 0;
|
||||
|
||||
@@ -166,7 +166,7 @@ static int handle_show_indications(int fd, int argc, char *argv[])
|
||||
for (i=2; i<argc; i++) {
|
||||
if (strcasecmp(tz->country,argv[i])==0 &&
|
||||
!tz->alias[0]) {
|
||||
struct tone_zone_sound* ts;
|
||||
struct ind_tone_zone_sound* ts;
|
||||
if (!found_country) {
|
||||
found_country = 1;
|
||||
ast_cli(fd,"Country Indication PlayList\n"
|
||||
@@ -196,7 +196,7 @@ static int handle_show_indications(int fd, int argc, char *argv[])
|
||||
*/
|
||||
static int handle_playtones(struct ast_channel *chan, void *data)
|
||||
{
|
||||
struct tone_zone_sound *ts;
|
||||
struct ind_tone_zone_sound *ts;
|
||||
int res;
|
||||
|
||||
if (!data || !((char*)data)[0]) {
|
||||
@@ -231,7 +231,7 @@ static int ind_load_module(void)
|
||||
struct ast_variable *v;
|
||||
char *cxt;
|
||||
char *c;
|
||||
struct tone_zone *tones;
|
||||
struct ind_tone_zone *tones;
|
||||
const char *country = NULL;
|
||||
|
||||
/* that the following cast is needed, is yuk! */
|
||||
@@ -284,7 +284,7 @@ static int ind_load_module(void)
|
||||
c = countries;
|
||||
country = strsep(&c,",");
|
||||
while (country) {
|
||||
struct tone_zone* azone;
|
||||
struct ind_tone_zone* azone;
|
||||
if (!(azone = ast_calloc(1, sizeof(*azone)))) {
|
||||
ast_config_destroy(cfg);
|
||||
return -1;
|
||||
@@ -300,7 +300,7 @@ static int ind_load_module(void)
|
||||
}
|
||||
} else {
|
||||
/* add tone to country */
|
||||
struct tone_zone_sound *ps,*ts;
|
||||
struct ind_tone_zone_sound *ps,*ts;
|
||||
for (ps=NULL,ts=tones->tones; ts; ps=ts, ts=ts->next) {
|
||||
if (strcasecmp(v->name,ts->name)==0) {
|
||||
/* already there */
|
||||
|
Reference in New Issue
Block a user