[svn-commits] branch oej/managerstuff r24217 - in
/team/oej/managerstuff: ./ apps/ cdr/ cha...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Tue May 2 10:42:17 MST 2006
Author: oej
Date: Tue May 2 12:42:16 2006
New Revision: 24217
URL: http://svn.digium.com/view/asterisk?rev=24217&view=rev
Log:
Reset, resolve go - conflicts in untouched files
Modified:
team/oej/managerstuff/ (props changed)
team/oej/managerstuff/Makefile
team/oej/managerstuff/apps/Makefile
team/oej/managerstuff/apps/app_externalivr.c
team/oej/managerstuff/apps/app_festival.c
team/oej/managerstuff/apps/app_ices.c
team/oej/managerstuff/apps/app_mp3.c
team/oej/managerstuff/apps/app_nbscat.c
team/oej/managerstuff/apps/app_privacy.c
team/oej/managerstuff/apps/app_queue.c
team/oej/managerstuff/apps/app_skel.c
team/oej/managerstuff/apps/app_voicemail.c
team/oej/managerstuff/apps/app_zapras.c
team/oej/managerstuff/asterisk.c
team/oej/managerstuff/cdr/Makefile
team/oej/managerstuff/cdr/cdr_sqlite.c
team/oej/managerstuff/channels/Makefile
team/oej/managerstuff/channels/chan_iax2.c
team/oej/managerstuff/channels/chan_zap.c
team/oej/managerstuff/configs/mgcp.conf.sample
team/oej/managerstuff/configs/sip.conf.sample
team/oej/managerstuff/configs/zapata.conf.sample
team/oej/managerstuff/db1-ast/Makefile
team/oej/managerstuff/editline/configure
team/oej/managerstuff/editline/makelist
team/oej/managerstuff/include/asterisk/options.h
team/oej/managerstuff/pbx.c
team/oej/managerstuff/res/res_musiconhold.c
Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
automerge = http://edvina.net/training/
Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue May 2 12:42:16 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7496,7498-22119
+/branches/1.2:1-7496,7498-24215
Modified: team/oej/managerstuff/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/Makefile?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/Makefile (original)
+++ team/oej/managerstuff/Makefile Tue May 2 12:42:16 2006
@@ -186,7 +186,6 @@
# You must have GCC 3.4 to use k8, otherwise use athlon
PROC=k8
#PROC=athlon
- OPTIONS+=-m64
endif
ifeq ($(PROC),sparc64)
@@ -207,9 +206,9 @@
OPTIONS+=-fsigned-char -mcpu=ep9312
else
ifeq ($(SUB_PROC),xscale)
- OPTIONS+=-fsigned-char -msoft-float -mcpu=xscale
+ OPTIONS+=-fsigned-char -mcpu=xscale
else
- OPTIONS+=-fsigned-char -msoft-float
+ OPTIONS+=-fsigned-char
endif
endif
endif
@@ -440,10 +439,10 @@
noclean: depend asterisk subdirs
editline/config.h:
- cd editline && unset CFLAGS LIBS && ./configure ; \
+ cd editline && unset CFLAGS LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
editline/libedit.a: FORCE
- cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
+ cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
$(MAKE) -C editline libedit.a
db1-ast/libdb1.a: FORCE
@@ -648,7 +647,6 @@
cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
fi
- for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
if [ -n "$(OLDHEADERS)" ]; then \
@@ -673,28 +671,9 @@
echo "You need to do cvs update -d not just cvs update" ; \
fi
if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
- @echo " +---- Asterisk Installation Complete -------+"
- @echo " + +"
- @echo " + YOU MUST READ THE SECURITY DOCUMENT +"
- @echo " + +"
- @echo " + Asterisk has successfully been installed. +"
- @echo " + If you would like to install the sample +"
- @echo " + configuration files (overwriting any +"
- @echo " + existing config files), run: +"
- @echo " + +"
- @echo " + $(MAKE) samples +"
- @echo " + +"
- @echo " +----------------- or ---------------------+"
- @echo " + +"
- @echo " + You can go ahead and install the asterisk +"
- @echo " + program documentation now or later run: +"
- @echo " + +"
- @echo " + $(MAKE) progdocs +"
- @echo " + +"
- @echo " + **Note** This requires that you have +"
- @echo " + doxygen installed on your local system +"
- @echo " +-------------------------------------------+"
- @$(MAKE) -s oldmodcheck
+
+install-subdirs:
+ for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
NEWMODS=$(notdir $(wildcard */*.so))
OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
@@ -717,10 +696,32 @@
echo " WARNING WARNING WARNING" ;\
fi
-install: all datafiles bininstall
+install: all datafiles bininstall install-subdirs
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
fi
+ @echo " +---- Asterisk Installation Complete -------+"
+ @echo " + +"
+ @echo " + YOU MUST READ THE SECURITY DOCUMENT +"
+ @echo " + +"
+ @echo " + Asterisk has successfully been installed. +"
+ @echo " + If you would like to install the sample +"
+ @echo " + configuration files (overwriting any +"
+ @echo " + existing config files), run: +"
+ @echo " + +"
+ @echo " + $(MAKE) samples +"
+ @echo " + +"
+ @echo " +----------------- or ---------------------+"
+ @echo " + +"
+ @echo " + You can go ahead and install the asterisk +"
+ @echo " + program documentation now or later run: +"
+ @echo " + +"
+ @echo " + $(MAKE) progdocs +"
+ @echo " + +"
+ @echo " + **Note** This requires that you have +"
+ @echo " + doxygen installed on your local system +"
+ @echo " +-------------------------------------------+"
+ @$(MAKE) -s oldmodcheck
upgrade: all bininstall
Modified: team/oej/managerstuff/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/apps/Makefile?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/apps/Makefile (original)
+++ team/oej/managerstuff/apps/Makefile Tue May 2 12:42:16 2006
@@ -81,7 +81,7 @@
all: $(APPS)
clean:
- rm -f *.so *.o look .depend
+ rm -f *.so *.o .depend
%.so : %.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
@@ -107,9 +107,6 @@
app_sql_odbc.so: app_sql_odbc.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc
-look: look.c
- $(CC) -pipe -O6 -g look.c -o look -lncurses
-
ifeq (SunOS,$(shell uname))
app_chanspy.so: app_chanspy.o
$(CC) $(SOLINK) -o $@ $< -lrt
Modified: team/oej/managerstuff/apps/app_externalivr.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/apps/app_externalivr.c?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/apps/app_externalivr.c (original)
+++ team/oej/managerstuff/apps/app_externalivr.c Tue May 2 12:42:16 2006
@@ -49,6 +49,7 @@
#include "asterisk/module.h"
#include "asterisk/linkedlists.h"
#include "asterisk/app.h"
+#include "asterisk/options.h"
static const char *tdesc = "External IVR Interface Application";
@@ -317,6 +318,9 @@
if (!pid) {
/* child process */
int i;
+
+ if (option_highpriority)
+ ast_set_priority(0);
dup2(child_stdin[0], STDIN_FILENO);
dup2(child_stdout[1], STDOUT_FILENO);
Modified: team/oej/managerstuff/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/apps/app_festival.c?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/apps/app_festival.c (original)
+++ team/oej/managerstuff/apps/app_festival.c Tue May 2 12:42:16 2006
@@ -55,6 +55,7 @@
#include "asterisk/config.h"
#include "asterisk/utils.h"
#include "asterisk/lock.h"
+#include "asterisk/options.h"
#define FESTIVAL_CONFIG "festival.conf"
@@ -138,6 +139,9 @@
if (x != fd)
close(x);
}
+ if (option_highpriority)
+ ast_set_priority(0);
+
/*IAS */
#ifdef __PPC__
for( x=0; x<length; x+=2)
Modified: team/oej/managerstuff/apps/app_ices.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/apps/app_ices.c?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/apps/app_ices.c (original)
+++ team/oej/managerstuff/apps/app_ices.c Tue May 2 12:42:16 2006
@@ -46,6 +46,7 @@
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/translate.h"
+#include "asterisk/options.h"
#define ICES "/usr/bin/ices"
#define LOCAL_ICES "/usr/local/bin/ices"
@@ -74,6 +75,8 @@
ast_log(LOG_WARNING, "Fork failed\n");
if (res)
return res;
+ if (option_highpriority)
+ ast_set_priority(0);
dup2(fd, STDIN_FILENO);
for (x=STDERR_FILENO + 1;x<256;x++) {
if ((x != STDIN_FILENO) && (x != STDOUT_FILENO))
Modified: team/oej/managerstuff/apps/app_mp3.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/apps/app_mp3.c?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/apps/app_mp3.c (original)
+++ team/oej/managerstuff/apps/app_mp3.c Tue May 2 12:42:16 2006
@@ -45,6 +45,7 @@
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/translate.h"
+#include "asterisk/options.h"
#define LOCAL_MPG_123 "/usr/local/bin/mpg123"
#define MPG_123 "/usr/bin/mpg123"
@@ -73,6 +74,8 @@
ast_log(LOG_WARNING, "Fork failed\n");
if (res)
return res;
+ if (option_highpriority)
+ ast_set_priority(0);
dup2(fd, STDOUT_FILENO);
for (x=0;x<256;x++) {
if (x != STDOUT_FILENO)
Modified: team/oej/managerstuff/apps/app_nbscat.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/apps/app_nbscat.c?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/apps/app_nbscat.c (original)
+++ team/oej/managerstuff/apps/app_nbscat.c Tue May 2 12:42:16 2006
@@ -46,6 +46,7 @@
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/translate.h"
+#include "asterisk/options.h"
#define LOCAL_NBSCAT "/usr/local/bin/nbscat8k"
#define NBSCAT "/usr/bin/nbscat8k"
@@ -77,6 +78,9 @@
ast_log(LOG_WARNING, "Fork failed\n");
if (res)
return res;
+ if (option_highpriority)
+ ast_set_priority(0);
+
dup2(fd, STDOUT_FILENO);
for (x=0;x<256;x++) {
if (x != STDOUT_FILENO)
Modified: team/oej/managerstuff/apps/app_privacy.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/apps/app_privacy.c?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/apps/app_privacy.c (original)
+++ team/oej/managerstuff/apps/app_privacy.c Tue May 2 12:42:16 2006
@@ -195,13 +195,21 @@
}
/*Got a number, play sounds and send them on their way*/
- if ((retries < maxretries) && !res ) {
+ if ((retries < maxretries) && res >= 0 ) {
res = ast_streamfile(chan, "privacy-thankyou", chan->language);
if (!res)
res = ast_waitstream(chan, "");
- ast_set_callerid (chan, phone, "Privacy Manager", NULL);
- if (option_verbose > 2)
- ast_verbose (VERBOSE_PREFIX_3 "Changed Caller*ID to %s\n",phone);
+
+ ast_set_callerid (chan, phone, "Privacy Manager", NULL);
+
+ /* Clear the unavailable presence bit so if it came in on PRI
+ * the caller id will now be passed out to other channels
+ */
+ chan->cid.cid_pres &= (AST_PRES_UNAVAILABLE ^ 0xFF);
+
+ if (option_verbose > 2) {
+ ast_verbose (VERBOSE_PREFIX_3 "Changed Caller*ID to %s, callerpres to %d\n",phone,chan->cid.cid_pres);
+ }
pbx_builtin_setvar_helper(chan, "PRIVACYMGRSTATUS", "SUCCESS");
} else {
if (priority_jump || ast_opt_priority_jumping)
Modified: team/oej/managerstuff/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/apps/app_queue.c?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/apps/app_queue.c (original)
+++ team/oej/managerstuff/apps/app_queue.c Tue May 2 12:42:16 2006
@@ -2915,8 +2915,8 @@
qe.start = time(NULL);
/* set the expire time based on the supplied timeout; */
- if (args.queuetimeoutstr)
- qe.expire = qe.start + atoi(args.queuetimeoutstr);
+ if (!ast_strlen_zero(queuetimeoutstr))
+ qe.expire = qe.start + atoi(queuetimeoutstr);
else
qe.expire = 0;
Modified: team/oej/managerstuff/apps/app_skel.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/apps/app_skel.c?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/apps/app_skel.c (original)
+++ team/oej/managerstuff/apps/app_skel.c Tue May 2 12:42:16 2006
@@ -55,7 +55,7 @@
#define OPTION_C (1 << 2) /* Option C(str) */
#define OPTION_NULL (1 << 3) /* Dummy Termination */
-AST_DECLARE_OPTIONS(app_opts,{
+AST_APP_OPTIONS(app_opts,{
['a'] = { OPTION_A },
['b'] = { OPTION_B, 1 },
['c'] = { OPTION_C, 2 }
@@ -97,7 +97,7 @@
if ((argc = ast_app_separate_args(args, '|', argv, sizeof(argv) / sizeof(argv[0])))) {
dummy = argv[0];
options = argv[1];
- ast_parseoptions(app_opts, &flags, opts, options);
+ ast_app_parse_options(app_opts, &flags, opts, options);
}
if (!ast_strlen_zero(dummy))
Modified: team/oej/managerstuff/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/apps/app_voicemail.c?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/apps/app_voicemail.c (original)
+++ team/oej/managerstuff/apps/app_voicemail.c Tue May 2 12:42:16 2006
@@ -2570,9 +2570,14 @@
ast_log(LOG_WARNING, "Error opening text file for output\n");
res = play_record_review(chan, NULL, fn, vmmaxmessage, fmt, 1, vmu, &duration, dir, options->record_gain);
if (res == '0') {
- if (txt) {
+ if (txt && EXISTS(dir,msgnum,fn,chan->language)) {
fclose(txt);
rename(tmptxtfile, txtfile);
+ } else if (txt && !EXISTS(dir,msgnum,fn,chan->language)) {
+ if (option_debug)
+ ast_log(LOG_DEBUG, "The recorded media file is gone, so we should remove the .txt file too!\n");
+ fclose(txt);
+ unlink(tmptxtfile);
}
goto transfer;
}
@@ -3433,8 +3438,8 @@
/* start optimistic */
valid_extensions = 1;
while (s) {
- /* find_user is going to ast_malloc since we have a NULL as first argument */
- if ((receiver = find_user(NULL, context, s))) {
+ /* Don't forward to ourselves. find_user is going to malloc since we have a NULL as first argument */
+ if (strcmp(s,sender->mailbox) && (receiver = find_user(NULL, context, s))) {
if (!extensions)
vmtmp = extensions = receiver;
else {
Modified: team/oej/managerstuff/apps/app_zapras.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/apps/app_zapras.c?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/apps/app_zapras.c (original)
+++ team/oej/managerstuff/apps/app_zapras.c Tue May 2 12:42:16 2006
@@ -97,6 +97,10 @@
/* Execute RAS on File handles */
dup2(chan->fds[0], STDIN_FILENO);
+
+ /* Drop high priority */
+ if (option_highpriority)
+ ast_set_priority(0);
/* Close other file descriptors */
for (x=STDERR_FILENO + 1;x<1024;x++)
Modified: team/oej/managerstuff/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/asterisk.c?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/asterisk.c (original)
+++ team/oej/managerstuff/asterisk.c Tue May 2 12:42:16 2006
@@ -426,6 +426,8 @@
pid = fork();
if (pid == 0) {
+ if (option_highpriority)
+ ast_set_priority(0);
/* Close file descriptors and launch system command */
for (x = STDERR_FILENO + 1; x < 4096; x++)
close(x);
Modified: team/oej/managerstuff/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/cdr/Makefile?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/cdr/Makefile (original)
+++ team/oej/managerstuff/cdr/Makefile Tue May 2 12:42:16 2006
@@ -32,7 +32,7 @@
#the default as we now have a better instruction set to work with. - Belgarath
ifeq ($(PROC),sparc64)
PROC=ultrasparc
- CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+ CFLAGS += -mtune=$(PROC) -pipe -fomit-frame-pointer -mcpu=v8
endif
#
Modified: team/oej/managerstuff/cdr/cdr_sqlite.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/cdr/cdr_sqlite.c?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/cdr/cdr_sqlite.c (original)
+++ team/oej/managerstuff/cdr/cdr_sqlite.c Tue May 2 12:42:16 2006
@@ -33,6 +33,7 @@
#include <sys/types.h>
+#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
Modified: team/oej/managerstuff/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/channels/Makefile?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/channels/Makefile (original)
+++ team/oej/managerstuff/channels/Makefile Tue May 2 12:42:16 2006
@@ -39,7 +39,7 @@
ifeq ($(PROC),sparc64)
PROC=ultrasparc
- CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+ CFLAGS += -mtune=$(PROC) -pipe -fomit-frame-pointer -mcpu=v8
endif
ifeq (${OSARCH},FreeBSD)
Modified: team/oej/managerstuff/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/channels/chan_iax2.c?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/channels/chan_iax2.c (original)
+++ team/oej/managerstuff/channels/chan_iax2.c Tue May 2 12:42:16 2006
@@ -4816,10 +4816,10 @@
}
ast_mutex_unlock(&userl.lock);
user = best;
- if (!user && !ast_strlen_zero(iaxs[callno]->username) && (strlen(iaxs[callno]->username) < 128)) {
+ if (!user && !ast_strlen_zero(iaxs[callno]->username)) {
user = realtime_user(iaxs[callno]->username);
if (user && !ast_strlen_zero(iaxs[callno]->context) && /* No context specified */
- !apply_context(user->contexts, iaxs[callno]->context)) { /* Context is permitted */
+ !apply_context(user->contexts, iaxs[callno]->context)) { /* Context is permitted */
destroy_user(user);
user = NULL;
}
Modified: team/oej/managerstuff/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/channels/chan_zap.c?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/channels/chan_zap.c (original)
+++ team/oej/managerstuff/channels/chan_zap.c Tue May 2 12:42:16 2006
@@ -9175,7 +9175,7 @@
ast_log(LOG_WARNING, "Received SETUP_ACKNOWLEDGE on unconfigured channel %d/%d span %d\n",
PRI_SPAN(e->setup_ack.channel), PRI_CHANNEL(e->setup_ack.channel), pri->span);
} else {
- chanpos = pri_fixup_principle(pri, chanpos, e->ring.call);
+ chanpos = pri_fixup_principle(pri, chanpos, e->setup_ack.call);
if (chanpos > -1) {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
pri->pvts[chanpos]->setup_ack = 1;
Modified: team/oej/managerstuff/configs/mgcp.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/configs/mgcp.conf.sample?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/configs/mgcp.conf.sample (original)
+++ team/oej/managerstuff/configs/mgcp.conf.sample Tue May 2 12:42:16 2006
@@ -27,8 +27,8 @@
;context=local
;host=192.168.1.20
;callerid = "John Doe" <123>
-;callgroup=0
-;pickupgroup=0
+;callgroup=0 ; in the range from 0 to 63
+;pickupgroup=0 ; in the range from 0 to 63
;nat=no
;threewaycalling=yes
;transfer=yes ; transfer requires threewaycalling=yes. Use FLASH to transfer
Modified: team/oej/managerstuff/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/configs/sip.conf.sample?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/configs/sip.conf.sample (original)
+++ team/oej/managerstuff/configs/sip.conf.sample Tue May 2 12:42:16 2006
@@ -425,6 +425,9 @@
;qualify=1000 ; Consider it down if it's 1 second to reply
; Helps with NAT session
; qualify=yes uses default value
+;
+; Call group and Pickup group should be in the range from 0 to 63
+;
;callgroup=1,3-4 ; We are in caller groups 1,3,4
;pickupgroup=1,3-5 ; We can do call pick-p for call group 1,3,4,5
;defaultip=192.168.0.60 ; IP address to use if peer has not registred
Modified: team/oej/managerstuff/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/configs/zapata.conf.sample?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/configs/zapata.conf.sample (original)
+++ team/oej/managerstuff/configs/zapata.conf.sample Tue May 2 12:42:16 2006
@@ -342,7 +342,7 @@
; Ring groups (a.k.a. call groups) and pickup groups. If a phone is ringing
; and it is a member of a group which is one of your pickup groups, then
; you can answer it by picking up and dialing *8#. For simple offices, just
-; make these both the same
+; make these both the same. Groups range from 0 to 63.
;
callgroup=1
pickupgroup=1
Modified: team/oej/managerstuff/db1-ast/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/db1-ast/Makefile?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/db1-ast/Makefile (original)
+++ team/oej/managerstuff/db1-ast/Makefile Tue May 2 12:42:16 2006
@@ -10,7 +10,7 @@
#Added support for UltraSparc - Belgarath
ifeq ($(ARCH),sparc64)
PROC=ultrasparc
-CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+CFLAGS += -mtune=$(PROC) -pipe -fomit-frame-pointer -mcpu=v8
endif
LIBDBSO=libdb.so.$(SOVER)
Modified: team/oej/managerstuff/editline/configure
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/editline/configure?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/editline/configure (original)
+++ team/oej/managerstuff/editline/configure Tue May 2 12:42:16 2006
@@ -1923,8 +1923,6 @@
if test "x$enable_debug" = "xyes" ; then
CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG"
CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE"
-else
- CFLAGS="$CFLAGS -O"
fi
Modified: team/oej/managerstuff/editline/makelist
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/editline/makelist?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/editline/makelist (original)
+++ team/oej/managerstuff/editline/makelist Tue May 2 12:42:16 2006
@@ -145,7 +145,7 @@
#
-fh)
cat $FILES | $AWK '/el_action_t/ { print $3 }' | \
- sort | tr '[a-z]' '[A-Z]' | $AWK '
+ sort | tr '[:lower:]' '[:upper:]' | $AWK '
BEGIN {
printf("/* Automatically generated file, do not edit */\n");
printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n");
Modified: team/oej/managerstuff/include/asterisk/options.h
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/include/asterisk/options.h?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/include/asterisk/options.h (original)
+++ team/oej/managerstuff/include/asterisk/options.h Tue May 2 12:42:16 2006
@@ -97,6 +97,7 @@
extern int option_verbose;
extern int option_debug;
extern int option_maxcalls;
+extern int option_highpriority;
extern double option_maxload;
extern char defaultlanguage[];
Modified: team/oej/managerstuff/pbx.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/pbx.c?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/pbx.c (original)
+++ team/oej/managerstuff/pbx.c Tue May 2 12:42:16 2006
@@ -1123,6 +1123,7 @@
ast_cli(fd, "%s Custom Functions:\n--------------------------------------------------------------------------------\n", like ? "Matching" : "Installed");
+ ast_mutex_lock(&acflock);
for (acf = acf_root ; acf; acf = acf->next) {
print_acf = 0;
if (like) {
@@ -1139,9 +1140,8 @@
ast_cli(fd, "%-20.20s %-35.35s %s\n", acf->name, acf->syntax, acf->synopsis);
}
}
-
- ast_cli(fd, "%d %scustom functions installed.\n", count_acf, like ? "matching " : "");
-
+ ast_mutex_unlock(&acflock);
+ ast_cli(fd, "%d custom functions installed.\n", count_acf);
return 0;
}
Modified: team/oej/managerstuff/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/res/res_musiconhold.c?rev=24217&r1=24216&r2=24217&view=diff
==============================================================================
--- team/oej/managerstuff/res/res_musiconhold.c (original)
+++ team/oej/managerstuff/res/res_musiconhold.c Tue May 2 12:42:16 2006
@@ -441,6 +441,10 @@
}
if (!class->pid) {
int x;
+
+ if (option_highpriority)
+ ast_set_priority(0);
+
close(fds[0]);
/* Stdout goes to pipe */
dup2(fds[1], STDOUT_FILENO);
More information about the svn-commits
mailing list