[asterisk-commits] branch oej/managerstuff r9523 - in
/team/oej/managerstuff: ./ apps/ channels/
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sat Feb 11 07:00:38 MST 2006
Author: oej
Date: Sat Feb 11 08:00:33 2006
New Revision: 9523
URL: http://svn.digium.com/view/asterisk?rev=9523&view=rev
Log:
Updates
Modified:
team/oej/managerstuff/ (props changed)
team/oej/managerstuff/apps/app_voicemail.c
team/oej/managerstuff/cdr.c
team/oej/managerstuff/channels/chan_mgcp.c
team/oej/managerstuff/channels/chan_sip.c
team/oej/managerstuff/devicestate.c
team/oej/managerstuff/dnsmgr.c
Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
automerge = kevin
Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Feb 11 08:00:33 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7496,7498-9278
+/branches/1.2:1-7496,7498-9521
Modified: team/oej/managerstuff/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/apps/app_voicemail.c?rev=9523&r1=9522&r2=9523&view=diff
==============================================================================
--- team/oej/managerstuff/apps/app_voicemail.c (original)
+++ team/oej/managerstuff/apps/app_voicemail.c Sat Feb 11 08:00:33 2006
@@ -77,8 +77,8 @@
#endif
#define COMMAND_TIMEOUT 5000
-#define VOICEMAIL_DIR_MODE 0770
-#define VOICEMAIL_FILE_MODE 0660
+#define VOICEMAIL_DIR_MODE 0700
+#define VOICEMAIL_FILE_MODE 0600
#define VOICEMAIL_CONFIG "voicemail.conf"
#define ASTERISK_USERNAME "asterisk"
Modified: team/oej/managerstuff/cdr.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/cdr.c?rev=9523&r1=9522&r2=9523&view=diff
==============================================================================
--- team/oej/managerstuff/cdr.c (original)
+++ team/oej/managerstuff/cdr.c Sat Feb 11 08:00:33 2006
@@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2006, Digium, Inc.
*
* Mark Spencer <markster at digium.com>
*
@@ -1180,8 +1180,6 @@
if it does not exist */
if (enabled && batchmode && (!was_enabled || !was_batchmode) && (cdr_thread == AST_PTHREADT_NULL)) {
ast_cond_init(&cdr_pending_cond, NULL);
- pthread_attr_init(&attr);
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (ast_pthread_create(&cdr_thread, &attr, do_cdr, NULL) < 0) {
ast_log(LOG_ERROR, "Unable to start CDR thread.\n");
ast_sched_del(sched, cdr_sched);
Modified: team/oej/managerstuff/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/channels/chan_mgcp.c?rev=9523&r1=9522&r2=9523&view=diff
==============================================================================
--- team/oej/managerstuff/channels/chan_mgcp.c (original)
+++ team/oej/managerstuff/channels/chan_mgcp.c Sat Feb 11 08:00:33 2006
@@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2006, Digium, Inc.
*
* Mark Spencer <markster at digium.com>
*
@@ -3469,10 +3469,6 @@
static int restart_monitor(void)
{
- pthread_attr_t attr;
- pthread_attr_init(&attr);
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-
/* If we're supposed to be stopped -- stay stopped */
if (monitor_thread == AST_PTHREADT_STOP)
return 0;
@@ -3490,7 +3486,7 @@
pthread_kill(monitor_thread, SIGURG);
} else {
/* Start a new monitor */
- if (ast_pthread_create(&monitor_thread, &attr, do_monitor, NULL) < 0) {
+ if (ast_pthread_create(&monitor_thread, NULL, do_monitor, NULL) < 0) {
ast_mutex_unlock(&monlock);
ast_log(LOG_ERROR, "Unable to start monitor thread.\n");
return -1;
Modified: team/oej/managerstuff/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/channels/chan_sip.c?rev=9523&r1=9522&r2=9523&view=diff
==============================================================================
--- team/oej/managerstuff/channels/chan_sip.c (original)
+++ team/oej/managerstuff/channels/chan_sip.c Sat Feb 11 08:00:33 2006
@@ -11458,10 +11458,8 @@
/* Wake up the thread */
pthread_kill(monitor_thread, SIGURG);
} else {
- pthread_attr_init(&attr);
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
/* Start a new monitor */
- if (ast_pthread_create(&monitor_thread, &attr, do_monitor, NULL) < 0) {
+ if (ast_pthread_create(&monitor_thread, NULL, do_monitor, NULL) < 0) {
ast_mutex_unlock(&monlock);
ast_log(LOG_ERROR, "Unable to start monitor thread.\n");
return -1;
Modified: team/oej/managerstuff/devicestate.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/devicestate.c?rev=9523&r1=9522&r2=9523&view=diff
==============================================================================
--- team/oej/managerstuff/devicestate.c (original)
+++ team/oej/managerstuff/devicestate.c Sat Feb 11 08:00:33 2006
@@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2006, Digium, Inc.
*
* Mark Spencer <markster at digium.com>
*
@@ -272,12 +272,8 @@
/*--- ast_device_state_engine_init: Initialize the device state engine in separate thread */
int ast_device_state_engine_init(void)
{
- pthread_attr_t attr;
-
ast_cond_init(&change_pending, NULL);
- pthread_attr_init(&attr);
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
- if (ast_pthread_create(&change_thread, &attr, do_devstate_changes, NULL) < 0) {
+ if (ast_pthread_create(&change_thread, NULL, do_devstate_changes, NULL) < 0) {
ast_log(LOG_ERROR, "Unable to start device state change thread.\n");
return -1;
}
Modified: team/oej/managerstuff/dnsmgr.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/dnsmgr.c?rev=9523&r1=9522&r2=9523&view=diff
==============================================================================
--- team/oej/managerstuff/dnsmgr.c (original)
+++ team/oej/managerstuff/dnsmgr.c Sat Feb 11 08:00:33 2006
@@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
- * Copyright (C) 2005, Kevin P. Fleming
+ * Copyright (C) 2005-2006, Kevin P. Fleming
*
* Kevin P. Fleming <kpfleming at digium.com>
*
@@ -343,9 +343,7 @@
/* if this reload enabled the manager, create the background thread
if it does not exist */
if (enabled && !was_enabled && (refresh_thread == AST_PTHREADT_NULL)) {
- pthread_attr_init(&attr);
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
- if (ast_pthread_create(&refresh_thread, &attr, do_refresh, NULL) < 0) {
+ if (ast_pthread_create(&refresh_thread, NULL, do_refresh, NULL) < 0) {
ast_log(LOG_ERROR, "Unable to start refresh thread.\n");
}
else {
More information about the asterisk-commits
mailing list