[svn-commits] mmichelson: branch 1.6.0 r133172 - in /branches/1.6.0: ./ apps/ include/aster...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Jul 23 14:50:23 2008
New Revision: 133172

URL: http://svn.digium.com/view/asterisk?view=rev&rev=133172
Log:
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.


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_chanspy.c
    branches/1.6.0/include/asterisk/options.h
    branches/1.6.0/main/asterisk.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_chanspy.c?view=diff&rev=133172&r1=133171&r2=133172
==============================================================================
--- branches/1.6.0/apps/app_chanspy.c (original)
+++ branches/1.6.0/apps/app_chanspy.c Wed Jul 23 14:50:23 2008
@@ -50,9 +50,6 @@
 #include "asterisk/options.h"
 
 #define AST_NAME_STRLEN 256
-
- /* "DAHDI/pseudo" is twelve characters */
-#define PSEUDO_CHAN_LEN 12
 
 static const char *tdesc = "Listen to a channel, and optionally whisper into it";
 static const char *app_chan = "ChanSpy";
@@ -170,7 +167,14 @@
 	AST_APP_OPTION('X', OPTION_EXIT),
 });
 
-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 {
 	/* spy data */
@@ -951,6 +955,7 @@
 {
 	int res = 0;
 
+	determine_pseudo_chan_len();
 	res |= ast_register_application(app_chan, chanspy_exec, tdesc, desc_chan);
 	res |= ast_register_application(app_ext, extenspy_exec, tdesc, desc_ext);
 

Modified: branches/1.6.0/include/asterisk/options.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/options.h?view=diff&rev=133172&r1=133171&r2=133172
==============================================================================
--- branches/1.6.0/include/asterisk/options.h (original)
+++ branches/1.6.0/include/asterisk/options.h Wed Jul 23 14:50:23 2008
@@ -142,6 +142,7 @@
 
 extern char record_cache_dir[AST_CACHE_DIR_LEN];
 extern char dahdi_chan_name[AST_CHANNEL_NAME];
+extern int dahdi_chan_name_len;
 
 extern int ast_language_is_prefix;
 

Modified: branches/1.6.0/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/asterisk.c?view=diff&rev=133172&r1=133171&r2=133172
==============================================================================
--- branches/1.6.0/main/asterisk.c (original)
+++ branches/1.6.0/main/asterisk.c Wed Jul 23 14:50:23 2008
@@ -169,6 +169,7 @@
 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;
 
 /*! @} */