[asterisk-commits] oej: branch group/pine-cdr-pgsql-status-trunk r287303 - in /team/group/pine-c...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Sep 17 05:54:53 CDT 2010
Author: oej
Date: Fri Sep 17 05:54:48 2010
New Revision: 287303
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287303
Log:
Resetting stuff
Modified:
team/group/pine-cdr-pgsql-status-trunk/ (props changed)
team/group/pine-cdr-pgsql-status-trunk/UPGRADE-1.8.txt
team/group/pine-cdr-pgsql-status-trunk/apps/app_queue.c
team/group/pine-cdr-pgsql-status-trunk/channels/chan_sip.c
team/group/pine-cdr-pgsql-status-trunk/configs/queues.conf.sample
team/group/pine-cdr-pgsql-status-trunk/contrib/init.d/rc.debian.asterisk
team/group/pine-cdr-pgsql-status-trunk/main/cdr.c
team/group/pine-cdr-pgsql-status-trunk/main/indications.c
team/group/pine-cdr-pgsql-status-trunk/main/pbx.c
team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_caldav.c
team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_ews.c
team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_exchange.c
team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_icalendar.c
team/group/pine-cdr-pgsql-status-trunk/res/res_srtp.c
Propchange: team/group/pine-cdr-pgsql-status-trunk/
------------------------------------------------------------------------------
--- automerge (original)
+++ automerge Fri Sep 17 05:54:48 2010
@@ -1,1 +1,1 @@
-Note to myself: Always use fruit or frog names on branches.
+http://www.codename-pineapple.org/
Propchange: team/group/pine-cdr-pgsql-status-trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Propchange: team/group/pine-cdr-pgsql-status-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Sep 17 05:54:48 2010
@@ -1,1 +1,1 @@
-/trunk:1-287021
+/trunk:1-287302
Modified: team/group/pine-cdr-pgsql-status-trunk/UPGRADE-1.8.txt
URL: http://svnview.digium.com/svn/asterisk/team/group/pine-cdr-pgsql-status-trunk/UPGRADE-1.8.txt?view=diff&rev=287303&r1=287302&r2=287303
==============================================================================
--- team/group/pine-cdr-pgsql-status-trunk/UPGRADE-1.8.txt (original)
+++ team/group/pine-cdr-pgsql-status-trunk/UPGRADE-1.8.txt Fri Sep 17 05:54:48 2010
@@ -19,6 +19,9 @@
===========================================================
From 1.6.2 to 1.8:
+
+* The default value for 'autofill' and 'shared_lastcall' in queues.conf has
+ been changed to 'yes'.
* The default value for the alwaysauthreject option in sip.conf has been changed
from "no" to "yes".
Modified: team/group/pine-cdr-pgsql-status-trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pine-cdr-pgsql-status-trunk/apps/app_queue.c?view=diff&rev=287303&r1=287302&r2=287303
==============================================================================
--- team/group/pine-cdr-pgsql-status-trunk/apps/app_queue.c (original)
+++ team/group/pine-cdr-pgsql-status-trunk/apps/app_queue.c Fri Sep 17 05:54:48 2010
@@ -760,13 +760,13 @@
static int use_weight = 0;
/*! \brief queues.conf [general] option */
-static int autofill_default = 0;
+static int autofill_default = 1;
/*! \brief queues.conf [general] option */
static int montype_default = 0;
/*! \brief queues.conf [general] option */
-static int shared_lastcall = 0;
+static int shared_lastcall = 1;
/*! \brief Subscription to device state change events */
static struct ast_event_sub *device_state_sub;
Modified: team/group/pine-cdr-pgsql-status-trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pine-cdr-pgsql-status-trunk/channels/chan_sip.c?view=diff&rev=287303&r1=287302&r2=287303
==============================================================================
--- team/group/pine-cdr-pgsql-status-trunk/channels/chan_sip.c (original)
+++ team/group/pine-cdr-pgsql-status-trunk/channels/chan_sip.c Fri Sep 17 05:54:48 2010
@@ -5727,6 +5727,8 @@
return "502 Bad Gateway";
case AST_CAUSE_BEARERCAPABILITY_NOTAVAIL: /* Can't find codec to connect to host */
return "488 Not Acceptable Here";
+ case AST_CAUSE_INTERWORKING: /* Unspecified Interworking issues */
+ return "500 Network error";
case AST_CAUSE_NOTDEFINED:
default:
Modified: team/group/pine-cdr-pgsql-status-trunk/configs/queues.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/group/pine-cdr-pgsql-status-trunk/configs/queues.conf.sample?view=diff&rev=287303&r1=287302&r2=287303
==============================================================================
--- team/group/pine-cdr-pgsql-status-trunk/configs/queues.conf.sample (original)
+++ team/group/pine-cdr-pgsql-status-trunk/configs/queues.conf.sample Fri Sep 17 05:54:48 2010
@@ -10,7 +10,7 @@
persistentmembers = yes
;
; AutoFill Behavior
-; The old/current behavior of the queue has a serial type behavior
+; The old behavior of the queue (autofill=no) is to have a serial type behavior
; in that the queue will make all waiting callers wait in the queue
; even if there is more than one available member ready to take
; calls until the head caller is connected with the member they
@@ -23,10 +23,9 @@
; no more available members or no more waiting callers. This is
; probably more along the lines of how a queue should work and
; in most cases, you will want to enable this behavior. If you
-; do not specify or comment out this option, it will default to no
-; to keep backward compatibility with the old behavior.
-;
-autofill = yes
+; do not specify or comment out this option, it will default to yes.
+;
+;autofill = no
;
; Monitor Type
; By setting monitor-type = MixMonitor, when specifying monitor-format
@@ -56,11 +55,11 @@
; example: Queue(dave,t,,,45)
; shared_lastcall will make the lastcall and calls received be the same in
-; members logged in more than one queue.
-; This is useful to make the queue respect the wrapuptime of another queue
-; for a shared member
-;
-shared_lastcall=no
+; members logged in more than one queue. This is useful to make the queue
+; respect the wrapuptime of another queue for a shared member.
+; The default value is yes.
+;
+;shared_lastcall=no
;
;[markq]
;
Modified: team/group/pine-cdr-pgsql-status-trunk/contrib/init.d/rc.debian.asterisk
URL: http://svnview.digium.com/svn/asterisk/team/group/pine-cdr-pgsql-status-trunk/contrib/init.d/rc.debian.asterisk?view=diff&rev=287303&r1=287302&r2=287303
==============================================================================
--- team/group/pine-cdr-pgsql-status-trunk/contrib/init.d/rc.debian.asterisk (original)
+++ team/group/pine-cdr-pgsql-status-trunk/contrib/init.d/rc.debian.asterisk Fri Sep 17 05:54:48 2010
@@ -54,7 +54,7 @@
. /lib/lsb/init-functions
# Allow configuration overrides in /etc/default/asterisk
-CONFIG0=`readlink $0`
+CONFIG0=`readlink $0 || :` # readlink returns 1 when something isn't a symlink
if [ "$CONFIG0" = "" ]; then
CONFIGFILE=/etc/default/`basename $0`
else
Modified: team/group/pine-cdr-pgsql-status-trunk/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pine-cdr-pgsql-status-trunk/main/cdr.c?view=diff&rev=287303&r1=287302&r2=287303
==============================================================================
--- team/group/pine-cdr-pgsql-status-trunk/main/cdr.c (original)
+++ team/group/pine-cdr-pgsql-status-trunk/main/cdr.c Fri Sep 17 05:54:48 2010
@@ -402,7 +402,7 @@
int ast_cdr_serialize_variables(struct ast_cdr *cdr, struct ast_str **buf, char delim, char sep, int recur)
{
struct ast_var_t *variables;
- const char *var, *val;
+ const char *var;
char *tmp;
char workspace[256];
int total = 0, x = 0, i;
@@ -414,16 +414,16 @@
ast_str_append(buf, 0, "\n");
AST_LIST_TRAVERSE(&cdr->varshead, variables, entries) {
- if (variables &&
- (var = ast_var_name(variables)) && (val = ast_var_value(variables)) &&
- !ast_strlen_zero(var) && !ast_strlen_zero(val)) {
- if (ast_str_append(buf, 0, "level %d: %s%c%s%c", x, var, delim, val, sep) < 0) {
- ast_log(LOG_ERROR, "Data Buffer Size Exceeded!\n");
- break;
- } else
- total++;
- } else
+ if (!(var = ast_var_name(variables))) {
+ continue;
+ }
+
+ if (ast_str_append(buf, 0, "level %d: %s%c%s%c", x, var, delim, S_OR(ast_var_value(variables), ""), sep) < 0) {
+ ast_log(LOG_ERROR, "Data Buffer Size Exceeded!\n");
break;
+ }
+
+ total++;
}
for (i = 0; cdr_readonly_vars[i]; i++) {
Modified: team/group/pine-cdr-pgsql-status-trunk/main/indications.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pine-cdr-pgsql-status-trunk/main/indications.c?view=diff&rev=287303&r1=287302&r2=287303
==============================================================================
--- team/group/pine-cdr-pgsql-status-trunk/main/indications.c (original)
+++ team/group/pine-cdr-pgsql-status-trunk/main/indications.c Fri Sep 17 05:54:48 2010
@@ -416,12 +416,12 @@
return ao2_iterator_init(ast_tone_zones, 0);
}
-/* Set global indication country */
+/*! \brief Set global indication country
+ If no country is specified or we are unable to find the zone, then return not found */
static int ast_set_indication_country(const char *country)
{
struct ast_tone_zone *zone = NULL;
- /* If no country is specified or we are unable to find the zone, then return not found */
if (ast_strlen_zero(country) || !(zone = ast_get_indication_zone(country))) {
return -1;
}
@@ -440,7 +440,7 @@
return 0;
}
-/* locate ast_tone_zone, given the country. if country == NULL, use the default country */
+/*! \brief locate ast_tone_zone, given the country. if country == NULL, use the default country */
struct ast_tone_zone *ast_get_indication_zone(const char *country)
{
struct ast_tone_zone *tz = NULL;
@@ -530,7 +530,7 @@
}
}
-/* add a new country, if country exists, it will be replaced. */
+/*! \brief add a new country, if country exists, it will be replaced. */
static int ast_register_indication_country(struct ast_tone_zone *zone)
{
ao2_lock(ast_tone_zones);
@@ -546,7 +546,7 @@
return 0;
}
-/* remove an existing country and all its indications, country must exist. */
+/*! \brief remove an existing country and all its indications, country must exist. */
static int ast_unregister_indication_country(const char *country)
{
struct ast_tone_zone *tz = NULL;
@@ -610,7 +610,7 @@
return 0;
}
-/* remove an existing country's indication. Both country and indication must exist */
+/*! \brief remove an existing country's indication. Both country and indication must exist */
static int ast_unregister_indication(struct ast_tone_zone *zone, const char *indication)
{
struct ast_tone_zone_sound *ts;
@@ -895,7 +895,8 @@
return res;
}
-/*!
+/*!\brief
+ *
* \note This is called with the tone zone locked.
*/
static void store_tone_zone_ring_cadence(struct ast_tone_zone *zone, const char *val)
@@ -994,7 +995,7 @@
return 0;
}
-/*!
+/*! \brief
* Mark the zone and its tones before parsing configuration. We will use this
* to know what to remove after configuration is parsed.
*/
@@ -1016,7 +1017,7 @@
return 0;
}
-/*!
+/*! \brief
* Prune tones no longer in the configuration, and have the tone zone unlinked
* if it is no longer in the configuration at all.
*/
Modified: team/group/pine-cdr-pgsql-status-trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pine-cdr-pgsql-status-trunk/main/pbx.c?view=diff&rev=287303&r1=287302&r2=287303
==============================================================================
--- team/group/pine-cdr-pgsql-status-trunk/main/pbx.c (original)
+++ team/group/pine-cdr-pgsql-status-trunk/main/pbx.c Fri Sep 17 05:54:48 2010
@@ -4225,12 +4225,10 @@
AST_RWLIST_TRAVERSE(&hints, hint, list) {
struct ast_state_cb *cblist;
- char buf[AST_MAX_EXTENSION];
- char *parse = buf;
+ char *parse = ast_strdupa(ast_get_extension_app(hint->exten));
char *cur;
int state;
- ast_copy_string(buf, ast_get_extension_app(hint->exten), sizeof(buf));
while ( (cur = strsep(&parse, "&")) ) {
if (!strcasecmp(cur, sc->dev)) {
break;
Modified: team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_caldav.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_caldav.c?view=diff&rev=287303&r1=287302&r2=287303
==============================================================================
--- team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_caldav.c (original)
+++ team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_caldav.c Fri Sep 17 05:54:48 2010
@@ -34,6 +34,7 @@
#include <ne_uri.h>
#include <ne_request.h>
#include <ne_auth.h>
+#include <ne_redirect.h>
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
@@ -643,6 +644,7 @@
}
pvt->session = ne_session_create(pvt->uri.scheme, pvt->uri.host, pvt->uri.port);
+ ne_redirect_register(pvt->session);
ne_set_server_auth(pvt->session, auth_credentials, pvt);
if (!strcasecmp(pvt->uri.scheme, "https")) {
ne_ssl_trust_default_ca(pvt->session);
Modified: team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_ews.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_ews.c?view=diff&rev=287303&r1=287302&r2=287303
==============================================================================
--- team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_ews.c (original)
+++ team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_ews.c Fri Sep 17 05:54:48 2010
@@ -35,6 +35,7 @@
#include <ne_xml.h>
#include <ne_xmlreq.h>
#include <ne_utils.h>
+#include <ne_redirect.h>
#include "asterisk/module.h"
#include "asterisk/calendar.h"
@@ -197,10 +198,11 @@
return NE_XML_ABORT;
}
- ast_debug(3, "EWS: %d calendar items to load\n", items);
+ ast_debug(3, "EWS: %u calendar items to load\n", items);
ctx->pvt->items = items;
if (items < 1) {
/* Stop processing XML if there are no events */
+ ast_calendar_merge_events(ctx->pvt->owner, ctx->pvt->events);
return NE_XML_DECLINE;
}
return 1;
@@ -527,7 +529,6 @@
if (ret != NE_OK) { /* Error handling */
ast_log(LOG_WARNING, "Unable to communicate with Exchange Web Service at '%s': %s\n", ctx->pvt->url, ne_get_error(ctx->pvt->session));
ne_request_destroy(req);
- ast_free(request);
ne_xml_destroy(parser);
return -1;
}
@@ -838,6 +839,7 @@
ast_debug(3, "secret = %s\n", pvt->secret);
pvt->session = ne_session_create(pvt->uri.scheme, pvt->uri.host, pvt->uri.port);
+ ne_redirect_register(pvt->session);
ne_set_server_auth(pvt->session, auth_credentials, pvt);
ne_set_useragent(pvt->session, "Asterisk");
Modified: team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_exchange.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_exchange.c?view=diff&rev=287303&r1=287302&r2=287303
==============================================================================
--- team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_exchange.c (original)
+++ team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_exchange.c Fri Sep 17 05:54:48 2010
@@ -34,6 +34,7 @@
#include <ne_uri.h>
#include <ne_request.h>
#include <ne_auth.h>
+#include <ne_redirect.h>
#include <iksemel.h>
#include "asterisk/module.h"
@@ -693,6 +694,7 @@
}
pvt->session = ne_session_create(pvt->uri.scheme, pvt->uri.host, pvt->uri.port);
+ ne_redirect_register(pvt->session);
ne_set_server_auth(pvt->session, auth_credentials, pvt);
if (!strcasecmp(pvt->uri.scheme, "https")) {
ne_ssl_trust_default_ca(pvt->session);
Modified: team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_icalendar.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_icalendar.c?view=diff&rev=287303&r1=287302&r2=287303
==============================================================================
--- team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_icalendar.c (original)
+++ team/group/pine-cdr-pgsql-status-trunk/res/res_calendar_icalendar.c Fri Sep 17 05:54:48 2010
@@ -33,6 +33,7 @@
#include <ne_uri.h>
#include <ne_request.h>
#include <ne_auth.h>
+#include <ne_redirect.h>
#include "asterisk/module.h"
#include "asterisk/calendar.h"
@@ -420,6 +421,7 @@
}
pvt->session = ne_session_create(pvt->uri.scheme, pvt->uri.host, pvt->uri.port);
+ ne_redirect_register(pvt->session);
ne_set_server_auth(pvt->session, auth_credentials, pvt);
if (!strcasecmp(pvt->uri.scheme, "https")) {
ne_ssl_trust_default_ca(pvt->session);
Modified: team/group/pine-cdr-pgsql-status-trunk/res/res_srtp.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pine-cdr-pgsql-status-trunk/res/res_srtp.c?view=diff&rev=287303&r1=287302&r2=287303
==============================================================================
--- team/group/pine-cdr-pgsql-status-trunk/res/res_srtp.c (original)
+++ team/group/pine-cdr-pgsql-status-trunk/res/res_srtp.c Fri Sep 17 05:54:48 2010
@@ -343,7 +343,8 @@
}
if (res != err_status_ok && res != err_status_replay_fail ) {
- ast_debug(1, "SRTP unprotect: %s\n", srtp_errstr(res));
+ ast_log(LOG_WARNING, "SRTP unprotect: %s\n", srtp_errstr(res));
+ errno = EAGAIN;
return -1;
}
@@ -361,7 +362,7 @@
memcpy(srtp->buf, *buf, *len);
if ((res = rtcp ? srtp_protect_rtcp(srtp->session, srtp->buf, len) : srtp_protect(srtp->session, srtp->buf, len)) != err_status_ok && res != err_status_replay_fail) {
- ast_debug(1, "SRTP protect: %s\n", srtp_errstr(res));
+ ast_log(LOG_WARNING, "SRTP protect: %s\n", srtp_errstr(res));
return -1;
}
More information about the asterisk-commits
mailing list