Version 0.2.0 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@483 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
4a875ab9b7
commit
12fd7ca3bb
|
@ -325,7 +325,7 @@ int unload_module()
|
|||
tmp = glist;
|
||||
while(tmp) {
|
||||
if (tmp->owner)
|
||||
ast_softhangup(tmp->owner);
|
||||
ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD);
|
||||
tmpl = tmp;
|
||||
tmp = tmp->next;
|
||||
free(tmpl);
|
||||
|
|
|
@ -271,7 +271,7 @@ int unload_module()
|
|||
tmp = glist;
|
||||
while(tmp) {
|
||||
if (tmp->owner)
|
||||
ast_softhangup(tmp->owner);
|
||||
ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD);
|
||||
tmpl = tmp;
|
||||
tmp = tmp->next;
|
||||
free(tmpl);
|
||||
|
|
|
@ -269,7 +269,7 @@ int unload_module()
|
|||
tmp = glist;
|
||||
while(tmp) {
|
||||
if (tmp->owner)
|
||||
ast_softhangup(tmp->owner);
|
||||
ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD);
|
||||
tmpl = tmp;
|
||||
tmp = tmp->next;
|
||||
free(tmpl);
|
||||
|
|
|
@ -266,7 +266,7 @@ int unload_module()
|
|||
tmp = glist;
|
||||
while(tmp) {
|
||||
if (tmp->owner)
|
||||
ast_softhangup(tmp->owner);
|
||||
ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD);
|
||||
tmpl = tmp;
|
||||
tmp = tmp->next;
|
||||
free(tmpl);
|
||||
|
|
|
@ -390,7 +390,7 @@ int unload_module()
|
|||
tmp = glist;
|
||||
while(tmp) {
|
||||
if (tmp->owner)
|
||||
ast_softhangup(tmp->owner);
|
||||
ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD);
|
||||
tmpl = tmp;
|
||||
tmp = tmp->next;
|
||||
free(tmpl);
|
||||
|
|
|
@ -563,7 +563,7 @@ int unload_module()
|
|||
tmp = glist;
|
||||
while(tmp) {
|
||||
if (tmp->owner)
|
||||
ast_softhangup(tmp->owner);
|
||||
ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD);
|
||||
tmpl = tmp;
|
||||
tmp = tmp->next;
|
||||
free(tmpl);
|
||||
|
|
|
@ -194,7 +194,7 @@ void ast_module_reload(void);
|
|||
pthread_mutex_lock(&localuser_lock); \
|
||||
u = localusers; \
|
||||
while(u) { \
|
||||
ast_softhangup(u->chan); \
|
||||
ast_softhangup(u->chan, AST_SOFTHANGUP_APPUNLOAD); \
|
||||
ul = u; \
|
||||
u = u->next; \
|
||||
free(ul); \
|
||||
|
|
5
loader.c
5
loader.c
|
@ -22,6 +22,7 @@
|
|||
#include <asterisk/logger.h>
|
||||
#include <asterisk/channel.h>
|
||||
#include <asterisk/term.h>
|
||||
#include <asterisk/manager.h>
|
||||
#include <dlfcn.h>
|
||||
#include <asterisk/md5.h>
|
||||
#define __USE_GNU
|
||||
|
@ -137,8 +138,8 @@ void ast_module_reload(void)
|
|||
{
|
||||
struct module *m;
|
||||
|
||||
/* We'll do the logger the favor of calling its reload here first */
|
||||
|
||||
/* We'll do the logger and manager the favor of calling its reload here first */
|
||||
reload_manager();
|
||||
|
||||
ast_pthread_mutex_lock(&modlock);
|
||||
m = module_list;
|
||||
|
|
|
@ -100,8 +100,9 @@ static pthread_mutex_t moh_lock = AST_MUTEX_INITIALIZER;
|
|||
static void child_handler(int sig)
|
||||
{
|
||||
int status;
|
||||
if (wait4(-1,&status, WNOHANG, NULL)<1)
|
||||
ast_log(LOG_NOTICE, "Huh? Child handler, but nobody there?\n");
|
||||
if (wait4(-1,&status, WNOHANG, NULL)<1)
|
||||
if (option_debug)
|
||||
ast_log(LOG_DEBUG, "Huh? Child handler, but nobody there?\n");
|
||||
}
|
||||
|
||||
static int spawn_mp3(struct mohclass *class)
|
||||
|
@ -126,7 +127,9 @@ static int spawn_mp3(struct mohclass *class)
|
|||
argv[3] = "--mono";
|
||||
argv[4] = "-r";
|
||||
argv[5] = "8000";
|
||||
argc = 6;
|
||||
argv[6] = "-b";
|
||||
argv[7] = "2048";
|
||||
argc = 8;
|
||||
if (class->quiet) {
|
||||
argv[argc++] = "-f";
|
||||
argv[argc++] = "8192";
|
||||
|
|
Reference in New Issue