[asterisk-commits] branch oej/metermaids - r8266 in
/team/oej/metermaids: ./ apps/ channels/ res/
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Jan 19 10:02:28 MST 2006
Author: oej
Date: Thu Jan 19 11:02:22 2006
New Revision: 8266
URL: http://svn.digium.com/view/asterisk?rev=8266&view=rev
Log:
Merged revisions 8122,8124,8134,8140,8162,8173,8194,8232,8242 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r8122 | kpfleming | 2006-01-17 14:11:55 +0100 (Tue, 17 Jan 2006) | 2 lines
update CLI copyright notice
........
r8124 | mogorman | 2006-01-17 17:55:30 +0100 (Tue, 17 Jan 2006) | 3 lines
Fixed code ordering of logger_init and queue_log_init
bug 6263
........
r8134 | mattf | 2006-01-17 19:29:57 +0100 (Tue, 17 Jan 2006) | 2 lines
Backport of fix for #6094
........
r8140 | mogorman | 2006-01-17 21:10:29 +0100 (Tue, 17 Jan 2006) | 3 lines
Stop any generators running on a channel when
festival is called as described in 5996
........
r8162 | mogorman | 2006-01-18 01:47:04 +0100 (Wed, 18 Jan 2006) | 4 lines
Changed order of autoload so that pbx_ comes before
channels, and in doing so cause bug 6002 to not
be an issue
........
r8173 | russell | 2006-01-18 03:49:21 +0100 (Wed, 18 Jan 2006) | 2 lines
remove ChangeLog from the 1.2 branch. It will only be present in the tags.
........
r8194 | mogorman | 2006-01-18 22:02:06 +0100 (Wed, 18 Jan 2006) | 3 lines
Solves issue with the login proccess in meetme
patch from 6136
........
r8232 | russell | 2006-01-19 05:17:45 +0100 (Thu, 19 Jan 2006) | 3 lines
fix a seg fault due to assuming that space gets allocatted on the stack in the
same order that we declare the variables (issue #6290)
........
r8242 | russell | 2006-01-19 05:56:48 +0100 (Thu, 19 Jan 2006) | 3 lines
fix Message-Account header to use the ip address if the fromdomain
isn't set (issue #6278)
........
Removed:
team/oej/metermaids/ChangeLog
Modified:
team/oej/metermaids/ (props changed)
team/oej/metermaids/apps/app_festival.c
team/oej/metermaids/apps/app_meetme.c
team/oej/metermaids/apps/app_milliwatt.c
team/oej/metermaids/asterisk.c
team/oej/metermaids/channels/chan_sip.c
team/oej/metermaids/loader.c
team/oej/metermaids/logger.c
team/oej/metermaids/res/res_features.c
Propchange: team/oej/metermaids/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jan 19 11:02:22 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7496,7498-8114
+/branches/1.2:1-7496,7498-8265
Modified: team/oej/metermaids/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/apps/app_festival.c?rev=8266&r1=8265&r2=8266&view=diff
==============================================================================
--- team/oej/metermaids/apps/app_festival.c (original)
+++ team/oej/metermaids/apps/app_festival.c Thu Jan 19 11:02:22 2006
@@ -177,7 +177,8 @@
if (chan->_state != AST_STATE_UP)
ast_answer(chan);
ast_stopstream(chan);
-
+ ast_indicate(chan, -1);
+
owriteformat = chan->writeformat;
res = ast_set_write_format(chan, AST_FORMAT_SLINEAR);
if (res < 0) {
Modified: team/oej/metermaids/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/apps/app_meetme.c?rev=8266&r1=8265&r2=8266&view=diff
==============================================================================
--- team/oej/metermaids/apps/app_meetme.c (original)
+++ team/oej/metermaids/apps/app_meetme.c Thu Jan 19 11:02:22 2006
@@ -1739,7 +1739,8 @@
if (dynamic_pin) {
if (dynamic_pin[0] == 'q') {
/* Query the user to enter a PIN */
- ast_app_getdata(chan, "conf-getpin", dynamic_pin, AST_MAX_EXTENSION - 1, 0);
+ if (ast_app_getdata(chan, "conf-getpin", dynamic_pin, AST_MAX_EXTENSION - 1, 0) < 0)
+ return NULL;
}
cnf = build_conf(confno, dynamic_pin, "", make, dynamic);
} else {
Modified: team/oej/metermaids/apps/app_milliwatt.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/apps/app_milliwatt.c?rev=8266&r1=8265&r2=8266&view=diff
==============================================================================
--- team/oej/metermaids/apps/app_milliwatt.c (original)
+++ team/oej/metermaids/apps/app_milliwatt.c Thu Jan 19 11:02:22 2006
@@ -75,30 +75,29 @@
static int milliwatt_generate(struct ast_channel *chan, void *data, int len, int samples)
{
struct ast_frame wf;
- unsigned char waste[AST_FRIENDLY_OFFSET];
- unsigned char buf[640];
+ unsigned char buf[AST_FRIENDLY_OFFSET + 640];
int i,*indexp = (int *) data;
- if (len > sizeof(buf))
+ if (len + AST_FRIENDLY_OFFSET > sizeof(buf))
{
- ast_log(LOG_WARNING,"Only doing %d bytes (%d bytes requested)\n",(int)sizeof(buf),len);
- len = 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;
}
- waste[0] = 0; /* make compiler happy */
wf.frametype = AST_FRAME_VOICE;
wf.subclass = AST_FORMAT_ULAW;
wf.offset = AST_FRIENDLY_OFFSET;
wf.mallocd = 0;
- wf.data = buf;
+ wf.data = buf + AST_FRIENDLY_OFFSET;
wf.datalen = len;
wf.samples = wf.datalen;
wf.src = "app_milliwatt";
wf.delivery.tv_sec = 0;
wf.delivery.tv_usec = 0;
+ wf.prev = wf.next = NULL;
/* create a buffer containing the digital milliwatt pattern */
for(i = 0; i < len; i++)
{
- buf[i] = digital_milliwatt[(*indexp)++];
+ buf[AST_FRIENDLY_OFFSET + i] = digital_milliwatt[(*indexp)++];
*indexp &= 7;
}
if (ast_write(chan,&wf) < 0)
Modified: team/oej/metermaids/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/asterisk.c?rev=8266&r1=8265&r2=8266&view=diff
==============================================================================
--- team/oej/metermaids/asterisk.c (original)
+++ team/oej/metermaids/asterisk.c Thu Jan 19 11:02:22 2006
@@ -130,7 +130,7 @@
/*! \brief Welcome message when starting a CLI interface */
#define WELCOME_MESSAGE \
- ast_verbose("Asterisk " ASTERISK_VERSION ", Copyright (C) 1999 - 2005 Digium, Inc. and others.\n"); \
+ ast_verbose("Asterisk " ASTERISK_VERSION ", Copyright (C) 1999 - 2006 Digium, Inc. and others.\n"); \
ast_verbose("Created by Mark Spencer <markster at digium.com>\n"); \
ast_verbose("Asterisk comes with ABSOLUTELY NO WARRANTY; type 'show warranty' for details.\n"); \
ast_verbose("This is free software, with components licensed under the GNU General Public\n"); \
Modified: team/oej/metermaids/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/channels/chan_sip.c?rev=8266&r1=8265&r2=8266&view=diff
==============================================================================
--- team/oej/metermaids/channels/chan_sip.c (original)
+++ team/oej/metermaids/channels/chan_sip.c Thu Jan 19 11:02:22 2006
@@ -5201,13 +5201,14 @@
char tmp[500];
char *t = tmp;
size_t maxbytes = sizeof(tmp);
+ char iabuf[INET_ADDRSTRLEN];
initreqprep(&req, p, SIP_NOTIFY);
add_header(&req, "Event", "message-summary");
add_header(&req, "Content-Type", default_notifymime);
ast_build_string(&t, &maxbytes, "Messages-Waiting: %s\r\n", newmsgs ? "yes" : "no");
- ast_build_string(&t, &maxbytes, "Message-Account: sip:%s@%s\r\n", !ast_strlen_zero(vmexten) ? vmexten : global_vmexten, p->fromdomain);
+ ast_build_string(&t, &maxbytes, "Message-Account: sip:%s@%s\r\n", !ast_strlen_zero(vmexten) ? vmexten : global_vmexten, ast_strlen_zero(p->fromdomain) ? ast_inet_ntoa(iabuf, sizeof(iabuf), p->ourip) : p->fromdomain);
ast_build_string(&t, &maxbytes, "Voice-Message: %d/%d (0/0)\r\n", newmsgs, oldmsgs);
if (t > tmp + sizeof(tmp))
Modified: team/oej/metermaids/loader.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/loader.c?rev=8266&r1=8265&r2=8266&view=diff
==============================================================================
--- team/oej/metermaids/loader.c (original)
+++ team/oej/metermaids/loader.c Thu Jan 19 11:02:22 2006
@@ -458,8 +458,8 @@
static const char *loadorder[] =
{
"res_",
+ "pbx_",
"chan_",
- "pbx_",
NULL,
};
Modified: team/oej/metermaids/logger.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/logger.c?rev=8266&r1=8265&r2=8266&view=diff
==============================================================================
--- team/oej/metermaids/logger.c (original)
+++ team/oej/metermaids/logger.c Thu Jan 19 11:02:22 2006
@@ -466,8 +466,8 @@
filesize_reload_needed = 0;
+ init_logger_chain();
queue_log_init();
- init_logger_chain();
if (logfiles.event_log) {
if (eventlog) {
@@ -594,11 +594,11 @@
ast_cli_register(&rotate_logger_cli);
ast_cli_register(&logger_show_channels_cli);
+ /* create log channels */
+ init_logger_chain();
+
/* initialize queue logger */
queue_log_init();
-
- /* create log channels */
- init_logger_chain();
/* create the eventlog */
if (logfiles.event_log) {
Modified: team/oej/metermaids/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/res/res_features.c?rev=8266&r1=8265&r2=8266&view=diff
==============================================================================
--- team/oej/metermaids/res/res_features.c (original)
+++ team/oej/metermaids/res/res_features.c Thu Jan 19 11:02:22 2006
@@ -1364,17 +1364,11 @@
if (!(monitor_app = pbx_findapp("Monitor")))
monitor_ok=0;
}
- if ((monitor_exec = pbx_builtin_getvar_helper(chan, "AUTO_MONITOR")))
- src = chan;
- else if ((monitor_exec = pbx_builtin_getvar_helper(peer, "AUTO_MONITOR")))
- src = peer;
- if (src) {
- char *tmp = ast_strdupa(monitor_exec);
- if (tmp) {
- pbx_exec(src, monitor_app, tmp, 1);
- } else {
- ast_log(LOG_ERROR, "Monitor failed: out of memory\n");
- }
+ if (monitor_app) {
+ if ((monitor_exec = pbx_builtin_getvar_helper(chan, "AUTO_MONITOR")))
+ pbx_exec(chan, monitor_app, monitor_exec, 1);
+ else if ((monitor_exec = pbx_builtin_getvar_helper(peer, "AUTO_MONITOR")))
+ pbx_exec(peer, monitor_app, monitor_exec, 1);
}
}
More information about the asterisk-commits
mailing list