aboutsummaryrefslogtreecommitdiffstats
path: root/main/asterisk.c
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-23 19:50:23 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-23 19:50:23 +0000
commit2ee7794ccabab7e6a72a4b06aab9e074a49a15b0 (patch)
tree72a999c8365f34cb74f5dd9dec59d8295c35743d /main/asterisk.c
parent9a0a5b66f68f2366273fd609284778c1a6443fbc (diff)
Merged revisions 133171 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r133171 | mmichelson | 2008-07-23 14:48:03 -0500 (Wed, 23 Jul 2008) | 20 lines 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/branches/1.6.0@133172 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/asterisk.c')
-rw-r--r--main/asterisk.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index 1f45b86bc..a25af2372 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -169,6 +169,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;
/*! @} */