From 1b1c2db6bd7996471ed23fbfec287598ab603711 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 13 Jan 2009 19:27:54 +0000 Subject: [PATCH] Merged revisions 168562 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r168562 | russell | 2009-01-13 13:22:13 -0600 (Tue, 13 Jan 2009) | 10 lines Merged revisions 168561 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168561 | russell | 2009-01-13 13:13:05 -0600 (Tue, 13 Jan 2009) | 2 lines Revert unnecessary indications API change from rev 122314 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168564 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_disa.c | 2 +- apps/app_read.c | 2 +- apps/app_readexten.c | 2 +- channels/chan_misdn.c | 4 ++-- channels/chan_unistim.c | 6 +++--- funcs/func_channel.c | 2 +- include/asterisk/channel.h | 2 +- include/asterisk/indications.h | 24 +++++++++++------------ main/app.c | 2 +- main/channel.c | 2 +- main/indications.c | 36 +++++++++++++++++----------------- main/pbx.c | 2 +- res/res_indications.c | 16 +++++++-------- res/snmp/agent.c | 4 ++-- 14 files changed, 53 insertions(+), 53 deletions(-) diff --git a/apps/app_disa.c b/apps/app_disa.c index 72f0eaf864..79736584ab 100644 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -102,7 +102,7 @@ AST_APP_OPTIONS(app_opts, { static void play_dialtone(struct ast_channel *chan, char *mailbox) { - const struct ind_tone_zone_sound *ts = NULL; + const struct 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_read.c b/apps/app_read.c index a7fdf624bd..710bdd4ba2 100644 --- a/apps/app_read.c +++ b/apps/app_read.c @@ -86,7 +86,7 @@ static int read_exec(struct ast_channel *chan, void *data) int tries = 1, to = 0, x = 0; double tosec; char *argcopy = NULL; - struct ind_tone_zone_sound *ts = NULL; + struct tone_zone_sound *ts = NULL; struct ast_flags flags = {0}; const char *status = "ERROR"; diff --git a/apps/app_readexten.c b/apps/app_readexten.c index cb4fd8c2a7..965ca84fbf 100644 --- a/apps/app_readexten.c +++ b/apps/app_readexten.c @@ -79,7 +79,7 @@ static int readexten_exec(struct ast_channel *chan, void *data) int maxdigits = sizeof(exten) - 1; int timeout = 0, digit_timeout = 0, x = 0; char *argcopy = NULL, *status = ""; - struct ind_tone_zone_sound *ts = NULL; + struct tone_zone_sound *ts = NULL; struct ast_flags flags = {0}; AST_DECLARE_APP_ARGS(arglist, diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index a4a18ce724..d325ebc4b4 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -377,7 +377,7 @@ struct chan_list { * \brief Tone zone sound used for dialtone generation. * \note Used as a boolean. Non-NULL to prod generation if enabled. */ - const struct ind_tone_zone_sound *ts; + const struct tone_zone_sound *ts; /*! * \brief Enables overlap dialing for the set amount of seconds. (0 = Disabled) @@ -3289,7 +3289,7 @@ static enum ast_bridge_result misdn_bridge (struct ast_channel *c0, static int dialtone_indicate(struct chan_list *cl) { - const struct ind_tone_zone_sound *ts = NULL; + const struct tone_zone_sound *ts = NULL; struct ast_channel *ast = cl->ast; int nd = 0; diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index 88f37fbec1..83fd936dc9 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -433,7 +433,7 @@ static struct unistim_device { char datetimeformat; /*!< format used for displaying time/date */ char contrast; /*!< contrast */ char country[3]; /*!< country used for dial tone frequency */ - struct ind_tone_zone *tz; /*!< Tone zone for res_indications (ring, busy, congestion) */ + struct tone_zone *tz; /*!< Tone zone for res_indications (ring, busy, congestion) */ char ringvolume; /*!< Ring volume */ char ringstyle; /*!< Ring melody */ int rtp_port; /*!< RTP port used by the phone */ @@ -4051,10 +4051,10 @@ static char *control2str(int ind) return "UNKNOWN"; } -static void in_band_indication(struct ast_channel *ast, const struct ind_tone_zone *tz, +static void in_band_indication(struct ast_channel *ast, const struct tone_zone *tz, const char *indication) { - const struct ind_tone_zone_sound *ts = NULL; + const struct tone_zone_sound *ts = NULL; ts = ast_get_indication_tone(tz, indication); diff --git a/funcs/func_channel.c b/funcs/func_channel.c index 42b3c68c9f..e8373c5e5a 100644 --- a/funcs/func_channel.c +++ b/funcs/func_channel.c @@ -127,7 +127,7 @@ static int func_channel_write(struct ast_channel *chan, const char *function, } #endif else if (!strcasecmp(data, "tonezone")) { - struct ind_tone_zone *new_zone; + struct tone_zone *new_zone; if (!(new_zone = ast_get_indication_zone(value))) { ast_log(LOG_ERROR, "Unknown country code '%s' for tonezone. Check indications.conf for available country codes.\n", value); ret = -1; diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index a2b2b5bcb7..7fa376275d 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -492,7 +492,7 @@ struct ast_channel { struct ast_cdr *cdr; /*!< Call Detail Record */ enum ast_channel_adsicpe adsicpe; /*!< Whether or not ADSI is detected on CPE */ - struct ind_tone_zone *zone; /*!< Tone zone as set in indications.conf or + struct tone_zone *zone; /*!< Tone zone as set in indications.conf or in the CHANNEL dialplan function */ struct ast_channel_monitor *monitor; /*!< Channel monitoring */ diff --git a/include/asterisk/indications.h b/include/asterisk/indications.h index 2841a9fdfc..9a1b198196 100644 --- a/include/asterisk/indications.h +++ b/include/asterisk/indications.h @@ -39,39 +39,39 @@ are no spaces. The sequence is repeated back to the first tone description not preceeded by !. Duration is specified in milliseconds */ -struct ind_tone_zone_sound { - struct ind_tone_zone_sound *next; /*!< next element */ +struct tone_zone_sound { + struct tone_zone_sound *next; /*!< next element */ const char *name; /*!< Identifing name */ const char *data; /*!< Actual zone description */ }; -struct ind_tone_zone { - AST_RWLIST_ENTRY(ind_tone_zone) list; +struct tone_zone { + AST_RWLIST_ENTRY(tone_zone) list; char country[5]; /*!< Country code */ char alias[5]; /*!< is this an alias? */ char description[40]; /*!< Description */ int nrringcadence; /*!< # registered ringcadence elements */ int *ringcadence; /*!< Ring cadence */ - struct ind_tone_zone_sound *tones; /*!< The known tones for this zone */ + struct tone_zone_sound *tones; /*!< The known tones for this zone */ }; /*! \brief set the default tone country */ int ast_set_indication_country(const char *country); /*! \brief locate tone_zone, given the country. if country == NULL, use the default country */ -struct ind_tone_zone *ast_get_indication_zone(const char *country); +struct tone_zone *ast_get_indication_zone(const char *country); /*! \brief locate a tone_zone_sound, given the tone_zone. if tone_zone == NULL, use the default tone_zone */ -struct ind_tone_zone_sound *ast_get_indication_tone(const struct ind_tone_zone *zone, const char *indication); +struct tone_zone_sound *ast_get_indication_tone(const struct tone_zone *zone, const char *indication); /*! \brief add a new country, if country exists, it will be replaced. */ -int ast_register_indication_country(struct ind_tone_zone *country); +int ast_register_indication_country(struct tone_zone *country); /*! \brief remove an existing country and all its indications, country must exist */ int ast_unregister_indication_country(const char *country); /*! \brief add a new indication to a tone_zone. tone_zone must exist. if the indication already * exists, it will be replaced. */ -int ast_register_indication(struct ind_tone_zone *zone, const char *indication, const char *tonelist); +int ast_register_indication(struct tone_zone *zone, const char *indication, const char *tonelist); /*! \brief remove an existing tone_zone's indication. tone_zone must exist */ -int ast_unregister_indication(struct ind_tone_zone *zone, const char *indication); +int ast_unregister_indication(struct tone_zone *zone, const char *indication); /*! \brief Start a tone-list going */ int ast_playtones_start(struct ast_channel *chan, int vol, const char* tonelist, int interruptible); @@ -79,10 +79,10 @@ int ast_playtones_start(struct ast_channel *chan, int vol, const char* tonelist, void ast_playtones_stop(struct ast_channel *chan); /*! \brief support for walking through a list of indications */ -struct ind_tone_zone *ast_walk_indications(const struct ind_tone_zone *cur); +struct tone_zone *ast_walk_indications(const struct tone_zone *cur); #if 0 -extern struct ind_tone_zone *tone_zones; +extern struct tone_zone *tone_zones; extern ast_mutex_t tzlock; #endif diff --git a/main/app.c b/main/app.c index b6895de84d..c9721d58bb 100644 --- a/main/app.c +++ b/main/app.c @@ -64,7 +64,7 @@ static AST_RWLIST_HEAD_STATIC(groups, ast_group_info); */ int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect, size_t size, int maxlen, int timeout) { - struct ind_tone_zone_sound *ts; + struct tone_zone_sound *ts; int res = 0, x = 0; if (maxlen > size) diff --git a/main/channel.c b/main/channel.c index 3148f65023..e13b64c8ac 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2892,7 +2892,7 @@ int ast_indicate_data(struct ast_channel *chan, int _condition, /* By using an enum, we'll get compiler warnings for values not handled * in switch statements. */ enum ast_control_frame_type condition = _condition; - const struct ind_tone_zone_sound *ts = NULL; + const struct tone_zone_sound *ts = NULL; int res = -1; ast_channel_lock(chan); diff --git a/main/indications.c b/main/indications.c index e243e6dbeb..b575dff4de 100644 --- a/main/indications.c +++ b/main/indications.c @@ -332,12 +332,12 @@ void ast_playtones_stop(struct ast_channel *chan) /*--------------------------------------------*/ -static AST_RWLIST_HEAD_STATIC(tone_zones, ind_tone_zone); -static struct ind_tone_zone *current_tonezone; +static AST_RWLIST_HEAD_STATIC(tone_zones, tone_zone); +static struct tone_zone *current_tonezone; -struct ind_tone_zone *ast_walk_indications(const struct ind_tone_zone *cur) +struct tone_zone *ast_walk_indications(const struct tone_zone *cur) { - struct ind_tone_zone *tz = NULL; + struct tone_zone *tz = NULL; AST_RWLIST_RDLOCK(&tone_zones); /* If cur is not NULL, then we have to iterate through - otherwise just return the first entry */ @@ -358,7 +358,7 @@ struct ind_tone_zone *ast_walk_indications(const struct ind_tone_zone *cur) /* Set global indication country */ int ast_set_indication_country(const char *country) { - struct ind_tone_zone *zone = NULL; + struct tone_zone *zone = NULL; /* If no country is specified or we are unable to find the zone, then return not found */ if (!country || !(zone = ast_get_indication_zone(country))) @@ -376,9 +376,9 @@ int ast_set_indication_country(const char *country) } /* locate tone_zone, given the country. if country == NULL, use the default country */ -struct ind_tone_zone *ast_get_indication_zone(const char *country) +struct tone_zone *ast_get_indication_zone(const char *country) { - struct ind_tone_zone *tz = NULL; + struct tone_zone *tz = NULL; int alias_loop = 0; AST_RWLIST_RDLOCK(&tone_zones); @@ -411,9 +411,9 @@ struct ind_tone_zone *ast_get_indication_zone(const char *country) } /* locate a tone_zone_sound, given the tone_zone. if tone_zone == NULL, use the default tone_zone */ -struct ind_tone_zone_sound *ast_get_indication_tone(const struct ind_tone_zone *zone, const char *indication) +struct tone_zone_sound *ast_get_indication_tone(const struct tone_zone *zone, const char *indication) { - struct ind_tone_zone_sound *ts = NULL; + struct tone_zone_sound *ts = NULL; AST_RWLIST_RDLOCK(&tone_zones); @@ -440,10 +440,10 @@ struct ind_tone_zone_sound *ast_get_indication_tone(const struct ind_tone_zone * } /* helper function to delete a tone_zone in its entirety */ -static inline void free_zone(struct ind_tone_zone* zone) +static inline void free_zone(struct tone_zone* zone) { while (zone->tones) { - struct ind_tone_zone_sound *tmp = zone->tones->next; + struct tone_zone_sound *tmp = zone->tones->next; ast_free((void *)zone->tones->name); ast_free((void *)zone->tones->data); ast_free(zone->tones); @@ -459,9 +459,9 @@ static inline void free_zone(struct ind_tone_zone* zone) /*--------------------------------------------*/ /* add a new country, if country exists, it will be replaced. */ -int ast_register_indication_country(struct ind_tone_zone *zone) +int ast_register_indication_country(struct tone_zone *zone) { - struct ind_tone_zone *tz = NULL; + struct tone_zone *tz = NULL; AST_RWLIST_WRLOCK(&tone_zones); AST_RWLIST_TRAVERSE_SAFE_BEGIN(&tone_zones, tz, list) { @@ -494,7 +494,7 @@ int ast_register_indication_country(struct ind_tone_zone *zone) * Also, all countries which are an alias for the specified country are removed. */ int ast_unregister_indication_country(const char *country) { - struct ind_tone_zone *tz = NULL; + struct tone_zone *tz = NULL; int res = -1; AST_RWLIST_WRLOCK(&tone_zones); @@ -520,9 +520,9 @@ int ast_unregister_indication_country(const char *country) /* add a new indication to a tone_zone. tone_zone must exist. if the indication already * exists, it will be replaced. */ -int ast_register_indication(struct ind_tone_zone *zone, const char *indication, const char *tonelist) +int ast_register_indication(struct tone_zone *zone, const char *indication, const char *tonelist) { - struct ind_tone_zone_sound *ts, *ps; + struct tone_zone_sound *ts, *ps; /* is it an alias? stop */ if (zone->alias[0]) @@ -558,9 +558,9 @@ int ast_register_indication(struct ind_tone_zone *zone, const char *indication, } /* remove an existing country's indication. Both country and indication must exist */ -int ast_unregister_indication(struct ind_tone_zone *zone, const char *indication) +int ast_unregister_indication(struct tone_zone *zone, const char *indication) { - struct ind_tone_zone_sound *ts,*ps = NULL, *tmp; + struct tone_zone_sound *ts,*ps = NULL, *tmp; int res = -1; /* is it an alias? stop */ diff --git a/main/pbx.c b/main/pbx.c index 6edd6795d0..28e67a2c9a 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -7765,7 +7765,7 @@ static int pbx_builtin_waitexten(struct ast_channel *chan, void *data) } else if (ast_test_flag(&flags, WAITEXTEN_MOH)) { ast_indicate_data(chan, AST_CONTROL_HOLD, opts[0], strlen(opts[0])); } else if (ast_test_flag(&flags, WAITEXTEN_DIALTONE)) { - const struct ind_tone_zone_sound *ts = ast_get_indication_tone(chan->zone, "dial"); + const struct tone_zone_sound *ts = ast_get_indication_tone(chan->zone, "dial"); if (ts) ast_playtones_start(chan, 0, ts->data, 0); else diff --git a/res/res_indications.c b/res/res_indications.c index af56444cd1..b6f2b687ca 100644 --- a/res/res_indications.c +++ b/res/res_indications.c @@ -65,7 +65,7 @@ char *playtones_desc= */ static char *handle_cli_indication_add(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { - struct ind_tone_zone *tz; + struct tone_zone *tz; int created_country = 0; switch (cmd) { @@ -115,7 +115,7 @@ static char *handle_cli_indication_add(struct ast_cli_entry *e, int cmd, struct */ static char *handle_cli_indication_remove(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { - struct ind_tone_zone *tz; + struct tone_zone *tz; switch (cmd) { case CLI_INIT: @@ -160,7 +160,7 @@ static char *handle_cli_indication_remove(struct ast_cli_entry *e, int cmd, stru */ static char *handle_cli_indication_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { - struct ind_tone_zone *tz = NULL; + struct tone_zone *tz = NULL; char buf[256]; int found_country = 0; @@ -189,7 +189,7 @@ static char *handle_cli_indication_show(struct ast_cli_entry *e, int cmd, struct int i, j; for (i = 2; i < a->argc; i++) { if (strcasecmp(tz->country, a->argv[i]) == 0 && !tz->alias[0]) { - struct ind_tone_zone_sound* ts; + struct tone_zone_sound* ts; if (!found_country) { found_country = 1; ast_cli(a->fd, "Country Indication PlayList\n"); @@ -221,7 +221,7 @@ static char *handle_cli_indication_show(struct ast_cli_entry *e, int cmd, struct */ static int handle_playtones(struct ast_channel *chan, void *data) { - struct ind_tone_zone_sound *ts; + struct tone_zone_sound *ts; int res; if (!data || !((char*)data)[0]) { @@ -256,7 +256,7 @@ static int ind_load_module(int reload) struct ast_variable *v; char *cxt; char *c; - struct ind_tone_zone *tones; + struct tone_zone *tones; const char *country = NULL; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; @@ -315,7 +315,7 @@ static int ind_load_module(int reload) c = countries; country = strsep(&c,","); while (country) { - struct ind_tone_zone* azone; + struct tone_zone* azone; if (!(azone = ast_calloc(1, sizeof(*azone)))) { ast_config_destroy(cfg); return -1; @@ -331,7 +331,7 @@ static int ind_load_module(int reload) } } else { /* add tone to country */ - struct ind_tone_zone_sound *ps,*ts; + struct 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 */ diff --git a/res/snmp/agent.c b/res/snmp/agent.c index 8ccee1d467..8820b697ea 100644 --- a/res/snmp/agent.c +++ b/res/snmp/agent.c @@ -644,7 +644,7 @@ static u_char *ast_var_indications(struct variable *vp, oid *name, size_t *lengt int exact, size_t *var_len, WriteMethod **write_method) { static unsigned long long_ret; - struct ind_tone_zone *tz = NULL; + struct tone_zone *tz = NULL; if (header_generic(vp, name, length, exact, var_len, write_method)) return NULL; @@ -674,7 +674,7 @@ static u_char *ast_var_indications_table(struct variable *vp, oid *name, size_t int exact, size_t *var_len, WriteMethod **write_method) { static unsigned long long_ret; - struct ind_tone_zone *tz = NULL; + struct tone_zone *tz = NULL; int i; if (header_simple_table(vp, name, length, exact, var_len, write_method, -1))