[svn-commits] murf: branch group/newcdr r115885 - in /team/group/newcdr: ./ channels/ contr...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue May 13 13:37:00 CDT 2008
Author: murf
Date: Tue May 13 13:37:00 2008
New Revision: 115885
URL: http://svn.digium.com/view/asterisk?view=rev&rev=115885
Log:
Merged revisions 115507,115509,115513,115515,115518-115519,115521,115523,115525,115535,115537 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r115507 | file | 2008-05-07 07:41:25 -0600 (Wed, 07 May 2008) | 4 lines
Remove redundant header getting.
(closes issue #12597)
Reported by: hooi
................
r115509 | tilghman | 2008-05-07 07:49:15 -0600 (Wed, 07 May 2008) | 6 lines
Update typos in description fields
(closes issue #12598)
Reported by: suretec
Patches:
asterisk_schema_changes.patch uploaded by suretec (license 70)
................
r115513 | russell | 2008-05-07 11:28:19 -0600 (Wed, 07 May 2008) | 19 lines
Merged revisions 115512 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r115512 | russell | 2008-05-07 11:24:09 -0500 (Wed, 07 May 2008) | 11 lines
Merged revisions 115511 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r115511 | russell | 2008-05-07 11:22:49 -0500 (Wed, 07 May 2008) | 3 lines
Remove remnants of dlinkedlists. I didn't actually use them in the final version
of my IAX2 improvements.
........
................
................
r115515 | russell | 2008-05-07 11:38:36 -0600 (Wed, 07 May 2008) | 2 lines
re-add dlinkedlists.h to trunk, oops!
................
r115518 | russell | 2008-05-07 12:17:43 -0600 (Wed, 07 May 2008) | 12 lines
Blocked revisions 115517 via svnmerge
........
r115517 | russell | 2008-05-07 13:17:19 -0500 (Wed, 07 May 2008) | 5 lines
Track peer references when stored in the sip_pvt struct as the peer related to
a qualify ping or a subscription. This fixes some realtime related crashes.
(closes issue #12588)
(closes issue #12555)
........
................
r115519 | russell | 2008-05-07 12:24:51 -0600 (Wed, 07 May 2008) | 2 lines
Let chan_h323 build in dev mode
................
r115521 | russell | 2008-05-07 12:30:12 -0600 (Wed, 07 May 2008) | 7 lines
Use the default that the log output claims will be used for the basedn
(closes issue #12599)
Reported by: suretec
Patches:
12599.patch uploaded by juggie (license 24)
................
r115523 | russell | 2008-05-07 12:33:50 -0600 (Wed, 07 May 2008) | 6 lines
Only save a password if a username exists.
(closes issue #12600)
Reported By: suretec
Patch by me
................
r115525 | tilghman | 2008-05-07 12:40:21 -0600 (Wed, 07 May 2008) | 2 lines
Don't free the object on destroy, as astobj2 takes care of that for you
................
r115535 | tilghman | 2008-05-07 14:22:09 -0600 (Wed, 07 May 2008) | 2 lines
Advance to next sounds release
................
r115537 | russell | 2008-05-07 15:11:33 -0600 (Wed, 07 May 2008) | 10 lines
Fix up a problem that was introduced into the scheduler when it was converted
to use doubly linked lists. The schedule() function had an optimization that
had it try to guess which direction would be better for the traversal to insert
the task into the scheduler queue. However, if the code chose the path where
it traversed the queue in reverse, and the result was that the task should be
at the head of the queue, then the code would actually put it at the tail,
instead.
(Problem found by bbryant, debugged and fixed by bbryant and me)
................
Modified:
team/group/newcdr/ (props changed)
team/group/newcdr/channels/chan_h323.c
team/group/newcdr/channels/chan_iax2.c
team/group/newcdr/channels/chan_sip.c
team/group/newcdr/contrib/scripts/asterisk.ldap-schema
team/group/newcdr/contrib/scripts/asterisk.ldif
team/group/newcdr/include/asterisk/dlinkedlists.h (props changed)
team/group/newcdr/main/sched.c
team/group/newcdr/res/res_config_ldap.c
team/group/newcdr/res/res_odbc.c
team/group/newcdr/sounds/Makefile
Propchange: team/group/newcdr/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/group/newcdr/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/newcdr/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue May 13 13:37:00 2008
@@ -1,1 +1,1 @@
-/trunk:1-115477
+/trunk:1-115539
Modified: team/group/newcdr/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/channels/chan_h323.c?view=diff&rev=115885&r1=115884&r2=115885
==============================================================================
--- team/group/newcdr/channels/chan_h323.c (original)
+++ team/group/newcdr/channels/chan_h323.c Tue May 13 13:37:00 2008
@@ -1548,11 +1548,11 @@
struct oh323_peer *peer;
struct ast_variable *var;
struct ast_variable *tmp;
- const char *addr;
+ const char *addr = NULL;
/* First check on peer name */
if (peername)
- var = ast_load_realtime("h323", "name", peername, addr = NULL);
+ var = ast_load_realtime("h323", "name", peername, NULL);
else if (sin) /* Then check on IP address for dynamic peers */
var = ast_load_realtime("h323", "host", addr = ast_inet_ntoa(sin->sin_addr), NULL);
else
Modified: team/group/newcdr/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/channels/chan_iax2.c?view=diff&rev=115885&r1=115884&r2=115885
==============================================================================
--- team/group/newcdr/channels/chan_iax2.c (original)
+++ team/group/newcdr/channels/chan_iax2.c Tue May 13 13:37:00 2008
@@ -87,7 +87,6 @@
#include "asterisk/netsock.h"
#include "asterisk/stringfields.h"
#include "asterisk/linkedlists.h"
-#include "asterisk/dlinkedlists.h"
#include "asterisk/event.h"
#include "asterisk/astobj2.h"
@@ -640,8 +639,6 @@
int frames_dropped;
/*! received frame count: (just for stats) */
int frames_received;
-
- AST_DLLIST_ENTRY(chan_iax2_pvt) entry;
};
/*!
Modified: team/group/newcdr/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/channels/chan_sip.c?view=diff&rev=115885&r1=115884&r2=115885
==============================================================================
--- team/group/newcdr/channels/chan_sip.c (original)
+++ team/group/newcdr/channels/chan_sip.c Tue May 13 13:37:00 2008
@@ -6170,11 +6170,6 @@
const char *to = get_header(req, "To");
const char *cseq = get_header(req, "Cseq");
struct sip_pvt *sip_pvt_ptr;
-
- callid = get_header(req, "Call-ID");
- from = get_header(req, "From");
- to = get_header(req, "To");
- cseq = get_header(req, "Cseq");
/* Call-ID, to, from and Cseq are required by RFC 3261. (Max-forwards and via too - ignored now) */
/* get_header always returns non-NULL so we must use ast_strlen_zero() */
Modified: team/group/newcdr/contrib/scripts/asterisk.ldap-schema
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/contrib/scripts/asterisk.ldap-schema?view=diff&rev=115885&r1=115884&r2=115885
==============================================================================
--- team/group/newcdr/contrib/scripts/asterisk.ldap-schema (original)
+++ team/group/newcdr/contrib/scripts/asterisk.ldap-schema Tue May 13 13:37:00 2008
@@ -1,5 +1,12 @@
#
-# Copyright (c) 2007 Suretec Systems Ltd. - <http://www.suretecsystems.com/>
+# Copyright (c) 2007-2008 Suretec Systems Ltd. - <http://www.suretecsystems.com/>
+#
+# Version: 3.1.5
+#
+# Changes:
+# - Fixed wrong DESC - 07/05/2008
+#
+# Author: Gavin Henry - <ghenry at suretecsystems.com>
#
# Asterisk LDAP Schema
#
@@ -224,28 +231,28 @@
attributetype ( AstAccountExpirationTimestamp
NAME 'AstAccountExpirationTimestamp'
- DESC 'Asterisk Account Allowed Codec'
+ DESC 'Asterisk Account Expiration Timestamp'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
attributetype ( AstAccountRegistrationContext
NAME 'AstAccountRegistrationContext'
- DESC 'Asterisk Account AMA Flags'
+ DESC 'Asterisk Account Registration Context'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
attributetype ( AstAccountRegistrationExten
NAME 'AstAccountRegistrationExten'
- DESC 'Asterisk Account AMA Flags'
+ DESC 'Asterisk Account Registration Extension'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
attributetype ( AstAccountNoTransfer
NAME 'AstAccountNoTransfer'
- DESC 'Asterisk Account AMA Flags'
+ DESC 'Asterisk Account No Transfer'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -327,28 +334,28 @@
attributetype ( AstAccountRestrictCID
NAME 'AstAccountRestrictCID'
- DESC 'Asterisk Restrict CallerID'
+ DESC 'Asterisk Account Restrict CallerID'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
attributetype ( AstAccountRTPTimeout
NAME 'AstAccountRTPTimeout'
- DESC 'Asterisk RTP Timeout'
+ DESC 'Asterisk Account RTP Timeout'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
attributetype ( AstAccountRTPHoldTimeout
NAME 'AstAccountRTPHoldTimeout'
- DESC 'Asterisk RTP Hold Timeout'
+ DESC 'Asterisk Account RTP Hold Timeout'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
attributetype ( AstAccountRealmedPassword
NAME 'AstAccountRealmedPassword'
- DESC 'Asterisk RTP Hold Timeout'
+ DESC 'Asterisk Account Realmed Password'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -362,21 +369,21 @@
attributetype ( AstAccountMusicOnHold
NAME 'AstAccountMusicOnHold'
- DESC 'Asterisk Account Allowed Codec'
+ DESC 'Asterisk Account Music On Hold'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
attributetype ( AstAccountCanCallForward
NAME 'AstAccountCanCallForward'
- DESC 'Asterisk Can CAll Forward'
+ DESC 'Asterisk Account Can Call Forward'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
attributetype ( AstAccountSecret
NAME 'AstAccountSecret'
- DESC 'Asterisk Can CAll Forward'
+ DESC 'Asterisk Account Secret'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -559,4 +566,3 @@
AstConfigCommented
)
)
-
Modified: team/group/newcdr/contrib/scripts/asterisk.ldif
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/contrib/scripts/asterisk.ldif?view=diff&rev=115885&r1=115884&r2=115885
==============================================================================
--- team/group/newcdr/contrib/scripts/asterisk.ldif (original)
+++ team/group/newcdr/contrib/scripts/asterisk.ldif Tue May 13 13:37:00 2008
@@ -1,5 +1,12 @@
#
-# Copyright (c) 2007 Suretec Systems Ltd. - <http://www.suretecsystems.com/>
+# Copyright (c) 2007-2008 Suretec Systems Ltd. - <http://www.suretecsystems.com/>
+#
+# Version: 3.1.5
+#
+# Changes:
+# - Fixed wrong DESC - 07/05/2008
+#
+# Author: Gavin Henry - <ghenry at suretecsystems.com>
#
# Asterisk LDAP Schema ldif
#
@@ -228,28 +235,28 @@
#
olcAttributeTypes: ( AstAccountExpirationTimestamp
NAME 'AstAccountExpirationTimestamp'
- DESC 'Asterisk Account Allowed Codec'
+ DESC 'Asterisk Account Expiration Timestamp'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
#
olcAttributeTypes: ( AstAccountRegistrationContext
NAME 'AstAccountRegistrationContext'
- DESC 'Asterisk Account AMA Flags'
+ DESC 'Asterisk Account Registration Context'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
#
olcAttributeTypes: ( AstAccountRegistrationExten
NAME 'AstAccountRegistrationExten'
- DESC 'Asterisk Account AMA Flags'
+ DESC 'Asterisk Account Registration Extension'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
#
olcAttributeTypes: ( AstAccountNoTransfer
NAME 'AstAccountNoTransfer'
- DESC 'Asterisk Account AMA Flags'
+ DESC 'Asterisk Account No Transfer'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -331,28 +338,28 @@
#
olcAttributeTypes: ( AstAccountRestrictCID
NAME 'AstAccountRestrictCID'
- DESC 'Asterisk Restrict CallerID'
+ DESC 'Asterisk Account Restrict CallerID'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
#
olcAttributeTypes: ( AstAccountRTPTimeout
NAME 'AstAccountRTPTimeout'
- DESC 'Asterisk RTP Timeout'
+ DESC 'Asterisk Account RTP Timeout'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
#
olcAttributeTypes: ( AstAccountRTPHoldTimeout
NAME 'AstAccountRTPHoldTimeout'
- DESC 'Asterisk RTP Hold Timeout'
+ DESC 'Asterisk Account RTP Hold Timeout'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
#
olcAttributeTypes: ( AstAccountRealmedPassword
NAME 'AstAccountRealmedPassword'
- DESC 'Asterisk RTP Hold Timeout'
+ DESC 'Asterisk Account Realmed Password'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -366,21 +373,21 @@
#
olcAttributeTypes: ( AstAccountMusicOnHold
NAME 'AstAccountMusicOnHold'
- DESC 'Asterisk Account Allowed Codec'
+ DESC 'Asterisk Account Music On Hold'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
#
olcAttributeTypes: ( AstAccountCanCallForward
NAME 'AstAccountCanCallForward'
- DESC 'Asterisk Can CAll Forward'
+ DESC 'Asterisk Account Can Call Forward'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
#
olcAttributeTypes: ( AstAccountSecret
NAME 'AstAccountSecret'
- DESC 'Asterisk Can CAll Forward'
+ DESC 'Asterisk Account Secret'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -564,4 +571,3 @@
)
)
#
-
Propchange: team/group/newcdr/include/asterisk/dlinkedlists.h
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue May 13 13:37:00 2008
@@ -1,1 +1,1 @@
-Author Id Date Revision
+Author Date Id Revision
Modified: team/group/newcdr/main/sched.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/main/sched.c?view=diff&rev=115885&r1=115884&r2=115885
==============================================================================
--- team/group/newcdr/main/sched.c (original)
+++ team/group/newcdr/main/sched.c Tue May 13 13:37:00 2008
@@ -198,34 +198,45 @@
int de = 0;
struct sched *first = AST_DLLIST_FIRST(&con->schedq);
struct sched *last = AST_DLLIST_LAST(&con->schedq);
+
if (first)
df = ast_tvdiff_us(s->when, first->when);
if (last)
de = ast_tvdiff_us(s->when, last->when);
+
if (df < 0)
df = -df;
if (de < 0)
de = -de;
- if (df < de)
+
+ if (df < de) {
AST_DLLIST_TRAVERSE(&con->schedq, cur, list) {
if (ast_tvcmp(s->when, cur->when) == -1) {
AST_DLLIST_INSERT_BEFORE(&con->schedq, cur, s, list);
break;
}
}
- else
+ if (!cur) {
+ AST_DLLIST_INSERT_TAIL(&con->schedq, s, list);
+ }
+ } else {
AST_DLLIST_TRAVERSE_BACKWARDS(&con->schedq, cur, list) {
if (ast_tvcmp(s->when, cur->when) == 1) {
AST_DLLIST_INSERT_AFTER(&con->schedq, cur, s, list);
break;
}
}
- if (!cur)
- AST_DLLIST_INSERT_TAIL(&con->schedq, s, list);
+ if (!cur) {
+ AST_DLLIST_INSERT_HEAD(&con->schedq, s, list);
+ }
+ }
+
ret = ast_hashtab_insert_safe(con->schedq_ht, s);
if (!ret)
ast_log(LOG_WARNING,"Schedule Queue entry %d is already in table!\n",s->id);
+
con->schedcnt++;
+
if (con->schedcnt > con->highwater)
con->highwater = con->schedcnt;
}
Modified: team/group/newcdr/res/res_config_ldap.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/res/res_config_ldap.c?view=diff&rev=115885&r1=115884&r2=115885
==============================================================================
--- team/group/newcdr/res/res_config_ldap.c (original)
+++ team/group/newcdr/res/res_config_ldap.c Tue May 13 13:37:00 2008
@@ -58,6 +58,7 @@
#include "asterisk/linkedlists.h"
#define RES_CONFIG_LDAP_CONF "res_ldap.conf"
+#define RES_CONFIG_LDAP_DEFAULT_BASEDN "asterisk"
AST_MUTEX_DEFINE_STATIC(ldap_lock);
@@ -1400,11 +1401,14 @@
} else
ast_copy_string(user, s, sizeof(user));
- if (!(s = ast_variable_retrieve(config, "_general", "pass"))) {
- ast_log(LOG_WARNING, "No directory password found, using 'asterisk' as default.\n");
- ast_copy_string(pass, "asterisk", sizeof(pass) - 1);
- } else
- ast_copy_string(pass, s, sizeof(pass));
+ if (!ast_strlen_zero(user)) {
+ if (!(s = ast_variable_retrieve(config, "_general", "pass"))) {
+ ast_log(LOG_WARNING, "No directory password found, using 'asterisk' as default.\n");
+ ast_copy_string(pass, "asterisk", sizeof(pass));
+ } else {
+ ast_copy_string(pass, s, sizeof(pass));
+ }
+ }
/* URL is preferred, use host and port if not found */
if ((s = ast_variable_retrieve(config, "_general", "url"))) {
@@ -1423,8 +1427,8 @@
}
if (!(s = ast_variable_retrieve(config, "_general", "basedn"))) {
- ast_log(LOG_ERROR, "No LDAP base dn found, using 'asterisk' as default.\n");
- basedn[0] = '\0';
+ ast_log(LOG_ERROR, "No LDAP base dn found, using '%s' as default.\n", RES_CONFIG_LDAP_DEFAULT_BASEDN);
+ ast_copy_string(basedn, RES_CONFIG_LDAP_DEFAULT_BASEDN, sizeof(basedn));
} else
ast_copy_string(basedn, s, sizeof(basedn));
Modified: team/group/newcdr/res/res_odbc.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/res/res_odbc.c?view=diff&rev=115885&r1=115884&r2=115885
==============================================================================
--- team/group/newcdr/res/res_odbc.c (original)
+++ team/group/newcdr/res/res_odbc.c Tue May 13 13:37:00 2008
@@ -100,7 +100,6 @@
odbc_obj_disconnect(obj);
ast_mutex_destroy(&obj->lock);
ao2_ref(obj->parent, -1);
- ast_free(obj);
}
SQLHSTMT ast_odbc_direct_execute(struct odbc_obj *obj, SQLHSTMT (*exec_cb)(struct odbc_obj *obj, void *data), void *data)
Modified: team/group/newcdr/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/sounds/Makefile?view=diff&rev=115885&r1=115884&r2=115885
==============================================================================
--- team/group/newcdr/sounds/Makefile (original)
+++ team/group/newcdr/sounds/Makefile Tue May 13 13:37:00 2008
@@ -17,7 +17,7 @@
SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
-CORE_SOUNDS_VERSION:=1.4.11
+CORE_SOUNDS_VERSION:=1.4.12
EXTRA_SOUNDS_VERSION:=1.4.7
SOUNDS_URL:=http://downloads.digium.com/pub/telephony/sounds/releases
MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS))
More information about the svn-commits
mailing list