[asterisk-commits] branch oej/moduletest r12461 - in
/team/oej/moduletest: ./ apps/ build_tools/...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Wed Mar 8 04:17:10 MST 2006
Author: oej
Date: Wed Mar 8 05:16:57 2006
New Revision: 12461
URL: http://svn.digium.com/view/asterisk?rev=12461&view=rev
Log:
reset automerge, resolve conflict
Modified:
team/oej/moduletest/ (props changed)
team/oej/moduletest/Makefile
team/oej/moduletest/README
team/oej/moduletest/apps/app_mixmonitor.c
team/oej/moduletest/asterisk.c
team/oej/moduletest/asterisk.sgml
team/oej/moduletest/build_tools/make_build_h
team/oej/moduletest/build_tools/make_svn_branch_name
team/oej/moduletest/cdr.c
team/oej/moduletest/cdr/cdr_manager.c
team/oej/moduletest/cdr/cdr_odbc.c
team/oej/moduletest/cdr/cdr_pgsql.c
team/oej/moduletest/cdr/cdr_tds.c
team/oej/moduletest/channels/chan_iax2.c
team/oej/moduletest/channels/chan_sip.c
team/oej/moduletest/configs/zapata.conf.sample
team/oej/moduletest/editline/np/vis.c
team/oej/moduletest/editline/readline.c
team/oej/moduletest/include/asterisk/cdr.h
team/oej/moduletest/res/res_agi.c
team/oej/moduletest/res/res_config_odbc.c
team/oej/moduletest/res/res_monitor.c
Propchange: team/oej/moduletest/
------------------------------------------------------------------------------
automerge = gomango
Propchange: team/oej/moduletest/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 8 05:16:57 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7496,7498-11355
+/branches/1.2:1-7496,7498-12460
Modified: team/oej/moduletest/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/Makefile?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/Makefile (original)
+++ team/oej/moduletest/Makefile Wed Mar 8 05:16:57 2006
@@ -218,10 +218,12 @@
endif
GREP=grep
+ID=id
ifeq ($(OSARCH),SunOS)
GREP=/usr/xpg4/bin/grep
M4=/usr/local/bin/m4
+ ID=/usr/xpg4/bin/id
endif
INCLUDE+=-Iinclude -I../include
@@ -338,7 +340,9 @@
ASTCFLAGS+= $(ENABLE_TESTING)
ASTCFLAGS+= $(BUSYDETECT)
ASTCFLAGS+= $(OPTIONS)
+ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
ASTCFLAGS+= -fomit-frame-pointer
+endif
SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
@@ -544,7 +548,7 @@
$(MAKE) -C stdtime clean
datafiles: all
- if [ x`whoami` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
for x in sounds/digits/*.gsm; do \
Modified: team/oej/moduletest/README
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/README?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/README (original)
+++ team/oej/moduletest/README Wed Mar 8 05:16:57 2006
@@ -67,7 +67,7 @@
In order to discover new features to use, please check the configuration
examples in the /configs directory of the source code distribution.
To discover the major new features of Asterisk 1.2, please visit
-http://www.astricon.net/asterisk1-2/
+http://edvina.net/asterisk1-2/
* NEW INSTALLATIONS
Modified: team/oej/moduletest/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/apps/app_mixmonitor.c?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/apps/app_mixmonitor.c (original)
+++ team/oej/moduletest/apps/app_mixmonitor.c Wed Mar 8 05:16:57 2006
@@ -203,6 +203,17 @@
if (option_verbose > 1)
ast_verbose(VERBOSE_PREFIX_2 "Begin MixMonitor Recording %s\n", name);
+ if (mixmonitor->post_process) {
+ char *p;
+
+ for (p = mixmonitor->post_process; *p ; p++) {
+ if (*p == '^' && *(p+1) == '{') {
+ *p = '$';
+ }
+ }
+ pbx_substitute_variables_helper(mixmonitor->chan, mixmonitor->post_process, post_process, sizeof(post_process) - 1);
+ }
+
while (1) {
struct ast_frame *next;
int write;
@@ -237,17 +248,6 @@
ast_mutex_unlock(&spy.lock);
}
- if (mixmonitor->post_process) {
- char *p;
-
- for (p = mixmonitor->post_process; *p ; p++) {
- if (*p == '^' && *(p+1) == '{') {
- *p = '$';
- }
- }
- pbx_substitute_variables_helper(mixmonitor->chan, mixmonitor->post_process, post_process, sizeof(post_process) - 1);
- }
-
stopmon(mixmonitor->chan, &spy);
if (option_verbose > 1)
Modified: team/oej/moduletest/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/asterisk.c?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/asterisk.c (original)
+++ team/oej/moduletest/asterisk.c Wed Mar 8 05:16:57 2006
@@ -83,6 +83,9 @@
#if defined(__FreeBSD__) || defined( __NetBSD__ ) || defined(SOLARIS)
#include <netdb.h>
+#if defined(SOLARIS)
+extern int daemon(int, int); /* defined in libresolv of all places */
+#endif
#endif
#include "asterisk.h"
@@ -1905,7 +1908,8 @@
snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value);
} else if (!strcasecmp(v->name, "astvarlibdir")) {
ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR));
- snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/%s", v->value, "astdb");
+ snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value);
+ snprintf(ast_config_AST_KEY_DIR, sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value);
} else if (!strcasecmp(v->name, "astlogdir")) {
ast_copy_string(ast_config_AST_LOG_DIR, v->value, sizeof(ast_config_AST_LOG_DIR));
} else if (!strcasecmp(v->name, "astagidir")) {
@@ -2165,7 +2169,7 @@
exit(1);
}
if (setgid(gr->gr_gid)) {
- ast_log(LOG_WARNING, "Unable to setgid to %d (%s)\n", gr->gr_gid, rungroup);
+ ast_log(LOG_WARNING, "Unable to setgid to %d (%s)\n", (int)gr->gr_gid, rungroup);
exit(1);
}
if (setgroups(0, NULL)) {
@@ -2185,7 +2189,7 @@
}
if (!rungroup) {
if (setgid(pw->pw_gid)) {
- ast_log(LOG_WARNING, "Unable to setgid to %d!\n", pw->pw_gid);
+ ast_log(LOG_WARNING, "Unable to setgid to %d!\n", (int)pw->pw_gid);
exit(1);
}
if (initgroups(pw->pw_name, pw->pw_gid)) {
@@ -2194,7 +2198,7 @@
}
}
if (setuid(pw->pw_uid)) {
- ast_log(LOG_WARNING, "Unable to setuid to %d (%s)\n", pw->pw_uid, runuser);
+ ast_log(LOG_WARNING, "Unable to setuid to %d (%s)\n", (int)pw->pw_uid, runuser);
exit(1);
}
setenv("ASTERISK_ALREADY_NONROOT","yes",1);
@@ -2261,7 +2265,7 @@
unlink(ast_config_AST_PID);
f = fopen(ast_config_AST_PID, "w");
if (f) {
- fprintf(f, "%d\n", getpid());
+ fprintf(f, "%d\n", (int)getpid());
fclose(f);
} else
ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno));
@@ -2272,7 +2276,7 @@
unlink(ast_config_AST_PID);
f = fopen(ast_config_AST_PID, "w");
if (f) {
- fprintf(f, "%d\n", getpid());
+ fprintf(f, "%d\n", (int)getpid());
fclose(f);
} else
ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno));
Modified: team/oej/moduletest/asterisk.sgml
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/asterisk.sgml?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/asterisk.sgml (original)
+++ team/oej/moduletest/asterisk.sgml Wed Mar 8 05:16:57 2006
@@ -27,6 +27,7 @@
<arg><option>-G </option><replaceable class="parameter">group</replaceable></arg>
<arg><option>-x </option><replaceable class="parameter">command</replaceable></arg>
<arg><option>-M </option><replaceable class="parameter">value</replaceable></arg>
+<arg><option>-L </option><replaceable class="parameter">loadaverage</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
Modified: team/oej/moduletest/build_tools/make_build_h
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/build_tools/make_build_h?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/build_tools/make_build_h (original)
+++ team/oej/moduletest/build_tools/make_build_h Wed Mar 8 05:16:57 2006
@@ -3,7 +3,11 @@
KERNEL=`uname -r`
MACHINE=`uname -m`
OS=`uname -s`
-USER=`whoami`
+if [ `uname -s` = "SunOS" ]; then
+ USER=`/usr/xpg4/bin/id -un`
+else
+ USER=`id -un`
+fi
DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
cat << END
/*
Modified: team/oej/moduletest/build_tools/make_svn_branch_name
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/build_tools/make_svn_branch_name?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/build_tools/make_svn_branch_name (original)
+++ team/oej/moduletest/build_tools/make_svn_branch_name Wed Mar 8 05:16:57 2006
@@ -1,6 +1,6 @@
#!/bin/sh
-PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asterisk/:: | sed -e 's:/: :g'`
+PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
BRANCH=0
TEAM=0
Modified: team/oej/moduletest/cdr.c
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/cdr.c?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/cdr.c (original)
+++ team/oej/moduletest/cdr.c Wed Mar 8 05:16:57 2006
@@ -251,9 +251,9 @@
strftime(workspace, workspacelen, fmt, &tm);
}
} else if (!strcasecmp(name, "duration"))
- snprintf(workspace, workspacelen, "%d", cdr->duration);
+ snprintf(workspace, workspacelen, "%ld", cdr->duration);
else if (!strcasecmp(name, "billsec"))
- snprintf(workspace, workspacelen, "%d", cdr->billsec);
+ snprintf(workspace, workspacelen, "%ld", cdr->billsec);
else if (!strcasecmp(name, "disposition"))
ast_copy_string(workspace, ast_cdr_disp2str(cdr->disposition), workspacelen);
else if (!strcasecmp(name, "amaflags"))
Modified: team/oej/moduletest/cdr/cdr_manager.c
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/cdr/cdr_manager.c?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/cdr/cdr_manager.c (original)
+++ team/oej/moduletest/cdr/cdr_manager.c Wed Mar 8 05:16:57 2006
@@ -121,8 +121,8 @@
"StartTime: %s\r\n"
"AnswerTime: %s\r\n"
"EndTime: %s\r\n"
- "Duration: %d\r\n"
- "BillableSeconds: %d\r\n"
+ "Duration: %ld\r\n"
+ "BillableSeconds: %ld\r\n"
"Disposition: %s\r\n"
"AMAFlags: %s\r\n"
"UniqueID: %s\r\n"
Modified: team/oej/moduletest/cdr/cdr_odbc.c
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/cdr/cdr_odbc.c?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/cdr/cdr_odbc.c (original)
+++ team/oej/moduletest/cdr/cdr_odbc.c Wed Mar 8 05:16:57 2006
@@ -122,7 +122,7 @@
if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
if (option_verbose > 10)
ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: Failure in AllocStatement %d\n", ODBC_res);
- SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, ODBC_stat, &ODBC_err, ODBC_msg, 100, &ODBC_mlen);
+ SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, (unsigned char *)ODBC_stat, &ODBC_err, (unsigned char *)ODBC_msg, 100, &ODBC_mlen);
SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt);
connected = 0;
ast_mutex_unlock(&odbc_lock);
@@ -133,12 +133,12 @@
strange reason if I don't it blows holes in memory like
like a shotgun. So we just do this so its safe. */
- ODBC_res = SQLPrepare(ODBC_stmt, sqlcmd, SQL_NTS);
+ ODBC_res = SQLPrepare(ODBC_stmt, (unsigned char *)sqlcmd, SQL_NTS);
if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
if (option_verbose > 10)
ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: Error in PREPARE %d\n", ODBC_res);
- SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, ODBC_stat, &ODBC_err, ODBC_msg, 100, &ODBC_mlen);
+ SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, (unsigned char *)ODBC_stat, &ODBC_err, (unsigned char *)ODBC_msg, 100, &ODBC_mlen);
SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt);
connected = 0;
ast_mutex_unlock(&odbc_lock);
@@ -381,7 +381,7 @@
if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
if (option_verbose > 10)
ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: Error in Query %d\n", ODBC_res);
- SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, ODBC_stat, &ODBC_err, ODBC_msg, 100, &ODBC_mlen);
+ SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, (unsigned char *)ODBC_stat, &ODBC_err, (unsigned char *)ODBC_msg, 100, &ODBC_mlen);
SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt);
connected = 0;
return -1;
@@ -438,7 +438,7 @@
if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
if (option_verbose > 10)
ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: Error SQLConnect %d\n", ODBC_res);
- SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, ODBC_stat, &ODBC_err, ODBC_msg, 100, &ODBC_mlen);
+ SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, (unsigned char *)ODBC_stat, &ODBC_err, (unsigned char *)ODBC_msg, 100, &ODBC_mlen);
SQLFreeHandle(SQL_HANDLE_ENV, ODBC_env);
connected = 0;
return -1;
Modified: team/oej/moduletest/cdr/cdr_pgsql.c
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/cdr/cdr_pgsql.c?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/cdr/cdr_pgsql.c (original)
+++ team/oej/moduletest/cdr/cdr_pgsql.c Wed Mar 8 05:16:57 2006
@@ -122,7 +122,7 @@
snprintf(sqlcmd,sizeof(sqlcmd),"INSERT INTO %s (calldate,clid,src,dst,dcontext,channel,dstchannel,"
"lastapp,lastdata,duration,billsec,disposition,amaflags,accountcode,uniqueid,userfield) VALUES"
- " ('%s','%s','%s','%s','%s', '%s','%s','%s','%s',%d,%d,'%s',%d,'%s','%s','%s')",
+ " ('%s','%s','%s','%s','%s', '%s','%s','%s','%s',%ld,%ld,'%s',%ld,'%s','%s','%s')",
table,timestr,clid,cdr->src, cdr->dst, dcontext,channel, dstchannel, lastapp, lastdata,
cdr->duration,cdr->billsec,ast_cdr_disp2str(cdr->disposition),cdr->amaflags, cdr->accountcode, uniqueid, userfield);
Modified: team/oej/moduletest/cdr/cdr_tds.c
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/cdr/cdr_tds.c?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/cdr/cdr_tds.c (original)
+++ team/oej/moduletest/cdr/cdr_tds.c Wed Mar 8 05:16:57 2006
@@ -169,8 +169,8 @@
"%s, " /* start */
"%s, " /* answer */
"%s, " /* end */
- "%d, " /* duration */
- "%d, " /* billsec */
+ "%ld, " /* duration */
+ "%ld, " /* billsec */
"'%s', " /* disposition */
"'%s', " /* amaflags */
"'%s'" /* uniqueid */
Modified: team/oej/moduletest/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/channels/chan_iax2.c?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/channels/chan_iax2.c (original)
+++ team/oej/moduletest/channels/chan_iax2.c Wed Mar 8 05:16:57 2006
@@ -1958,7 +1958,7 @@
ast_cli(fd, " Status : ");
peer_status(peer, status, sizeof(status));
ast_cli(fd, "%s\n",status);
- ast_cli(fd, " Qualify : every %d when OK, every %d when UNREACHABLE (sample smoothing %s)\n", peer->pokefreqok, peer->pokefreqnotok, (peer->smoothing == 1) ? "On" : "Off");
+ ast_cli(fd, " Qualify : every %dms when OK, every %dms when UNREACHABLE (sample smoothing %s)\n", peer->pokefreqok, peer->pokefreqnotok, peer->smoothing ? "On" : "Off");
ast_cli(fd,"\n");
if (ast_test_flag(peer, IAX_TEMPONLY))
destroy_peer(peer);
Modified: team/oej/moduletest/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/channels/chan_sip.c?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/channels/chan_sip.c (original)
+++ team/oej/moduletest/channels/chan_sip.c Wed Mar 8 05:16:57 2006
@@ -1366,12 +1366,12 @@
msg = sip_methods[sipmethod].text;
+ ast_mutex_lock(&p->lock);
cur = p->packets;
while(cur) {
if ((cur->seqno == seqno) && ((ast_test_flag(cur, FLAG_RESPONSE)) == resp) &&
((ast_test_flag(cur, FLAG_RESPONSE)) ||
(!strncasecmp(msg, cur->data, strlen(msg)) && (cur->data[strlen(msg)] < 33)))) {
- ast_mutex_lock(&p->lock);
if (!resp && (seqno == p->pendinginvite)) {
ast_log(LOG_DEBUG, "Acked pending invite %d\n", p->pendinginvite);
p->pendinginvite = 0;
@@ -1388,13 +1388,13 @@
ast_sched_del(sched, cur->retransid);
}
free(cur);
- ast_mutex_unlock(&p->lock);
res = 0;
break;
}
prev = cur;
cur = cur->next;
}
+ ast_mutex_unlock(&p->lock);
ast_log(LOG_DEBUG, "Stopping retransmission on '%s' of %s %d: Match %s\n", p->callid, resp ? "Response" : "Request", seqno, res ? "Not Found" : "Found");
return res;
}
@@ -9245,6 +9245,8 @@
snprintf(buf, len, "%d", peer->call_limit);
} else if (!strcasecmp(colname, "curcalls")) {
snprintf(buf, len, "%d", peer->inUse);
+ } else if (!strcasecmp(colname, "accountcode")) {
+ ast_copy_string(buf, peer->accountcode, len);
} else if (!strcasecmp(colname, "useragent")) {
ast_copy_string(buf, peer->useragent, len);
} else if (!strcasecmp(colname, "mailbox")) {
@@ -9304,6 +9306,7 @@
"- curcalls Current amount of calls \n"
" Only available if call-limit is set\n"
"- language Default language for peer\n"
+ "- accountcode Account code for this peer\n"
"- useragent Current user agent id for peer\n"
"- codec[x] Preferred codec index number 'x' (beginning with zero).\n"
"\n"
@@ -9465,12 +9468,13 @@
break;
case 183: /* Session progress */
sip_cancel_destroy(p);
+ /* Ignore 183 Session progress without SDP */
if (!strcasecmp(get_header(req, "Content-Type"), "application/sdp")) {
process_sdp(p, req);
- }
- if (!ignore && p->owner) {
- /* Queue a progress frame */
- ast_queue_control(p->owner, AST_CONTROL_PROGRESS);
+ if (!ignore && p->owner) {
+ /* Queue a progress frame */
+ ast_queue_control(p->owner, AST_CONTROL_PROGRESS);
+ }
}
break;
case 200: /* 200 OK on invite - someone's answering our call */
@@ -12326,6 +12330,7 @@
global_reg_timeout = DEFAULT_REGISTRATION_TIMEOUT;
global_regattempts_max = 0;
ast_clear_flag(&global_flags, AST_FLAGS_ALL);
+ ast_clear_flag(&global_flags_page2, AST_FLAGS_ALL);
ast_set_flag(&global_flags, SIP_DTMF_RFC2833);
ast_set_flag(&global_flags, SIP_NAT_RFC3581);
ast_set_flag(&global_flags, SIP_CAN_REINVITE);
Modified: team/oej/moduletest/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/configs/zapata.conf.sample?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/configs/zapata.conf.sample (original)
+++ team/oej/moduletest/configs/zapata.conf.sample Wed Mar 8 05:16:57 2006
@@ -431,7 +431,7 @@
;callprogress=yes
;progzone=us
;
-; FXO (FXS signalled) devices must have a timeout to determine whe there was a
+; FXO (FXS signalled) devices must have a timeout to determine if there was a
; hangup before the line was answered. This value can be tweaked to shorten
; how long it takes before Zap considers a non-ringing line to have hungup.
;
Modified: team/oej/moduletest/editline/np/vis.c
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/editline/np/vis.c?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/editline/np/vis.c (original)
+++ team/oej/moduletest/editline/np/vis.c Wed Mar 8 05:16:57 2006
@@ -68,6 +68,7 @@
#endif
#ifdef SOLARIS
+#include <alloca.h>
typedef unsigned int u_int32_t;
#endif
Modified: team/oej/moduletest/editline/readline.c
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/editline/readline.c?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/editline/readline.c (original)
+++ team/oej/moduletest/editline/readline.c Wed Mar 8 05:16:57 2006
@@ -51,6 +51,11 @@
#include <stdlib.h>
#include <unistd.h>
#include <limits.h>
+
+#ifdef SOLARIS
+#include <alloca.h>
+#endif
+
#include "histedit.h"
#include "readline/readline.h"
#include "el.h"
Modified: team/oej/moduletest/include/asterisk/cdr.h
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/include/asterisk/cdr.h?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/include/asterisk/cdr.h (original)
+++ team/oej/moduletest/include/asterisk/cdr.h Wed Mar 8 05:16:57 2006
@@ -74,13 +74,13 @@
struct timeval end;
/*! Total time in system, in seconds */
- int duration;
+ long int duration;
/*! Total time call is up, in seconds */
- int billsec;
+ long int billsec;
/*! What happened to the call */
- int disposition;
+ long int disposition;
/*! What flags to use */
- int amaflags;
+ long int amaflags;
/*! What account number to use */
char accountcode[AST_MAX_ACCOUNT_CODE];
/*! flags */
Modified: team/oej/moduletest/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/res/res_agi.c?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/res/res_agi.c (original)
+++ team/oej/moduletest/res/res_agi.c Wed Mar 8 05:16:57 2006
@@ -90,7 +90,7 @@
"and stdout.\n"
"Returns -1 on hangup (except for DeadAGI) or if application requested\n"
" hangup, or 0 on non-hangup exit. \n"
-"Using 'EAGI' provides enhanced AGI, with incoming audio available out of band"
+"Using 'EAGI' provides enhanced AGI, with incoming audio available out of band\n"
"on file descriptor 3\n\n"
"Use the CLI command 'show agi' to list available agi commands\n";
Modified: team/oej/moduletest/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/res/res_config_odbc.c?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/res/res_config_odbc.c (original)
+++ team/oej/moduletest/res/res_config_odbc.c Wed Mar 8 05:16:57 2006
@@ -103,7 +103,7 @@
newval = va_arg(aq, const char *);
}
va_end(aq);
- res = SQLPrepare(stmt, sql, SQL_NTS);
+ res = SQLPrepare(stmt, (unsigned char *)sql, SQL_NTS);
if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
ast_log(LOG_WARNING, "SQL Prepare failed![%s]\n", sql);
SQLFreeHandle (SQL_HANDLE_STMT, stmt);
@@ -146,7 +146,7 @@
for (x=0;x<colcount;x++) {
rowdata[0] = '\0';
collen = sizeof(coltitle);
- res = SQLDescribeCol(stmt, x + 1, coltitle, sizeof(coltitle), &collen,
+ res = SQLDescribeCol(stmt, x + 1, (unsigned char *)coltitle, sizeof(coltitle), &collen,
&datatype, &colsize, &decimaldigits, &nullable);
if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
ast_log(LOG_WARNING, "SQL Describe Column error!\n[%s]\n\n", sql);
@@ -249,7 +249,7 @@
if (initfield)
snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " ORDER BY %s", initfield);
va_end(aq);
- res = SQLPrepare(stmt, sql, SQL_NTS);
+ res = SQLPrepare(stmt, (unsigned char *)sql, SQL_NTS);
if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
ast_log(LOG_WARNING, "SQL Prepare failed![%s]\n", sql);
SQLFreeHandle (SQL_HANDLE_STMT, stmt);
@@ -300,7 +300,7 @@
for (x=0;x<colcount;x++) {
rowdata[0] = '\0';
collen = sizeof(coltitle);
- res = SQLDescribeCol(stmt, x + 1, coltitle, sizeof(coltitle), &collen,
+ res = SQLDescribeCol(stmt, x + 1, (unsigned char *)coltitle, sizeof(coltitle), &collen,
&datatype, &colsize, &decimaldigits, &nullable);
if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
ast_log(LOG_WARNING, "SQL Describe Column error!\n[%s]\n\n", sql);
@@ -376,7 +376,7 @@
va_end(aq);
snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " WHERE %s=?", keyfield);
- res = SQLPrepare(stmt, sql, SQL_NTS);
+ res = SQLPrepare(stmt, (unsigned char *)sql, SQL_NTS);
if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
ast_log(LOG_WARNING, "SQL Prepare failed![%s]\n", sql);
SQLFreeHandle (SQL_HANDLE_STMT, stmt);
Modified: team/oej/moduletest/res/res_monitor.c
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/res/res_monitor.c?rev=12461&r1=12460&r2=12461&view=diff
==============================================================================
--- team/oej/moduletest/res/res_monitor.c (original)
+++ team/oej/moduletest/res/res_monitor.c Wed Mar 8 05:16:57 2006
@@ -535,7 +535,7 @@
return 0;
}
ast_mutex_unlock(&c->lock);
- astman_send_ack(s, m, "Stopped monitoring channel");
+ astman_send_ack(s, m, "Changed monitor filename");
return 0;
}
More information about the asterisk-commits
mailing list