kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

make some more changes to the dahdi/zap channel name support stuff to ensure allthe globals are 'const', and clean up mmichelson's changes to app_chanspy to simplify the code

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@133226 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-07-23 20:42:30 +00:00
parent 252c5728fc
commit cd12517eeb
6 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/app_chanspy.c
View File

@@ -147,13 +147,6 @@ AST_APP_OPTIONS(spy_opts, {
}); });
static int next_unique_id_to_use = 0; static int next_unique_id_to_use = 0;
static int PSEUDO_CHAN_LEN;
static void determine_pseudo_chan_len(void)
{
PSEUDO_CHAN_LEN = dahdi_chan_name_len + strlen("/pseudo");
}
struct chanspy_translation_helper { struct chanspy_translation_helper {
/* spy data */ /* spy data */
@@ -473,6 +466,11 @@ static struct chanspy_ds *next_channel(struct ast_channel *chan,
{ {
struct ast_channel *this; struct ast_channel *this;
char channel_name[AST_CHANNEL_NAME]; char channel_name[AST_CHANNEL_NAME];
static size_t PSEUDO_CHAN_LEN = 0;
if (!PSEUDO_CHAN_LEN) {
PSEUDO_CHAN_LEN = *dahdi_chan_name_len + strlen("/pseudo");
}
redo: redo:
if (spec) if (spec)
@@ -865,7 +863,6 @@ static int load_module(void)
{ {
int res = 0; int res = 0;
determine_pseudo_chan_len();
res |= ast_register_application(app_chan, chanspy_exec, tdesc, desc_chan); res |= ast_register_application(app_chan, chanspy_exec, tdesc, desc_chan);
res |= ast_register_application(app_ext, extenspy_exec, tdesc, desc_ext); res |= ast_register_application(app_ext, extenspy_exec, tdesc, desc_ext);

4
apps/app_dahdibarge.c
View File

@@ -336,7 +336,7 @@ static int unload_module(void)
{ {
int res = 0; int res = 0;
if (dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) { if (*dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) {
res |= ast_unregister_application(dahdi_app); res |= ast_unregister_application(dahdi_app);
} }
@@ -351,7 +351,7 @@ static int load_module(void)
{ {
int res = 0; int res = 0;
if (dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) { if (*dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) {
res |= ast_register_application(dahdi_app, exec_dahdi, dahdi_synopsis, dahdi_descrip); res |= ast_register_application(dahdi_app, exec_dahdi, dahdi_synopsis, dahdi_descrip);
} }

4
apps/app_dahdiras.c
View File

@@ -260,7 +260,7 @@ static int unload_module(void)
{ {
int res = 0; int res = 0;
if (dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) { if (*dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) {
res |= ast_unregister_application(dahdi_app); res |= ast_unregister_application(dahdi_app);
} }
@@ -275,7 +275,7 @@ static int load_module(void)
{ {
int res = 0; int res = 0;
if (dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) { if (*dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) {
res |= ast_register_application(dahdi_app, exec, dahdi_synopsis, dahdi_descrip); res |= ast_register_application(dahdi_app, exec, dahdi_synopsis, dahdi_descrip);
} }

8
channels/chan_dahdi.c
View File

@@ -5234,7 +5234,7 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb
int features; int features;
char *b2 = NULL; char *b2 = NULL;
DAHDI_PARAMS ps; DAHDI_PARAMS ps;
char chanprefix[dahdi_chan_name_len + 4]; char chanprefix[*dahdi_chan_name_len + 4];
if (i->subs[index].owner) { if (i->subs[index].owner) {
ast_log(LOG_WARNING, "Channel %d already has a %s call\n", i->channel,subnames[index]); ast_log(LOG_WARNING, "Channel %d already has a %s call\n", i->channel,subnames[index]);
@@ -10584,7 +10584,7 @@ static int dahdi_action_restart(struct mansession *s, const struct message *m)
} }
#define local_astman_unregister(a) do { \ #define local_astman_unregister(a) do { \
if (dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) { \ if (*dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) { \
ast_manager_unregister("DAHDI" a); \ ast_manager_unregister("DAHDI" a); \
} \ } \
ast_manager_unregister("Zap" a); \ ast_manager_unregister("Zap" a); \
@@ -11583,7 +11583,7 @@ static int setup_dahdi(int reload)
} }
#define local_astman_register(a, b, c, d) do { \ #define local_astman_register(a, b, c, d) do { \
if (dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) { \ if (*dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) { \
ast_manager_register("DAHDI" a, b, dahdi_ ## c, d); \ ast_manager_register("DAHDI" a, b, dahdi_ ## c, d); \
} \ } \
ast_manager_register("Zap" a, b, zap_ ## c, d); \ ast_manager_register("Zap" a, b, zap_ ## c, d); \
@@ -11611,7 +11611,7 @@ static int load_module(void)
if ((res = setup_dahdi(0))) { if ((res = setup_dahdi(0))) {
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
} }
if (dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) { if (*dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) {
chan_tech = &dahdi_tech; chan_tech = &dahdi_tech;
} else { } else {
chan_tech = &zap_tech; chan_tech = &zap_tech;

6
include/asterisk/options.h
View File

@@ -123,11 +123,11 @@ extern pid_t ast_mainpid;
extern char record_cache_dir[AST_CACHE_DIR_LEN]; extern char record_cache_dir[AST_CACHE_DIR_LEN];
extern char debug_filename[AST_FILENAME_MAX]; extern char debug_filename[AST_FILENAME_MAX];
extern const char *dahdi_chan_name; extern const char *dahdi_chan_name;
extern int dahdi_chan_name_len; extern const size_t *dahdi_chan_name_len;
extern enum dahdi_chan_modes { extern const enum dahdi_chan_modes {
CHAN_ZAP_MODE, CHAN_ZAP_MODE,
CHAN_DAHDI_PLUS_ZAP_MODE, CHAN_DAHDI_PLUS_ZAP_MODE,
} dahdi_chan_mode; } *dahdi_chan_mode;
extern int ast_language_is_prefix; extern int ast_language_is_prefix;

22
main/asterisk.c
View File

@@ -173,16 +173,17 @@ int option_maxcalls; /*!< Max number of active calls */
char record_cache_dir[AST_CACHE_DIR_LEN] = AST_TMP_DIR; char record_cache_dir[AST_CACHE_DIR_LEN] = AST_TMP_DIR;
char debug_filename[AST_FILENAME_MAX] = ""; char debug_filename[AST_FILENAME_MAX] = "";
#ifdef HAVE_ZAPTEL #ifdef HAVE_ZAPTEL
char _dahdi_chan_name[AST_CHANNEL_NAME] = "Zap"; static char _dahdi_chan_name[AST_CHANNEL_NAME] = "Zap";
int _dahdi_chan_name_len = 3; static size_t _dahdi_chan_name_len = 3;
enum dahdi_chan_modes dahdi_chan_mode = CHAN_ZAP_MODE; static enum dahdi_chan_modes _dahdi_chan_mode = CHAN_ZAP_MODE;
#else #else
char _dahdi_chan_name[AST_CHANNEL_NAME] = "DAHDI"; static char _dahdi_chan_name[AST_CHANNEL_NAME] = "DAHDI";
int _dahdi_chan_name_len = 5; static size_t _dahdi_chan_name_len = 5;
enum dahdi_chan_modes dahdi_chan_mode = CHAN_DAHDI_PLUS_ZAP_MODE; static enum dahdi_chan_modes _dahdi_chan_mode = CHAN_DAHDI_PLUS_ZAP_MODE;
#endif #endif
const char *dahdi_chan_name; const char *dahdi_chan_name;
int dahdi_chan_name_len; const size_t *dahdi_chan_name_len;
const enum dahdi_chan_modes *dahdi_chan_mode;
static int ast_socket = -1; /*!< UNIX Socket for allowing remote control */ static int ast_socket = -1; /*!< UNIX Socket for allowing remote control */
static int ast_consock = -1; /*!< UNIX Socket for controlling another asterisk */ static int ast_consock = -1; /*!< UNIX Socket for controlling another asterisk */
@@ -2597,13 +2598,13 @@ static void ast_readconfig(void)
if (ast_true(v->value)) { if (ast_true(v->value)) {
strcpy(_dahdi_chan_name, "DAHDI"); strcpy(_dahdi_chan_name, "DAHDI");
_dahdi_chan_name_len = 5; _dahdi_chan_name_len = 5;
dahdi_chan_mode = CHAN_DAHDI_PLUS_ZAP_MODE; _dahdi_chan_mode = CHAN_DAHDI_PLUS_ZAP_MODE;
} }
#else #else
if (ast_false(v->value)) { if (ast_false(v->value)) {
strcpy(_dahdi_chan_name, "Zap"); strcpy(_dahdi_chan_name, "Zap");
_dahdi_chan_name_len = 3; _dahdi_chan_name_len = 3;
dahdi_chan_mode = CHAN_ZAP_MODE; _dahdi_chan_mode = CHAN_ZAP_MODE;
} }
#endif #endif
} }
@@ -2988,7 +2989,8 @@ int main(int argc, char *argv[])
} }
dahdi_chan_name = _dahdi_chan_name; dahdi_chan_name = _dahdi_chan_name;
dahdi_chan_name_len = _dahdi_chan_name_len; dahdi_chan_name_len = &_dahdi_chan_name_len;
dahdi_chan_mode = &_dahdi_chan_mode;
#ifdef HAVE_ZAPTEL #ifdef HAVE_ZAPTEL
{ {