[asterisk-commits] branch oej/metermaids r11456 - in /team/oej/metermaids: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Feb 28 15:15:23 2006
New Revision: 11456

URL: http://svn.digium.com/view/asterisk?rev=11456&view=rev
Log:
Update to trunk

Modified:
    team/oej/metermaids/   (props changed)
    team/oej/metermaids/asterisk.c
    team/oej/metermaids/channels/chan_iax2.c

Propchange: team/oej/metermaids/
------------------------------------------------------------------------------
    automerge = yes

Propchange: team/oej/metermaids/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb 28 15:15:23 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7496,7498-11394
+/branches/1.2:1-7496,7498-11455

Modified: team/oej/metermaids/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/asterisk.c?rev=11456&r1=11455&r2=11456&view=diff
==============================================================================
--- team/oej/metermaids/asterisk.c (original)
+++ team/oej/metermaids/asterisk.c Tue Feb 28 15:15:23 2006
@@ -1905,7 +1905,8 @@
 			snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value);
 		} else if (!strcasecmp(v->name, "astvarlibdir")) {
 			ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR));
-			snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/%s", v->value, "astdb");    
+			snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value);
+			snprintf(ast_config_AST_KEY_DIR, sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value);
 		} else if (!strcasecmp(v->name, "astlogdir")) {
 			ast_copy_string(ast_config_AST_LOG_DIR, v->value, sizeof(ast_config_AST_LOG_DIR));
 		} else if (!strcasecmp(v->name, "astagidir")) {

Modified: team/oej/metermaids/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/channels/chan_iax2.c?rev=11456&r1=11455&r2=11456&view=diff
==============================================================================
--- team/oej/metermaids/channels/chan_iax2.c (original)
+++ team/oej/metermaids/channels/chan_iax2.c Tue Feb 28 15:15:23 2006
@@ -1960,7 +1960,7 @@
 		ast_cli(fd, "  Status       : ");
 		peer_status(peer, status, sizeof(status));	
 		ast_cli(fd, "%s\n",status);
-		ast_cli(fd, "  Qualify      : every %d when OK, every %d when UNREACHABLE (sample smoothing %s)\n", peer->pokefreqok, peer->pokefreqnotok, (peer->smoothing == 1) ? "On" : "Off");
+		ast_cli(fd, " Qualify        : every %dms when OK, every %dms when UNREACHABLE (sample smoothing %s)\n", peer->pokefreqok, peer->pokefreqnotok, peer->smoothing ? "On" : "Off");
 		ast_cli(fd,"\n");
 		if (ast_test_flag(peer, IAX_TEMPONLY))
 			destroy_peer(peer);