diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-23 19:48:03 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-23 19:48:03 +0000 |
| commit | 5e846e20b2a63dd0d9571787746e35e91a904358 (patch) | |
| tree | 1dea44696cf7b66718062c0893935604ccbda0f1 /main | |
| parent | 50d4586dc323916f345eee8ea44b1513b0a94d4c (diff) | |
Merged revisions 133169 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r133169 | mmichelson | 2008-07-23 14:39:47 -0500 (Wed, 23 Jul 2008) | 12 lines
As suggested by seanbright, the PSEUDO_CHAN_LEN in
app_chanspy should be set at load time, not at compile
time, since dahdi_chan_name is determined at load time.
Also changed the next_unique_id_to_use to have the
static qualifier.
Also added the dahdi_chan_name_len variable so that
strlen(dahdi_chan_name) isn't necessary. Thanks to
seanbright for the suggestion.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@133171 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 9cd52efb5..21b649773 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -165,6 +165,7 @@ int option_maxfiles; /*!< Max number of open file handles (files, sockets) */ long option_minmemfree; /*!< Minimum amount of free system memory - stop accepting calls if free memory falls below this watermark */ #endif char dahdi_chan_name[AST_CHANNEL_NAME] = "ZAP"; +int dahdi_chan_name_len = 3; /*! @} */ @@ -2794,6 +2795,7 @@ static void ast_readconfig(void) } else if (!strcasecmp(v->name, "dahdichanname")) { if (!strcasecmp(v->value, "yes")) { ast_copy_string(dahdi_chan_name, "DAHDI", sizeof(dahdi_chan_name)); + dahdi_chan_name_len = 5; } } else if (!strcasecmp(v->name, "entityid")) { struct ast_eid tmp_eid; |