[asterisk-commits] branch oej/res_auth r17414 - in
/team/oej/res_auth: ./ apps/ channels/ channe...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue Apr 4 12:43:47 MST 2006
Author: oej
Date: Tue Apr 4 14:42:21 2006
New Revision: 17414
URL: http://svn.digium.com/view/asterisk?rev=17414&view=rev
Log:
Reset automerge
Added:
team/oej/res_auth/doc/ajam.txt
- copied unchanged from r17404, trunk/doc/ajam.txt
team/oej/res_auth/doc/ip-tos.txt
- copied unchanged from r17404, trunk/doc/ip-tos.txt
team/oej/res_auth/static-http/
- copied from r17404, trunk/static-http/
team/oej/res_auth/static-http/ajamdemo.html
- copied unchanged from r17404, trunk/static-http/ajamdemo.html
team/oej/res_auth/static-http/astman.css
- copied unchanged from r17404, trunk/static-http/astman.css
team/oej/res_auth/static-http/astman.js
- copied unchanged from r17404, trunk/static-http/astman.js
team/oej/res_auth/static-http/prototype.js
- copied unchanged from r17404, trunk/static-http/prototype.js
Removed:
team/oej/res_auth/formats/format_au.c
team/oej/res_auth/formats/format_pcm_alaw.c
Modified:
team/oej/res_auth/ (props changed)
team/oej/res_auth/.cleancount
team/oej/res_auth/CREDITS
team/oej/res_auth/Makefile
team/oej/res_auth/README
team/oej/res_auth/acl.c
team/oej/res_auth/app.c
team/oej/res_auth/apps/app_alarmreceiver.c
team/oej/res_auth/apps/app_channelredirect.c
team/oej/res_auth/apps/app_dial.c
team/oej/res_auth/apps/app_echo.c
team/oej/res_auth/apps/app_exec.c
team/oej/res_auth/apps/app_macro.c
team/oej/res_auth/apps/app_meetme.c
team/oej/res_auth/apps/app_milliwatt.c
team/oej/res_auth/apps/app_page.c
team/oej/res_auth/apps/app_queue.c
team/oej/res_auth/apps/app_rpt.c
team/oej/res_auth/apps/app_senddtmf.c
team/oej/res_auth/apps/app_sms.c
team/oej/res_auth/apps/app_stack.c
team/oej/res_auth/apps/app_voicemail.c
team/oej/res_auth/apps/app_while.c
team/oej/res_auth/asterisk.8
team/oej/res_auth/asterisk.c
team/oej/res_auth/asterisk.sgml
team/oej/res_auth/callerid.c
team/oej/res_auth/channel.c
team/oej/res_auth/channels/chan_agent.c
team/oej/res_auth/channels/chan_h323.c
team/oej/res_auth/channels/chan_iax2.c
team/oej/res_auth/channels/chan_local.c
team/oej/res_auth/channels/chan_misdn.c
team/oej/res_auth/channels/chan_oss.c
team/oej/res_auth/channels/chan_sip.c
team/oej/res_auth/channels/chan_zap.c
team/oej/res_auth/channels/h323/ast_h323.cpp
team/oej/res_auth/channels/iax2-provision.c
team/oej/res_auth/channels/iax2-provision.h
team/oej/res_auth/channels/misdn/Makefile
team/oej/res_auth/channels/misdn/isdn_lib.c
team/oej/res_auth/channels/misdn/isdn_lib.h
team/oej/res_auth/channels/misdn/isdn_msg_parser.c
team/oej/res_auth/cli.c
team/oej/res_auth/codecs/codec_a_mu.c
team/oej/res_auth/codecs/codec_adpcm.c
team/oej/res_auth/codecs/codec_alaw.c
team/oej/res_auth/codecs/codec_g723_1.c
team/oej/res_auth/codecs/codec_g726.c
team/oej/res_auth/codecs/codec_gsm.c
team/oej/res_auth/codecs/codec_ilbc.c
team/oej/res_auth/codecs/codec_lpc10.c
team/oej/res_auth/codecs/codec_speex.c
team/oej/res_auth/codecs/codec_ulaw.c
team/oej/res_auth/codecs/gsm/Makefile
team/oej/res_auth/configs/extensions.conf.sample
team/oej/res_auth/configs/features.conf.sample
team/oej/res_auth/configs/http.conf.sample
team/oej/res_auth/configs/iax.conf.sample
team/oej/res_auth/configs/iaxprov.conf.sample
team/oej/res_auth/configs/manager.conf.sample
team/oej/res_auth/configs/oss.conf.sample
team/oej/res_auth/configs/queues.conf.sample
team/oej/res_auth/configs/sip.conf.sample
team/oej/res_auth/configs/skinny.conf.sample
team/oej/res_auth/contrib/init.d/rc.redhat.asterisk
team/oej/res_auth/devicestate.c
team/oej/res_auth/doc/00README.1st
team/oej/res_auth/doc/CODING-GUIDELINES
team/oej/res_auth/doc/asterisk-conf.txt
team/oej/res_auth/doc/manager.txt
team/oej/res_auth/file.c
team/oej/res_auth/formats/Makefile
team/oej/res_auth/formats/format_g723.c
team/oej/res_auth/formats/format_g726.c
team/oej/res_auth/formats/format_g729.c
team/oej/res_auth/formats/format_gsm.c
team/oej/res_auth/formats/format_h263.c
team/oej/res_auth/formats/format_h264.c
team/oej/res_auth/formats/format_ilbc.c
team/oej/res_auth/formats/format_ogg_vorbis.c
team/oej/res_auth/formats/format_pcm.c
team/oej/res_auth/formats/format_sln.c
team/oej/res_auth/formats/format_vox.c
team/oej/res_auth/formats/format_wav.c
team/oej/res_auth/formats/format_wav_gsm.c
team/oej/res_auth/http.c
team/oej/res_auth/include/asterisk.h
team/oej/res_auth/include/asterisk/acl.h
team/oej/res_auth/include/asterisk/adsi.h
team/oej/res_auth/include/asterisk/app.h
team/oej/res_auth/include/asterisk/callerid.h
team/oej/res_auth/include/asterisk/channel.h
team/oej/res_auth/include/asterisk/cli.h
team/oej/res_auth/include/asterisk/crypto.h
team/oej/res_auth/include/asterisk/dns.h
team/oej/res_auth/include/asterisk/doxyref.h
team/oej/res_auth/include/asterisk/enum.h
team/oej/res_auth/include/asterisk/features.h
team/oej/res_auth/include/asterisk/file.h
team/oej/res_auth/include/asterisk/frame.h
team/oej/res_auth/include/asterisk/fskmodem.h
team/oej/res_auth/include/asterisk/http.h
team/oej/res_auth/include/asterisk/image.h
team/oej/res_auth/include/asterisk/indications.h
team/oej/res_auth/include/asterisk/io.h
team/oej/res_auth/include/asterisk/linkedlists.h
team/oej/res_auth/include/asterisk/localtime.h
team/oej/res_auth/include/asterisk/lock.h
team/oej/res_auth/include/asterisk/logger.h
team/oej/res_auth/include/asterisk/manager.h
team/oej/res_auth/include/asterisk/module.h
team/oej/res_auth/include/asterisk/musiconhold.h
team/oej/res_auth/include/asterisk/options.h
team/oej/res_auth/include/asterisk/pbx.h
team/oej/res_auth/include/asterisk/plc.h
team/oej/res_auth/include/asterisk/rtp.h
team/oej/res_auth/include/asterisk/sched.h
team/oej/res_auth/include/asterisk/tdd.h
team/oej/res_auth/include/asterisk/term.h
team/oej/res_auth/include/solaris-compat/compat.h
team/oej/res_auth/indications.c
team/oej/res_auth/loader.c
team/oej/res_auth/manager.c
team/oej/res_auth/pbx.c
team/oej/res_auth/pbx/pbx_ael.c
team/oej/res_auth/pbx/pbx_config.c
team/oej/res_auth/pbx/pbx_dundi.c
team/oej/res_auth/pbx/pbx_loopback.c
team/oej/res_auth/pbx/pbx_realtime.c
team/oej/res_auth/plc.c
team/oej/res_auth/res/res_agi.c
team/oej/res_auth/res/res_clioriginate.c
team/oej/res_auth/res/res_features.c
team/oej/res_auth/res/res_indications.c
team/oej/res_auth/res/res_musiconhold.c
team/oej/res_auth/res/res_smdi.c
team/oej/res_auth/res/snmp/agent.c
team/oej/res_auth/rtp.c
team/oej/res_auth/slinfactory.c
team/oej/res_auth/strcompat.c
team/oej/res_auth/translate.c
team/oej/res_auth/utils.c
team/oej/res_auth/utils/astman.c
Propchange: team/oej/res_auth/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/oej/res_auth/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/res_auth/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr 4 14:42:21 2006
@@ -1,1 +1,1 @@
-/trunk:1-15362
+/trunk:1-17410
Modified: team/oej/res_auth/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/.cleancount?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/.cleancount (original)
+++ team/oej/res_auth/.cleancount Tue Apr 4 14:42:21 2006
@@ -1,1 +1,1 @@
-11
+13
Modified: team/oej/res_auth/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/CREDITS?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/CREDITS (original)
+++ team/oej/res_auth/CREDITS Tue Apr 4 14:42:21 2006
@@ -90,6 +90,11 @@
Music provided by www.freeplaymusic.com
=== OTHER SOURCE CODE IN ASTERISK ===
+Asterisk uses libedit, the lightweight readline replacement from
+NetBSD. It is BSD-licensed and requires the following statement:
+
+ This product includes software developed by the NetBSD
+ Foundation, Inc. and its contributors.
Digium did not implement the codecs in Asterisk. Here is the copyright on the
GSM source:
Modified: team/oej/res_auth/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/Makefile?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/Makefile (original)
+++ team/oej/res_auth/Makefile Tue Apr 4 14:42:21 2006
@@ -578,6 +578,13 @@
datafiles: all
if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ # Should static HTTP be installed during make samples or even with its own target ala
+ # webvoicemail? There are portions here that *could* be customized but might also be
+ # improved a lot. I'll put it here for now.
+ mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/static-http
+ for x in static-http/*; do \
+ install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/static-http ; \
+ done
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
for x in sounds/digits/*.gsm; do \
@@ -800,6 +807,8 @@
echo ";astctlowner = root" ; \
echo ";astctlgroup = apache" ; \
echo ";astctl = asterisk.ctl" ; \
+ echo ";[options]" ; \
+ echo ";internal_timing = yes" ; \
) > $(DESTDIR)$(ASTCONFPATH) ; \
else \
echo "Skipping asterisk.conf creation"; \
Modified: team/oej/res_auth/README
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/README?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/README (original)
+++ team/oej/res_auth/README Tue Apr 4 14:42:21 2006
@@ -2,14 +2,14 @@
by Mark Spencer <markster at digium.com>
and the Asterisk.org developer community
-Copyright (C) 2001-2005 Digium, Inc.
+Copyright (C) 2001-2006 Digium, Inc.
and other copyright holders.
================================================================
* SECURITY
It is imperative that you read and fully understand the contents of
-the SECURITY file before you attempt to configure and run an Asterisk
-server.
+the security information file (doc/security.txt) before you attempt
+to configure and run an Asterisk server.
* WHAT IS ASTERISK ?
Asterisk is an Open Source PBX and telephony toolkit. It is, in a
@@ -84,11 +84,18 @@
So let's proceed:
-1) Run "make"
+1) Read the README files.
+ There are more README files than this one in the doc/ directory.
+ Start with doc/00README.1st
+ You may also want to check the configuration files that contain
+ examples and reference guides. They are all in the configs/
+ directory.
+
+2) Run "make"
Assuming the build completes successfully:
-2) Run "make install"
+3) Run "make install"
Each time you update or checkout from the repository, you are strongly
encouraged to ensure all previous object files are removed to avoid internal
@@ -99,7 +106,7 @@
If this is your first time working with Asterisk, you may wish to install
the sample PBX, with demonstration extensions, etc. If so, run:
-3) "make samples"
+4) "make samples"
Doing so will overwrite any existing config files you have.
Modified: team/oej/res_auth/acl.c
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/acl.c?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/acl.c (original)
+++ team/oej/res_auth/acl.c Tue Apr 4 14:42:21 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>
*
@@ -20,7 +20,7 @@
*
* \brief Various sorts of access control
*
- * \author Mark Spencer <markster at digium.com>
+ * \author Mark Spencer <markster at digium.com>
*/
#include <stdio.h>
@@ -136,7 +136,7 @@
if (prev)
prev->next = link; /* Link previous to this object */
- if (!ret)
+ if (!ret)
ret = link; /* Save starting point */
start = start->next; /* Go to next object */
@@ -153,7 +153,7 @@
struct ast_ha *prev = NULL;
struct ast_ha *ret;
int x, z;
- unsigned int y;
+ unsigned int y;
ret = path;
while (path) {
@@ -252,12 +252,55 @@
return 0;
}
-int ast_str2tos(const char *value, int *tos)
+struct dscp_codepoint {
+ char *name;
+ unsigned int space;
+};
+
+/* IANA registered DSCP codepoints */
+
+static const struct dscp_codepoint dscp_pool1[] = {
+ { "CS0", 0x00 },
+ { "CS1", 0x08 },
+ { "CS2", 0x10 },
+ { "CS3", 0x18 },
+ { "CS4", 0x20 },
+ { "CS5", 0x28 },
+ { "CS6", 0x30 },
+ { "CS7", 0x38 },
+ { "AF11", 0x0A },
+ { "AF12", 0x0C },
+ { "AF13", 0x0E },
+ { "AF21", 0x12 },
+ { "AF22", 0x14 },
+ { "AF23", 0x16 },
+ { "AF31", 0x1A },
+ { "AF32", 0x1C },
+ { "AF33", 0x1E },
+ { "AF41", 0x22 },
+ { "AF42", 0x24 },
+ { "AF43", 0x26 },
+ { "EF", 0x2E },
+};
+
+int ast_str2tos(const char *value, unsigned int *tos)
{
int fval;
- if (sscanf(value, "%i", &fval) == 1)
- *tos = fval & 0xff;
- else if (!strcasecmp(value, "lowdelay"))
+ unsigned int x;
+
+ if (sscanf(value, "%i", &fval) == 1) {
+ *tos = fval & 0xFF;
+ return 0;
+ }
+
+ for (x = 0; x < sizeof(dscp_pool1) / sizeof(dscp_pool1[0]); x++) {
+ if (!strcasecmp(value, dscp_pool1[x].name)) {
+ *tos = dscp_pool1[x].space << 2;
+ return 0;
+ }
+ }
+
+ if (!strcasecmp(value, "lowdelay"))
*tos = IPTOS_LOWDELAY;
else if (!strcasecmp(value, "throughput"))
*tos = IPTOS_THROUGHPUT;
@@ -269,16 +312,44 @@
*tos = 0;
else
return -1;
+
+ ast_log(LOG_WARNING, "TOS value %s is deprecated. Please see doc/ip-tos.txt for more information.\n", value);
+
return 0;
}
+const char *ast_tos2str(unsigned int tos)
+{
+ unsigned int x;
+
+ switch (tos) {
+ case 0:
+ return "none";
+ case IPTOS_LOWDELAY:
+ return "lowdelay";
+ case IPTOS_THROUGHPUT:
+ return "throughput";
+ case IPTOS_RELIABILITY:
+ return "reliability";
+ case IPTOS_MINCOST:
+ return "mincost";
+ default:
+ for (x = 0; x < sizeof(dscp_pool1) / sizeof(dscp_pool1[0]); x++) {
+ if (dscp_pool1[x].space == (tos >> 2))
+ return dscp_pool1[x].name;
+ }
+ }
+
+ return "unknown";
+}
+
int ast_get_ip(struct sockaddr_in *sin, const char *value)
{
return ast_get_ip_or_srv(sin, value, NULL);
}
/* iface is the interface (e.g. eth0); address is the return value */
-int ast_lookup_iface(char *iface, struct in_addr *address)
+int ast_lookup_iface(char *iface, struct in_addr *address)
{
int mysock, res = 0;
struct my_ifreq ifreq;
@@ -357,4 +428,3 @@
return 0;
return -1;
}
-
Modified: team/oej/res_auth/app.c
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/app.c?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/app.c (original)
+++ team/oej/res_auth/app.c Tue Apr 4 14:42:21 2006
@@ -79,7 +79,7 @@
else
ast_log(LOG_NOTICE,"Huh....? no dial for indications?\n");
- for (x = strlen(collect); strlen(collect) < maxlen; ) {
+ for (x = strlen(collect); x < maxlen; ) {
res = ast_waitfordigit(chan, timeout);
if (!ast_ignore_pattern(context, collect))
ast_playtones_stop(chan);
@@ -94,12 +94,8 @@
break;
}
}
- if (res >= 0) {
- if (ast_exists_extension(chan, context, collect, 1, chan->cid.cid_num))
- res = 1;
- else
- res = 0;
- }
+ if (res >= 0)
+ res = ast_exists_extension(chan, context, collect, 1, chan->cid.cid_num) ? 1 : 0;
return res;
}
@@ -1153,9 +1149,10 @@
char *fs;
int res;
int fd;
+ int lp = strlen(path);
time_t start;
- if (!(s = alloca(strlen(path) + 10)) || !(fs = alloca(strlen(path) + 20))) {
+ if (!(s = alloca(lp + 10)) || !(fs = alloca(lp + 20))) {
ast_log(LOG_WARNING, "Out of memory!\n");
return AST_LOCK_FAILURE;
}
@@ -1510,7 +1507,7 @@
if (fd < 0) {
ast_log(LOG_WARNING, "Cannot open file '%s' for reading: %s\n", filename, strerror(errno));
return NULL;
- }
+ }
if ((output = ast_malloc(count))) {
res = read(fd, output, count - 1);
if (res == count - 1) {
@@ -1540,14 +1537,13 @@
s = optstr;
while (*s) {
- curarg = *s++ & 0x7f;
+ curarg = *s++ & 0x7f; /* the array (in app.h) has 128 entries */
ast_set_flag(flags, options[curarg].flag);
argloc = options[curarg].arg_index;
if (*s == '(') {
/* Has argument */
arg = ++s;
- while (*s && (*s != ')'))
- s++;
+ s = strchr(s, ')');
if (*s) {
if (argloc)
args[argloc - 1] = arg;
Modified: team/oej/res_auth/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/apps/app_alarmreceiver.c?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/apps/app_alarmreceiver.c (original)
+++ team/oej/res_auth/apps/app_alarmreceiver.c Tue Apr 4 14:42:21 2006
@@ -551,13 +551,12 @@
checksum = checksum % 15;
- if(checksum){
+ if (checksum) {
database_increment("checksum-errors");
- if(option_verbose >= 2){
+ if (option_verbose >= 2)
ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Nonzero checksum\n");
ast_log(LOG_DEBUG, "AlarmReceiver: Nonzero checksum\n");
continue;
- }
}
/* Check the message type for correctness */
Modified: team/oej/res_auth/apps/app_channelredirect.c
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/apps/app_channelredirect.c?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/apps/app_channelredirect.c (original)
+++ team/oej/res_auth/apps/app_channelredirect.c Tue Apr 4 14:42:21 2006
@@ -47,8 +47,6 @@
static char *descrip =
"ChannelRedirect(channel|[[context|]extension|]priority):\n"
" Sends the specified channel to the specified extension priority\n";
-
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
Modified: team/oej/res_auth/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/apps/app_dial.c?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/apps/app_dial.c (original)
+++ team/oej/res_auth/apps/app_dial.c Tue Apr 4 14:42:21 2006
@@ -1449,7 +1449,7 @@
if (*ch == '^')
*ch = '|';
}
- res = pbx_exec(peer, app, opt_args[OPT_ARG_CALLEE_MACRO], 1);
+ res = pbx_exec(peer, app, opt_args[OPT_ARG_CALLEE_MACRO]);
ast_log(LOG_DEBUG, "Macro exited with status %d\n", res);
res = 0;
} else {
Modified: team/oej/res_auth/apps/app_echo.c
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/apps/app_echo.c?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/apps/app_echo.c (original)
+++ team/oej/res_auth/apps/app_echo.c Tue Apr 4 14:42:21 2006
@@ -59,7 +59,6 @@
int res = -1;
int format;
struct localuser *u;
- struct ast_frame *f;
LOCAL_USER_ADD(u);
@@ -68,7 +67,7 @@
ast_set_read_format(chan, format);
while (ast_waitfor(chan, -1) > -1) {
- f = ast_read(chan);
+ struct ast_frame *f = ast_read(chan);
if (!f)
break;
f->delivery.tv_sec = 0;
Modified: team/oej/res_auth/apps/app_exec.c
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/apps/app_exec.c?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/apps/app_exec.c (original)
+++ team/oej/res_auth/apps/app_exec.c Tue Apr 4 14:42:21 2006
@@ -82,7 +82,7 @@
if (appname) {
app = pbx_findapp(appname);
if (app) {
- res = pbx_exec(chan, app, args, 1);
+ res = pbx_exec(chan, app, args);
} else {
ast_log(LOG_WARNING, "Could not find application (%s)\n", appname);
res = -1;
Modified: team/oej/res_auth/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/apps/app_macro.c?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/apps/app_macro.c (original)
+++ team/oej/res_auth/apps/app_macro.c Tue Apr 4 14:42:21 2006
@@ -188,7 +188,7 @@
snprintf(varname, sizeof(varname), "ARG%d", argc);
s = pbx_builtin_getvar_helper(chan, varname);
if (s)
- oldargs[argc] = strdup(s);
+ oldargs[argc] = ast_strdup(s);
pbx_builtin_setvar_helper(chan, varname, cur);
argc++;
}
Modified: team/oej/res_auth/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/apps/app_meetme.c?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/apps/app_meetme.c (original)
+++ team/oej/res_auth/apps/app_meetme.c Tue Apr 4 14:42:21 2006
@@ -685,42 +685,36 @@
return 0;
}
-static char *complete_confcmd(const char *line, const char *word, int pos, int state) {
-#define CONF_COMMANDS 6
- int which = 0, x = 0;
+static char *complete_confcmd(const char *line, const char *word, int pos, int state)
+{
+ static char *cmds[] = {"lock", "unlock", "mute", "unmute", "kick", "list", NULL};
+
+ int len = strlen(word);
+ int which = 0;
struct ast_conference *cnf = NULL;
struct ast_conf_user *usr = NULL;
char *confno = NULL;
char usrno[50] = "";
- char cmds[CONF_COMMANDS][20] = {"lock", "unlock", "mute", "unmute", "kick", "list"};
- char *myline;
+ char *myline, *ret = NULL;
- if (pos == 1) {
- /* Command */
- for (x = 0;x < CONF_COMMANDS; x++) {
- if (!strncasecmp(cmds[x], word, strlen(word))) {
- if (++which > state) {
- return strdup(cmds[x]);
- }
- }
- }
- } else if (pos == 2) {
- /* Conference Number */
+ if (pos == 1) { /* Command */
+ return ast_cli_complete(word, cmds, state);
+ } else if (pos == 2) { /* Conference Number */
AST_LIST_LOCK(&confs);
AST_LIST_TRAVERSE(&confs, cnf, list) {
- if (!strncasecmp(word, cnf->confno, strlen(word))) {
- if (++which > state)
- break;
- }
- }
+ if (!strncasecmp(word, cnf->confno, len) && ++which > state) {
+ ret = cnf->confno;
+ break;
+ }
+ }
+ ret = ast_strdup(ret); /* dup before releasing the lock */
AST_LIST_UNLOCK(&confs);
- return cnf ? strdup(cnf->confno) : NULL;
+ return ret;
} else if (pos == 3) {
/* User Number || Conf Command option*/
if (strstr(line, "mute") || strstr(line, "kick")) {
- if ((state == 0) && (strstr(line, "kick") || strstr(line,"mute")) && !(strncasecmp(word, "all", strlen(word)))) {
+ if (state == 0 && (strstr(line, "kick") || strstr(line,"mute")) && !strncasecmp(word, "all", len))
return strdup("all");
- }
which++;
AST_LIST_LOCK(&confs);
@@ -740,10 +734,8 @@
/* Search for the user */
for (usr = cnf->firstuser; usr; usr = usr->nextuser) {
snprintf(usrno, sizeof(usrno), "%d", usr->user_no);
- if (!strncasecmp(word, usrno, strlen(word))) {
- if (++which > state)
- break;
- }
+ if (!strncasecmp(word, usrno, len) && ++which > state)
+ break;
}
}
AST_LIST_UNLOCK(&confs);
@@ -1151,7 +1143,7 @@
app = pbx_findapp("agi");
if (app) {
char *s = ast_strdupa(agifile);
- ret = pbx_exec(chan, app, s, 1);
+ ret = pbx_exec(chan, app, s);
} else {
ast_log(LOG_WARNING, "Could not find application (agi)\n");
ret = -2;
Modified: team/oej/res_auth/apps/app_milliwatt.c
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/apps/app_milliwatt.c?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/apps/app_milliwatt.c (original)
+++ team/oej/res_auth/apps/app_milliwatt.c Tue Apr 4 14:42:21 2006
@@ -71,20 +71,27 @@
{
struct ast_frame wf;
unsigned char buf[AST_FRIENDLY_OFFSET + 640];
- int i,*indexp = (int *) data;
+ const int maxsamples = sizeof (buf) / sizeof (buf[0]);
+ int i, *indexp = (int *) data;
- if (len + AST_FRIENDLY_OFFSET > sizeof(buf))
- {
- ast_log(LOG_WARNING,"Only doing %d bytes (%d bytes requested)\n",(int)(sizeof(buf) - AST_FRIENDLY_OFFSET),len);
- len = sizeof(buf) - AST_FRIENDLY_OFFSET;
+ /* Instead of len, use samples, because channel.c generator_force
+ * generate(chan, tmp, 0, 160) ignores len. In any case, len is
+ * a multiple of samples, given by number of samples times bytes per
+ * sample. In the case of ulaw, len = samples. for signed linear
+ * len = 2 * samples */
+
+ if (samples > maxsamples) {
+ ast_log(LOG_WARNING, "Only doing %d samples (%d requested)\n", maxsamples, samples);
+ samples = maxsamples;
}
+ len = samples * sizeof (buf[0]);
wf.frametype = AST_FRAME_VOICE;
wf.subclass = AST_FORMAT_ULAW;
wf.offset = AST_FRIENDLY_OFFSET;
wf.mallocd = 0;
wf.data = buf + AST_FRIENDLY_OFFSET;
wf.datalen = len;
- wf.samples = wf.datalen;
+ wf.samples = samples;
wf.src = "app_milliwatt";
wf.delivery.tv_sec = 0;
wf.delivery.tv_usec = 0;
Modified: team/oej/res_auth/apps/app_page.c
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/apps/app_page.c?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/apps/app_page.c (original)
+++ team/oej/res_auth/apps/app_page.c Tue Apr 4 14:42:21 2006
@@ -186,7 +186,7 @@
}
if (!res) {
snprintf(meetmeopts, sizeof(meetmeopts), "%ud|A%sqxd", confid, ast_test_flag(&flags, PAGE_DUPLEX) ? "" : "t");
- pbx_exec(chan, app, meetmeopts, 1);
+ pbx_exec(chan, app, meetmeopts);
}
LOCAL_USER_REMOVE(u);
Modified: team/oej/res_auth/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/apps/app_queue.c?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/apps/app_queue.c (original)
+++ team/oej/res_auth/apps/app_queue.c Tue Apr 4 14:42:21 2006
@@ -1211,7 +1211,7 @@
ast_mutex_lock(&qe->parent->lock);
if (newvalue <= qe->parent->servicelevel)
- qe->parent->callscompletedinsl++;
+ qe->parent->callscompletedinsl++;
oldvalue = qe->parent->holdtime;
qe->parent->holdtime = (((oldvalue << 2) - oldvalue) + newvalue) >> 2;
ast_mutex_unlock(&qe->parent->lock);
@@ -1440,12 +1440,9 @@
if (tmp->chan->cid.cid_ani)
free(tmp->chan->cid.cid_ani);
tmp->chan->cid.cid_ani = NULL;
- if (qe->chan->cid.cid_num)
- tmp->chan->cid.cid_num = strdup(qe->chan->cid.cid_num);
- if (qe->chan->cid.cid_name)
- tmp->chan->cid.cid_name = strdup(qe->chan->cid.cid_name);
- if (qe->chan->cid.cid_ani)
- tmp->chan->cid.cid_ani = strdup(qe->chan->cid.cid_ani);
+ tmp->chan->cid.cid_num = ast_strdup(qe->chan->cid.cid_num);
+ tmp->chan->cid.cid_name = ast_strdup(qe->chan->cid.cid_name);
+ tmp->chan->cid.cid_ani = ast_strdup(qe->chan->cid.cid_ani);
/* Inherit specially named variables from parent channel */
ast_channel_inherit_variables(qe->chan, tmp->chan);
@@ -1724,21 +1721,12 @@
} else {
if (o->chan->cid.cid_num)
free(o->chan->cid.cid_num);
- o->chan->cid.cid_num = NULL;
+ o->chan->cid.cid_num = ast_strdup(in->cid.cid_num);
+
if (o->chan->cid.cid_name)
free(o->chan->cid.cid_name);
- o->chan->cid.cid_name = NULL;
-
- if (in->cid.cid_num) {
- o->chan->cid.cid_num = strdup(in->cid.cid_num);
- if (!o->chan->cid.cid_num)
- ast_log(LOG_WARNING, "Out of memory\n");
- }
- if (in->cid.cid_name) {
- o->chan->cid.cid_name = strdup(in->cid.cid_name);
- if (!o->chan->cid.cid_name)
- ast_log(LOG_WARNING, "Out of memory\n");
- }
+ o->chan->cid.cid_name = ast_strdup(in->cid.cid_name);
+
ast_string_field_set(o->chan, accountcode, in->accountcode);
o->chan->cdrflags = in->cdrflags;
@@ -1749,10 +1737,8 @@
}
if (o->chan->cid.cid_rdnis)
free(o->chan->cid.cid_rdnis);
- if (!ast_strlen_zero(in->macroexten))
- o->chan->cid.cid_rdnis = strdup(in->macroexten);
- else
- o->chan->cid.cid_rdnis = strdup(in->exten);
+ o->chan->cid.cid_rdnis =
+ ast_strdup(S_OR(in->macroexten, in->exten));
if (ast_call(o->chan, tmpchan, 0)) {
ast_log(LOG_NOTICE, "Failed to dial on local channel for call forward to '%s'\n", tmpchan);
do_hang(o);
@@ -1767,7 +1753,7 @@
if (f) {
if (f->frametype == AST_FRAME_CONTROL) {
switch(f->subclass) {
- case AST_CONTROL_ANSWER:
+ case AST_CONTROL_ANSWER:
/* This is our guy if someone answered. */
if (!peer) {
if (option_verbose > 2)
@@ -2097,8 +2083,8 @@
if (!ast_strlen_zero(announceoverride))
announce = announceoverride;
- for (;cur; cur = cur->next) {
- struct callattempt *tmp = ast_calloc(1, sizeof(*tmp));
+ for (;cur; cur = cur->next) {
+ struct callattempt *tmp = ast_calloc(1, sizeof(*tmp));
if (!tmp) {
ast_mutex_unlock(&qe->parent->lock);
if (use_weight)
@@ -2207,7 +2193,7 @@
/* Agent must have hung up */
ast_log(LOG_WARNING, "Agent on %s hungup on the customer. They're going to be pissed.\n", peer->name);
ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "AGENTDUMP", "%s", "");
- record_abandoned(qe);
+ record_abandoned(qe);
if (qe->parent->eventwhencalled) {
manager_event(EVENT_FLAG_AGENT, "AgentDump",
"Queue: %s\r\n"
@@ -2237,7 +2223,7 @@
if (res < 0) {
ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "SYSCOMPAT", "%s", "");
ast_log(LOG_WARNING, "Had to drop call because I couldn't make %s compatible with %s\n", qe->chan->name, peer->name);
- record_abandoned(qe);
+ record_abandoned(qe);
ast_hangup(peer);
return -1;
}
@@ -2417,7 +2403,7 @@
free(last_member);
if (queue_persistent_members)
- dump_queue_members(q);
+ dump_queue_members(q);
res = RES_OKAY;
} else {
@@ -2454,17 +2440,17 @@
new_member->next = q->members;
q->members = new_member;
manager_event(EVENT_FLAG_AGENT, "QueueMemberAdded",
- "Queue: %s\r\n"
- "Location: %s\r\n"
- "Membership: %s\r\n"
- "Penalty: %d\r\n"
- "CallsTaken: %d\r\n"
- "LastCall: %d\r\n"
- "Status: %d\r\n"
- "Paused: %d\r\n",
- q->name, new_member->interface, new_member->dynamic ? "dynamic" : "static",
- new_member->penalty, new_member->calls, (int)new_member->lastcall, new_member->status, new_member->paused);
-
+ "Queue: %s\r\n"
+ "Location: %s\r\n"
+ "Membership: %s\r\n"
+ "Penalty: %d\r\n"
+ "CallsTaken: %d\r\n"
+ "LastCall: %d\r\n"
+ "Status: %d\r\n"
+ "Paused: %d\r\n",
+ q->name, new_member->interface, new_member->dynamic ? "dynamic" : "static",
+ new_member->penalty, new_member->calls, (int)new_member->lastcall, new_member->status, new_member->paused);
+
if (dump)
dump_queue_members(q);
@@ -2503,7 +2489,7 @@
mem->paused = paused;
if (queue_persistent_members)
- dump_queue_members(q);
+ dump_queue_members(q);
ast_queue_log(q->name, "NONE", interface, (paused ? "PAUSE" : "UNPAUSE"), "%s", "");
@@ -2682,7 +2668,7 @@
}
if (!(parse = ast_strdupa(data)))
- return -1;
+ return -1;
AST_STANDARD_APP_ARGS(args, parse);
@@ -2958,7 +2944,7 @@
check_turns:
if (ringing) {
ast_indicate(chan, AST_CONTROL_RINGING);
- } else {
+ } else {
ast_moh_start(chan, qe.moh);
}
for (;;) {
@@ -2972,8 +2958,8 @@
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON", "%d|%d|%ld", qe.pos, qe.opos, (long)time(NULL) - qe.start);
if (option_verbose > 2) {
ast_verbose(VERBOSE_PREFIX_3 "User disconnected from queue %s while waiting their turn\n", args.queuename);
- res = -1;
}
+ res = -1;
break;
}
if (!res)
@@ -2995,7 +2981,7 @@
/* Leave if we have exceeded our queuetimeout */
if (qe.expire && (time(NULL) > qe.expire)) {
- record_abandoned(&qe);
+ record_abandoned(&qe);
reason = QUEUE_TIMEOUT;
res = 0;
ast_queue_log(args.queuename, chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d", qe.pos);
@@ -3071,8 +3057,8 @@
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON", "%d|%d|%ld", qe.pos, qe.opos, (long)time(NULL) - qe.start);
if (option_verbose > 2) {
ast_verbose(VERBOSE_PREFIX_3 "User disconnected from queue %s when they almost made it\n", args.queuename);
- res = -1;
}
+ res = -1;
break;
}
if (res && valid_exit(&qe, res)) {
@@ -3081,12 +3067,10 @@
}
/* exit after 'timeout' cycle if 'n' option enabled */
if (go_on) {
- if (option_verbose > 2) {
+ if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Exiting on time-out cycle\n");
- res = -1;
- }
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHTIMEOUT", "%d", qe.pos);
- record_abandoned(&qe);
+ record_abandoned(&qe);
reason = QUEUE_TIMEOUT;
res = 0;
break;
@@ -3501,8 +3485,8 @@
AST_LIST_LOCK(&queues);
AST_LIST_TRAVERSE(&queues, q, list) {
- if (!strncasecmp(word, q->name, wordlen) && (++which > state)) {
- ret = strdup(q->name);
+ if (!strncasecmp(word, q->name, wordlen) && ++which > state) {
+ ret = ast_strdup(q->name);
break;
}
}
@@ -3766,11 +3750,11 @@
case 3: /* Don't attempt to complete name of member (infinite possibilities) */
return NULL;
case 4: /* only one possible match, "to" */
- return state == 0 ? strdup("to") : NULL;
+ return state == 0 ? ast_strdup("to") : NULL;
case 5: /* <queue> */
return complete_queue(line, word, pos, state);
case 6: /* only one possible match, "penalty" */
- return state == 0 ? strdup("penalty") : NULL;
+ return state == 0 ? ast_strdup("penalty") : NULL;
case 7:
if (state < 100) { /* 0-99 */
char *num;
@@ -3823,23 +3807,23 @@
struct ast_call_queue *q;
struct member *m;
- /* 0 - add; 1 - queue; 2 - member; 3 - <member>; 4 - from; 5 - <queue> */
- if (pos > 5 || pos < 3)
- return NULL;
- if (pos == 4) /* only one possible match, 'from' */
- return state == 0 ? strdup("from") : NULL;
-
- if (pos == 5) /* No need to duplicate code */
- return complete_queue(line, word, pos, state);
-
- /* here is the case for 3, <member> */
- if (!AST_LIST_EMPTY(&queues)) {
+ /* 0 - add; 1 - queue; 2 - member; 3 - <member>; 4 - from; 5 - <queue> */
+ if (pos > 5 || pos < 3)
+ return NULL;
+ if (pos == 4) /* only one possible match, 'from' */
+ return state == 0 ? ast_strdup("from") : NULL;
+
+ if (pos == 5) /* No need to duplicate code */
+ return complete_queue(line, word, pos, state);
+
+ /* here is the case for 3, <member> */
+ if (!AST_LIST_EMPTY(&queues)) { /* XXX unnecessary ? the traverse does that for us */
AST_LIST_TRAVERSE(&queues, q, list) {
ast_mutex_lock(&q->lock);
for (m = q->members ; m ; m = m->next) {
if (++which > state) {
ast_mutex_unlock(&q->lock);
- return strdup(m->interface);
+ return ast_strdup(m->interface);
}
}
ast_mutex_unlock(&q->lock);
Modified: team/oej/res_auth/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/apps/app_rpt.c?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/apps/app_rpt.c (original)
+++ team/oej/res_auth/apps/app_rpt.c Tue Apr 4 14:42:21 2006
@@ -260,7 +260,6 @@
struct ast_config *cfg;
-STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
#define MSWAIT 200
@@ -609,7 +608,6 @@
/* Debug mode */
static int rpt_do_debug(int fd, int argc, char *argv[]);
static int rpt_do_dump(int fd, int argc, char *argv[]);
-static int rpt_do_frog(int fd, int argc, char *argv[]);
static char debug_usage[] =
"Usage: rpt debug level {0-7}\n"
@@ -619,10 +617,6 @@
"Usage: rpt dump <nodename>\n"
" Dumps struct debug info to log\n";
-static char frog_usage[] =
-"Usage: frog [warp_factor]\n"
-" Performs frog-in-a-blender calculations (Jacobsen Corollary)\n";
-
static struct ast_cli_entry cli_debug =
{ { "rpt", "debug", "level" }, rpt_do_debug,
"Enable app_rpt debugging", debug_usage };
@@ -630,10 +624,6 @@
static struct ast_cli_entry cli_dump =
{ { "rpt", "dump" }, rpt_do_dump,
"Dump app_rpt structs for debugging", dump_usage };
-
-static struct ast_cli_entry cli_frog =
- { { "frog" }, rpt_do_frog,
- "Perform frog-in-a-blender calculations", frog_usage };
/*
* Telemetry defaults
@@ -778,26 +768,6 @@
return RESULT_SUCCESS;
}
}
- return RESULT_FAILURE;
-}
-
-/*
-* Perform frong-in-a-blender calculations (Jacobsen Corollary)
-*/
-
-static int rpt_do_frog(int fd, int argc, char *argv[])
-{
- double warpone = 75139293848.398696166028333356763;
- double warpfactor = 1.0;
-
- if (argc > 2) return RESULT_SHOWUSAGE;
- if ((argc > 1) && (sscanf(argv[1],"%lf",&warpfactor) != 1))
- return RESULT_SHOWUSAGE;
-
- ast_cli(fd, "A frog in a blender with a base diameter of 3 inches going\n");
- ast_cli(fd, "%lf RPM will be travelling at warp factor %lf,\n",
- warpfactor * warpfactor * warpfactor * warpone,warpfactor);
- ast_cli(fd,"based upon the Jacobsen Frog Corollary.\n");
return RESULT_FAILURE;
}
@@ -7067,7 +7037,6 @@
/* Unregister cli extensions */
ast_cli_unregister(&cli_debug);
ast_cli_unregister(&cli_dump);
- ast_cli_unregister(&cli_frog);
return i;
}
@@ -7079,7 +7048,6 @@
/* Register cli extensions */
ast_cli_register(&cli_debug);
ast_cli_register(&cli_dump);
- ast_cli_register(&cli_frog);
return ast_register_application(app, rpt_exec, synopsis, descrip);
}
Modified: team/oej/res_auth/apps/app_senddtmf.c
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/apps/app_senddtmf.c?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/apps/app_senddtmf.c (original)
+++ team/oej/res_auth/apps/app_senddtmf.c Tue Apr 4 14:42:21 2006
@@ -52,7 +52,7 @@
static char *descrip =
" SendDTMF(digits[|timeout_ms]): Sends DTMF digits on a channel. \n"
-" Accepted digits: 0-9, *#abcd\n"
+" Accepted digits: 0-9, *#abcd, w (.5s pause)\n"
" The application will either pass the assigned digits or terminate if it\n"
" encounters an error.\n";
Modified: team/oej/res_auth/apps/app_sms.c
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/apps/app_sms.c?rev=17414&r1=17413&r2=17414&view=diff
==============================================================================
--- team/oej/res_auth/apps/app_sms.c (original)
+++ team/oej/res_auth/apps/app_sms.c Tue Apr 4 14:42:21 2006
@@ -1177,32 +1177,31 @@
{
struct ast_frame f = { 0 };
unsigned char waste[AST_FRIENDLY_OFFSET];
+#define MAXSAMPLES (800)
#ifdef OUTALAW
- unsigned char buf[800];
+ unsigned char buf[MAXSAMPLES];
#else
- signed short buf[800];
+ signed short buf[MAXSAMPLES];
#endif
+#define SAMPLE2LEN (sizeof (buf[0]))
sms_t *h = data;
int i;
[... 21351 lines stripped ...]
More information about the asterisk-commits
mailing list