kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Version 0.2.0 from FTP

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@483 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2002-07-11 16:49:29 +00:00
parent 54c89ccea9
commit 67751c3992
9 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
formats/format_g723.c
View File

@@ -325,7 +325,7 @@ int unload_module()
tmp = glist; tmp = glist;
while(tmp) { while(tmp) {
if (tmp->owner) if (tmp->owner)
ast_softhangup(tmp->owner); ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD);
tmpl = tmp; tmpl = tmp;
tmp = tmp->next; tmp = tmp->next;
free(tmpl); free(tmpl);

2
formats/format_gsm.c
View File

@@ -271,7 +271,7 @@ int unload_module()
tmp = glist; tmp = glist;
while(tmp) { while(tmp) {
if (tmp->owner) if (tmp->owner)
ast_softhangup(tmp->owner); ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD);
tmpl = tmp; tmpl = tmp;
tmp = tmp->next; tmp = tmp->next;
free(tmpl); free(tmpl);

2
formats/format_mp3.c
View File

@@ -269,7 +269,7 @@ int unload_module()
tmp = glist; tmp = glist;
while(tmp) { while(tmp) {
if (tmp->owner) if (tmp->owner)
ast_softhangup(tmp->owner); ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD);
tmpl = tmp; tmpl = tmp;
tmp = tmp->next; tmp = tmp->next;
free(tmpl); free(tmpl);

2
formats/format_pcm.c
View File

@@ -266,7 +266,7 @@ int unload_module()
tmp = glist; tmp = glist;
while(tmp) { while(tmp) {
if (tmp->owner) if (tmp->owner)
ast_softhangup(tmp->owner); ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD);
tmpl = tmp; tmpl = tmp;
tmp = tmp->next; tmp = tmp->next;
free(tmpl); free(tmpl);

2
formats/format_vox.c
View File

@@ -390,7 +390,7 @@ int unload_module()
tmp = glist; tmp = glist;
while(tmp) { while(tmp) {
if (tmp->owner) if (tmp->owner)
ast_softhangup(tmp->owner); ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD);
tmpl = tmp; tmpl = tmp;
tmp = tmp->next; tmp = tmp->next;
free(tmpl); free(tmpl);

2
formats/format_wav_gsm.c
View File

@@ -563,7 +563,7 @@ int unload_module()
tmp = glist; tmp = glist;
while(tmp) { while(tmp) {
if (tmp->owner) if (tmp->owner)
ast_softhangup(tmp->owner); ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD);
tmpl = tmp; tmpl = tmp;
tmp = tmp->next; tmp = tmp->next;
free(tmpl); free(tmpl);

2
include/asterisk/module.h
View File

@@ -194,7 +194,7 @@ void ast_module_reload(void);
pthread_mutex_lock(&localuser_lock); \ pthread_mutex_lock(&localuser_lock); \
u = localusers; \ u = localusers; \
while(u) { \ while(u) { \
ast_softhangup(u->chan); \ ast_softhangup(u->chan, AST_SOFTHANGUP_APPUNLOAD); \
ul = u; \ ul = u; \
u = u->next; \ u = u->next; \
free(ul); \ free(ul); \

5
loader.c
View File

@@ -22,6 +22,7 @@
#include <asterisk/logger.h> #include <asterisk/logger.h>
#include <asterisk/channel.h> #include <asterisk/channel.h>
#include <asterisk/term.h> #include <asterisk/term.h>
#include <asterisk/manager.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <asterisk/md5.h> #include <asterisk/md5.h>
#define __USE_GNU #define __USE_GNU
@@ -137,8 +138,8 @@ void ast_module_reload(void)
{ {
struct module *m; 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); ast_pthread_mutex_lock(&modlock);
m = module_list; m = module_list;

9
res/res_musiconhold.c
View File

@@ -100,8 +100,9 @@ static pthread_mutex_t moh_lock = AST_MUTEX_INITIALIZER;
static void child_handler(int sig) static void child_handler(int sig)
{ {
int status; int status;
if (wait4(-1,&status, WNOHANG, NULL)<1) if (wait4(-1,&status, WNOHANG, NULL)<1)
ast_log(LOG_NOTICE, "Huh? Child handler, but nobody there?\n"); if (option_debug)
ast_log(LOG_DEBUG, "Huh? Child handler, but nobody there?\n");
} }
static int spawn_mp3(struct mohclass *class) static int spawn_mp3(struct mohclass *class)
@@ -126,7 +127,9 @@ static int spawn_mp3(struct mohclass *class)
argv[3] = "--mono"; argv[3] = "--mono";
argv[4] = "-r"; argv[4] = "-r";
argv[5] = "8000"; argv[5] = "8000";
argc = 6; argv[6] = "-b";
argv[7] = "2048";
argc = 8;
if (class->quiet) { if (class->quiet) {
argv[argc++] = "-f"; argv[argc++] = "-f";
argv[argc++] = "8192"; argv[argc++] = "8192";