[asterisk-commits] seanbright: branch group/1.6.1-maintenance r266141 - in /team/group/1.6.1-mai...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed May 26 15:33:19 CDT 2010
Author: seanbright
Date: Wed May 26 15:33:16 2010
New Revision: 266141
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=266141
Log:
Merged revisions 265611,265698,265747,265894,265923 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r265611 | mnicholson | 2010-05-25 13:00:11 -0400 (Tue, 25 May 2010) | 15 lines
Merged revisions 265610 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r265610 | mnicholson | 2010-05-25 11:48:19 -0500 (Tue, 25 May 2010) | 8 lines
Don't mark the cdr records of unanswered queue calls with "NOANSWER". This restores the behavior prior to r258670.
(closes issue #17334)
Reported by: jvandal
Patches:
queue-cdr-fixes1.diff uploaded by mnicholson (license 96)
Tested by: aragon, jvandal
........
................
r265698 | mmichelson | 2010-05-25 16:59:04 -0400 (Tue, 25 May 2010) | 12 lines
Properly use peer's outboundproxy for outbound REGISTERs.
The logic used in transmit_register to get the outboundproxy for a peer
was flawed since this value would be overridden shortly afterwards when
create_addr was called.
In addition, this also fixes some logic used when parsing users.conf so
that the peer name is placed in the internally-generated register string
so that an outboundproxy set in the Asterisk GUI will be used for outbound
REGISTERs.
................
r265747 | tilghman | 2010-05-25 20:29:40 -0400 (Tue, 25 May 2010) | 8 lines
Use configure to determine the prefixes and include directories properly.
This ensures cross-platform compatibility, even among Linux distributions,
which don't always put headers in the same place.
(closes issue #17391)
Reported by: loloski
................
r265894 | tilghman | 2010-05-26 12:14:48 -0400 (Wed, 26 May 2010) | 8 lines
Construct socket name, according to the Postgres docs, and document as such.
(closes issue #17392)
Reported by: dps
Patches:
20100525__issue17392.diff.txt uploaded by tilghman (license 14)
Tested by: dps
................
r265923 | tilghman | 2010-05-26 12:23:28 -0400 (Wed, 26 May 2010) | 14 lines
Merged revisions 265910 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r265910 | tilghman | 2010-05-26 11:21:00 -0500 (Wed, 26 May 2010) | 7 lines
Not finding rows in the DB does not rise to the level of a warning.
(closes issue #17062)
Reported by: drookie
Patches:
20100525__issue17062.diff.txt uploaded by tilghman (license 14)
........
................
Modified:
team/group/1.6.1-maintenance/ (props changed)
team/group/1.6.1-maintenance/apps/app_queue.c
team/group/1.6.1-maintenance/channels/chan_sip.c
team/group/1.6.1-maintenance/configs/res_pgsql.conf.sample
team/group/1.6.1-maintenance/configure
team/group/1.6.1-maintenance/configure.ac
team/group/1.6.1-maintenance/include/asterisk/autoconfig.h.in
team/group/1.6.1-maintenance/pbx/pbx_lua.c
Propchange: team/group/1.6.1-maintenance/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: team/group/1.6.1-maintenance/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/group/1.6.1-maintenance/apps/app_queue.c?view=diff&rev=266141&r1=266140&r2=266141
==============================================================================
--- team/group/1.6.1-maintenance/apps/app_queue.c (original)
+++ team/group/1.6.1-maintenance/apps/app_queue.c Wed May 26 15:33:16 2010
@@ -3743,7 +3743,6 @@
ast_log(LOG_NOTICE, "Caller was about to talk to agent on %s but the caller hungup.\n", peer->name);
ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "ABANDON", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
record_abandoned(qe);
- ast_cdr_noanswer(qe->chan->cdr);
ast_hangup(peer);
ao2_ref(member, -1);
return -1;
@@ -4971,7 +4970,6 @@
/* Leave if we have exceeded our queuetimeout */
if (qe.expire && (time(NULL) >= qe.expire)) {
record_abandoned(&qe);
- ast_cdr_noanswer(qe.chan->cdr);
reason = QUEUE_TIMEOUT;
res = 0;
ast_queue_log(args.queuename, chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d|%d|%ld",
@@ -4995,7 +4993,6 @@
/* Leave if we have exceeded our queuetimeout */
if (qe.expire && (time(NULL) >= qe.expire)) {
record_abandoned(&qe);
- ast_cdr_noanswer(qe.chan->cdr);
reason = QUEUE_TIMEOUT;
res = 0;
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHTIMEOUT", "%d", qe.pos);
@@ -5096,7 +5093,6 @@
if (res < 0) {
if (!qe.handled) {
record_abandoned(&qe);
- ast_cdr_noanswer(qe.chan->cdr);
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON",
"%d|%d|%ld", qe.pos, qe.opos,
(long) time(NULL) - qe.start);
Modified: team/group/1.6.1-maintenance/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/1.6.1-maintenance/channels/chan_sip.c?view=diff&rev=266141&r1=266140&r2=266141
==============================================================================
--- team/group/1.6.1-maintenance/channels/chan_sip.c (original)
+++ team/group/1.6.1-maintenance/channels/chan_sip.c Wed May 26 15:33:16 2010
@@ -10834,23 +10834,12 @@
if (p->do_history)
append_history(p, "RegistryInit", "Account: %s@%s", r->username, r->hostname);
- if (!ast_strlen_zero(r->peername)) {
- if (!(peer = find_peer(r->peername, NULL, 1, FINDPEERS, FALSE, 0))) {
- ast_log(LOG_WARNING, "Could not find peer %s in transmit_register\n", r->peername);
- } else {
- p->peerauth = peer->auth;
- }
- }
- ref_proxy(p, obproxy_get(p, peer)); /* it is ok to pass a NULL peer into obproxy_get() */
- if (peer) {
- unref_peer(peer, "transmit_registration: from find_peer operation");
- }
/* Use port number specified if no SRV record was found */
if (!r->us.sin_port && r->portno)
r->us.sin_port = htons(r->portno);
/* Find address to hostname */
- if (create_addr(p, r->hostname, &r->us, 0)) {
+ if (create_addr(p, S_OR(r->peername, r->hostname), &r->us, 0)) {
/* we have what we hope is a temporary network error,
* probably DNS. We need to reschedule a registration try */
dialog_unlink_all(p, TRUE, TRUE);
@@ -24002,14 +23991,14 @@
if (!ast_strlen_zero(username) && !ast_strlen_zero(host)) {
if (!ast_strlen_zero(secret)) {
if (!ast_strlen_zero(authuser)) {
- snprintf(tmp, sizeof(tmp), "%s:%s:%s@%s/%s", username, secret, authuser, host, contact);
+ snprintf(tmp, sizeof(tmp), "%s?%s:%s:%s@%s/%s", cat, username, secret, authuser, host, contact);
} else {
- snprintf(tmp, sizeof(tmp), "%s:%s@%s/%s", username, secret, host, contact);
+ snprintf(tmp, sizeof(tmp), "%s?%s:%s@%s/%s", cat, username, secret, host, contact);
}
} else if (!ast_strlen_zero(authuser)) {
- snprintf(tmp, sizeof(tmp), "%s::%s@%s/%s", username, authuser, host, contact);
+ snprintf(tmp, sizeof(tmp), "%s?%s::%s@%s/%s", cat, username, authuser, host, contact);
} else {
- snprintf(tmp, sizeof(tmp), "%s@%s/%s", username, host, contact);
+ snprintf(tmp, sizeof(tmp), "%s?%s@%s/%s", cat, username, host, contact);
}
if (sip_register(tmp, 0) == 0)
registry_count++;
Modified: team/group/1.6.1-maintenance/configs/res_pgsql.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/group/1.6.1-maintenance/configs/res_pgsql.conf.sample?view=diff&rev=266141&r1=266140&r2=266141
==============================================================================
--- team/group/1.6.1-maintenance/configs/res_pgsql.conf.sample (original)
+++ team/group/1.6.1-maintenance/configs/res_pgsql.conf.sample Wed May 26 15:33:16 2010
@@ -13,6 +13,13 @@
dbuser=asterisk
dbpass=password
;
+; dbsock is specified as the directory where the socket file may be found. The
+; actual socket is constructed as a combination of dbsock and dbport. For
+; example, the values of '/tmp' and '5432', respectively, will specify a socket
+; file of '/tmp/.s.PGSQL.5432'.
+;
+;dbsock=/tmp
+;
; requirements - At startup, each realtime family will make requirements
; on the backend. There are several strategies for handling requirements:
; warn - Warn if the required column does not exist.
Modified: team/group/1.6.1-maintenance/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/group/1.6.1-maintenance/configure.ac?view=diff&rev=266141&r1=266140&r2=266141
==============================================================================
--- team/group/1.6.1-maintenance/configure.ac (original)
+++ team/group/1.6.1-maintenance/configure.ac Wed May 26 15:33:16 2010
@@ -803,6 +803,11 @@
AST_EXT_LIB_CHECK([ICONV], [iconv], [iconv_open], [iconv.h])
# Some versions of Linux package iconv in glibc
AST_EXT_LIB_CHECK([ICONV], [c], [iconv_close], [iconv.h])
+
+if test x"${PBX_ICAL}" = x1; then
+ ICAL_INCLUDE+=-I/usr/include/libical
+fi
+AST_EXT_LIB_CHECK([ICAL], [ical], [icaltimezone_new], [ical.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}])
AST_EXT_LIB_CHECK([IKSEMEL], [iksemel], [iks_start_sasl], [iksemel.h])
@@ -1490,7 +1495,11 @@
AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h], [-lm])
if test "x${PBX_LUA}" = "x1" ; then
- AC_DEFINE_UNQUOTED([LUA51_PREFIX], [1], [Define to 1 if lua is found with a lua5.1 prefix])
+ if test x"${LUA_DIR}" = x; then
+ LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1"
+ else
+ LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1"
+ fi
fi
# Some distributions (like SuSE) remove the 5.1 suffix.
Modified: team/group/1.6.1-maintenance/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/group/1.6.1-maintenance/include/asterisk/autoconfig.h.in?view=diff&rev=266141&r1=266140&r2=266141
==============================================================================
--- team/group/1.6.1-maintenance/include/asterisk/autoconfig.h.in (original)
+++ team/group/1.6.1-maintenance/include/asterisk/autoconfig.h.in Wed May 26 15:33:16 2010
@@ -872,9 +872,6 @@
/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
slash. */
#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
-
-/* Define to 1 if lua is found with a lua5.1 prefix */
-#undef LUA51_PREFIX
/* Build chan_misdn for mISDN 1.2 or later. */
#undef MISDN_1_2
Modified: team/group/1.6.1-maintenance/pbx/pbx_lua.c
URL: http://svnview.digium.com/svn/asterisk/team/group/1.6.1-maintenance/pbx/pbx_lua.c?view=diff&rev=266141&r1=266140&r2=266141
==============================================================================
--- team/group/1.6.1-maintenance/pbx/pbx_lua.c (original)
+++ team/group/1.6.1-maintenance/pbx/pbx_lua.c Wed May 26 15:33:16 2010
@@ -42,15 +42,9 @@
#include "asterisk/paths.h"
#include "asterisk/hashtab.h"
-#ifdef LUA51_PREFIX
-#include <lua5.1/lua.h>
-#include <lua5.1/lauxlib.h>
-#include <lua5.1/lualib.h>
-#else
#include <lua.h>
#include <lauxlib.h>
#include <lualib.h>
-#endif
static char *config = "extensions.lua";
static char *registrar = "pbx_lua";
More information about the asterisk-commits
mailing list