[asterisk-commits] bbryant: branch bbryant/ssl-tcp-tls r69799 - in /team/bbryant/ssl-tcp-tls: ./...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Jun 18 15:03:44 CDT 2007
Author: bbryant
Date: Mon Jun 18 15:03:43 2007
New Revision: 69799
URL: http://svn.digium.com/view/asterisk?view=rev&rev=69799
Log:
Merged revisions 69435-69436,69471,69519,69559,69583,69626,69662-69663,69672,69691,69703,69705,69709,69745-69746,69779,69795,69797 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r69435 | qwell | 2007-06-14 17:56:40 -0500 (Thu, 14 Jun 2007) | 9 lines
Merged revisions 69434 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69434 | qwell | 2007-06-14 17:56:09 -0500 (Thu, 14 Jun 2007) | 1 line
Update to latest versions of sound files.
........
................
r69436 | russell | 2007-06-14 18:01:01 -0500 (Thu, 14 Jun 2007) | 3 lines
Convert uses of strdup() to ast_strdup()
(issue #9983, eliel)
................
r69471 | qwell | 2007-06-14 18:23:35 -0500 (Thu, 14 Jun 2007) | 20 lines
Merged revisions 69470 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r69470 | qwell | 2007-06-14 18:22:51 -0500 (Thu, 14 Jun 2007) | 12 lines
Merged revisions 69469 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r69469 | qwell | 2007-06-14 18:21:45 -0500 (Thu, 14 Jun 2007) | 4 lines
Fix an issue where the line number in an unterminated comment block error message would show the wrong line number.
"Reported" to me on #asterisk (somebody posted an error message, and I happened to catch it)
........
................
................
r69519 | russell | 2007-06-15 10:36:45 -0500 (Fri, 15 Jun 2007) | 13 lines
Merged revisions 69518 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69518 | russell | 2007-06-15 10:27:34 -0500 (Fri, 15 Jun 2007) | 5 lines
The SLATRUNK_STATUS variable indicated "SUCCESS" for both an answer of the
incoming call on the trunk, or if the trunk reached its ring timeout.
This patch changes the variable to say "RINGTIMEOUT" in that case.
(issue #9973, reported by n00dle, patch by me)
........
................
r69559 | file | 2007-06-15 14:25:11 -0500 (Fri, 15 Jun 2007) | 8 lines
Merged revisions 69558 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r69558 | file | 2007-06-15 15:23:45 -0400 (Fri, 15 Jun 2007) | 2 lines
Add support for setting the maximum length of acceptable DTMF in SpeechBackground.
................
r69583 | russell | 2007-06-15 15:21:41 -0500 (Fri, 15 Jun 2007) | 17 lines
This was only an issue in 1.4. This issue was fixed in trunk as a part of
bbryant's patch to support named dynamic feature groups.
Merged revisions 69579 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69579 | russell | 2007-06-15 15:18:58 -0500 (Fri, 15 Jun 2007) | 5 lines
Fix a silly deadlock in res_features that I found while debugging on one of
blitzrage's test machines. It was one of the situations where he was seeing
hung channels, and may be the cause of some of the reports from other people.
(related to issue #9235)
........
................
r69626 | file | 2007-06-18 08:57:33 -0500 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69625 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69625 | file | 2007-06-18 09:55:00 -0400 (Mon, 18 Jun 2007) | 2 lines
Fix issue where it would be possible for the negotiated codecs to get set back to nothing. (issue #9992 reported by yehavi)
........
................
r69662 | russell | 2007-06-18 10:46:49 -0500 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69660 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69660 | russell | 2007-06-18 10:46:14 -0500 (Mon, 18 Jun 2007) | 2 lines
Tweak paths for BSD systems (issue #10001, stuarth)
........
................
r69663 | file | 2007-06-18 10:48:05 -0500 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69661 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69661 | file | 2007-06-18 11:46:32 -0400 (Mon, 18 Jun 2007) | 2 lines
Few minor transfer tweaks. We can't unlock something we never locked, and better handle a specific scenario with doing an attended transfer between two non-bridged calls.
........
................
r69672 | file | 2007-06-18 11:06:17 -0500 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69668 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69668 | file | 2007-06-18 12:04:55 -0400 (Mon, 18 Jun 2007) | 2 lines
Don't defer the BYE till later on a transfer when the transfer itself goes kaboom and has no hope of working.
........
................
r69691 | russell | 2007-06-18 11:15:44 -0500 (Mon, 18 Jun 2007) | 13 lines
Merged revisions 69689 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69689 | russell | 2007-06-18 11:15:12 -0500 (Mon, 18 Jun 2007) | 5 lines
Change the use of "echo -e" to "printf". On systems where /bin/sh is not bash,
most of the lines in menuselect-tree were getting a "-e" at the beginning of
every line. I'm surprised nobody noticed this, but I think the XML parser was
being very nice and ignoring them.
........
................
r69703 | russell | 2007-06-18 11:35:51 -0500 (Mon, 18 Jun 2007) | 14 lines
Merged revisions 69702 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69702 | russell | 2007-06-18 11:35:02 -0500 (Mon, 18 Jun 2007) | 6 lines
To prevent 92138749238754 more reports of "I have unixodbc installed, but
still can't build *_odbc.so!", check for ltdl directly, instead of just listing
it as another library to include in the unixodbc check in the configure script.
This also makes ltdl show up as a dependency in menuselect so people know what
to go install. (related to issue #9989, patch by me)
........
................
r69705 | file | 2007-06-18 11:37:14 -0500 (Mon, 18 Jun 2007) | 2 lines
Few more rwlist conversions... why not.
................
r69709 | file | 2007-06-18 11:56:06 -0500 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69708 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69708 | file | 2007-06-18 12:51:36 -0400 (Mon, 18 Jun 2007) | 2 lines
Remember the DNS lookup done when dnsmgr is called for the first time so that it does not needlessly spit out changed messages when the host really didn't change.
........
................
r69745 | tilghman | 2007-06-18 12:48:56 -0500 (Mon, 18 Jun 2007) | 2 lines
Janitor for ast_localtime
................
r69746 | tilghman | 2007-06-18 12:50:01 -0500 (Mon, 18 Jun 2007) | 18 lines
Merged revisions 69744 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r69744 | tilghman | 2007-06-18 12:46:40 -0500 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69743 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r69743 | tilghman | 2007-06-18 12:45:15 -0500 (Mon, 18 Jun 2007) | 2 lines
Issue 9998 - Remove SIG prefix, since it's not supported by ksh
........
................
................
r69779 | file | 2007-06-18 13:19:54 -0500 (Mon, 18 Jun 2007) | 18 lines
Merged revisions 69775 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r69775 | file | 2007-06-18 14:18:12 -0400 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69765 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r69765 | file | 2007-06-18 14:13:03 -0400 (Mon, 18 Jun 2007) | 2 lines
Set the peer name on the dialog to the one configured in sip.conf and NOT the username to be used for authentication attempts. (issue #9967 reported by achauvin)
........
................
................
r69795 | file | 2007-06-18 14:02:45 -0500 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69794 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69794 | file | 2007-06-18 15:00:50 -0400 (Mon, 18 Jun 2007) | 2 lines
Don't count RTP timeout when involved in a T38 fax session. (issue #9222 reported by ivoc)
........
................
r69797 | tilghman | 2007-06-18 14:52:56 -0500 (Mon, 18 Jun 2007) | 10 lines
Merged revisions 69796 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69796 | tilghman | 2007-06-18 14:48:17 -0500 (Mon, 18 Jun 2007) | 2 lines
Issue 10005 - Segfault with missing arguments, plus fix a missing define for SIP INFO channels
........
................
Modified:
team/bbryant/ssl-tcp-tls/ (props changed)
team/bbryant/ssl-tcp-tls/Makefile
team/bbryant/ssl-tcp-tls/apps/app_directory.c
team/bbryant/ssl-tcp-tls/apps/app_meetme.c
team/bbryant/ssl-tcp-tls/apps/app_minivm.c
team/bbryant/ssl-tcp-tls/apps/app_rpt.c
team/bbryant/ssl-tcp-tls/apps/app_speech_utils.c
team/bbryant/ssl-tcp-tls/apps/app_voicemail.c
team/bbryant/ssl-tcp-tls/build_tools/menuselect-deps.in
team/bbryant/ssl-tcp-tls/build_tools/prep_moduledeps
team/bbryant/ssl-tcp-tls/cdr/cdr_odbc.c
team/bbryant/ssl-tcp-tls/channels/chan_h323.c
team/bbryant/ssl-tcp-tls/channels/chan_misdn.c
team/bbryant/ssl-tcp-tls/channels/chan_sip.c
team/bbryant/ssl-tcp-tls/channels/chan_vpb.cc
team/bbryant/ssl-tcp-tls/channels/iax2-provision.c
team/bbryant/ssl-tcp-tls/configure
team/bbryant/ssl-tcp-tls/configure.ac
team/bbryant/ssl-tcp-tls/contrib/scripts/safe_asterisk
team/bbryant/ssl-tcp-tls/funcs/func_odbc.c
team/bbryant/ssl-tcp-tls/include/asterisk/autoconfig.h.in
team/bbryant/ssl-tcp-tls/main/asterisk.c
team/bbryant/ssl-tcp-tls/main/cdr.c
team/bbryant/ssl-tcp-tls/main/channel.c
team/bbryant/ssl-tcp-tls/main/cli.c
team/bbryant/ssl-tcp-tls/main/config.c
team/bbryant/ssl-tcp-tls/main/dnsmgr.c
team/bbryant/ssl-tcp-tls/main/enum.c
team/bbryant/ssl-tcp-tls/main/file.c
team/bbryant/ssl-tcp-tls/main/http.c
team/bbryant/ssl-tcp-tls/main/loader.c
team/bbryant/ssl-tcp-tls/main/pbx.c
team/bbryant/ssl-tcp-tls/res/res_config_odbc.c
team/bbryant/ssl-tcp-tls/res/res_features.c
team/bbryant/ssl-tcp-tls/res/res_indications.c
team/bbryant/ssl-tcp-tls/res/res_monitor.c
team/bbryant/ssl-tcp-tls/res/res_odbc.c
team/bbryant/ssl-tcp-tls/sounds/Makefile
Propchange: team/bbryant/ssl-tcp-tls/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/bbryant/ssl-tcp-tls/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 18 15:03:43 2007
@@ -1,1 +1,1 @@
-/trunk:1-69430
+/trunk:1-69798
Modified: team/bbryant/ssl-tcp-tls/Makefile
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/Makefile?view=diff&rev=69799&r1=69798&r2=69799
==============================================================================
--- team/bbryant/ssl-tcp-tls/Makefile (original)
+++ team/bbryant/ssl-tcp-tls/Makefile Mon Jun 18 15:03:43 2007
@@ -118,8 +118,9 @@
ASTLOGDIR=$(localstatedir)/log/asterisk
ASTVARRUNDIR=$(localstatedir)/run
ASTMANDIR=$(mandir)
-ifeq ($(OSARCH),FreeBSD)
+ifneq ($(findstring BSD,$(OSARCH)),)
ASTVARLIBDIR=$(prefix)/share/asterisk
+ ASTVARRUNDIR=$(localstatedir)/run/asterisk
else
ASTVARLIBDIR=$(localstatedir)/lib/asterisk
endif
Modified: team/bbryant/ssl-tcp-tls/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/apps/app_directory.c?view=diff&rev=69799&r1=69798&r2=69799
==============================================================================
--- team/bbryant/ssl-tcp-tls/apps/app_directory.c (original)
+++ team/bbryant/ssl-tcp-tls/apps/app_directory.c Mon Jun 18 15:03:43 2007
@@ -444,7 +444,7 @@
/* Find all candidate extensions */
while(v) {
/* Find a candidate extension */
- start = strdup(v->value);
+ start = ast_strdup(v->value);
if (start && !strcasestr(start, "hidefromdir=yes")) {
stringp=start;
strsep(&stringp, ",");
Modified: team/bbryant/ssl-tcp-tls/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/apps/app_meetme.c?view=diff&rev=69799&r1=69798&r2=69799
==============================================================================
--- team/bbryant/ssl-tcp-tls/apps/app_meetme.c (original)
+++ team/bbryant/ssl-tcp-tls/apps/app_meetme.c Mon Jun 18 15:03:43 2007
@@ -298,10 +298,27 @@
"";
static const char *slastation_desc =
-" SLAStation():\n";
+" SLAStation(station):\n"
+"This application should be executed by an SLA station. The argument depends\n"
+"on how the call was initiated. If the phone was just taken off hook, then\n"
+"the argument \"station\" should be just the station name. If the call was\n"
+"initiated by pressing a line key, then the station name should be preceded\n"
+"by an underscore and the trunk name associated with that line button.\n"
+"For example: \"station1_line1\"."
+" On exit, this application will set the variable SLASTATION_STATUS to\n"
+"one of the following values:\n"
+" FAILURE | CONGESTION | SUCCESS\n"
+"";
static const char *slatrunk_desc =
-" SLATrunk():\n";
+" SLATrunk(trunk):\n"
+"This application should be executed by an SLA trunk on an inbound call.\n"
+"The channel calling this application should correspond to the SLA trunk\n"
+"with the name \"trunk\" that is being passed as an argument.\n"
+" On exit, this application will set the variable SLATRUNK_STATUS to\n"
+"one of the following values:\n"
+" FAILURE | SUCCESS | UNANSWERED | RINGTIMEOUT\n"
+"";
#define MAX_CONFNUM 80
#define MAX_PIN 80
@@ -984,7 +1001,7 @@
/* User Number || Conf Command option*/
if (strstr(line, "mute") || strstr(line, "kick")) {
if (state == 0 && (strstr(line, "kick") || strstr(line,"mute")) && !strncasecmp(word, "all", len))
- return strdup("all");
+ return ast_strdup("all");
which++;
AST_LIST_LOCK(&confs);
@@ -1009,9 +1026,9 @@
}
}
AST_LIST_UNLOCK(&confs);
- return usr ? strdup(usrno) : NULL;
+ return usr ? ast_strdup(usrno) : NULL;
} else if ( strstr(line, "list") && ( 0 == state ) )
- return strdup("concise");
+ return ast_strdup("concise");
}
return NULL;
@@ -3803,6 +3820,7 @@
time_elapsed = ast_tvdiff_ms(ast_tvnow(), ringing_trunk->ring_begin);
time_left = (ringing_trunk->trunk->ring_timeout * 1000) - time_elapsed;
if (time_left <= 0) {
+ pbx_builtin_setvar_helper(ringing_trunk->trunk->chan, "SLATRUNK_STATUS", "RINGTIMEOUT");
AST_LIST_REMOVE_CURRENT(&sla.ringing_trunks, entry);
sla_stop_ringing_trunk(ringing_trunk);
res = 1;
@@ -4372,8 +4390,9 @@
conf = NULL;
trunk->chan = NULL;
trunk->on_hold = 0;
-
- pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "SUCCESS");
+
+ if (!pbx_builtin_getvar_helper(chan, "SLATRUNK_STATUS"))
+ pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "SUCCESS");
/* Remove the entry from the list of ringing trunks if it is still there. */
ast_mutex_lock(&sla.lock);
Modified: team/bbryant/ssl-tcp-tls/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/apps/app_minivm.c?view=diff&rev=69799&r1=69798&r2=69799
==============================================================================
--- team/bbryant/ssl-tcp-tls/apps/app_minivm.c (original)
+++ team/bbryant/ssl-tcp-tls/apps/app_minivm.c Mon Jun 18 15:03:43 2007
@@ -2333,7 +2333,7 @@
static char *message_template_parse_emailbody(const char *configuration)
{
char *tmpread, *tmpwrite;
- char *emailbody = strdup(configuration);
+ char *emailbody = ast_strdup(configuration);
/* substitute strings \t and \n into the apropriate characters */
tmpread = tmpwrite = emailbody;
@@ -2678,12 +2678,12 @@
if (pos > 4)
return NULL;
if (pos == 3)
- return (state == 0) ? strdup("for") : NULL;
+ return (state == 0) ? ast_strdup("for") : NULL;
wordlen = strlen(word);
AST_LIST_TRAVERSE(&minivm_accounts, vmu, list) {
if (!strncasecmp(word, vmu->domain, wordlen)) {
if (domain && strcmp(domain, vmu->domain) && ++which > state)
- return strdup(vmu->domain);
+ return ast_strdup(vmu->domain);
/* ignore repeated domains ? */
domain = vmu->domain;
}
Modified: team/bbryant/ssl-tcp-tls/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/apps/app_rpt.c?view=diff&rev=69799&r1=69798&r2=69799
==============================================================================
--- team/bbryant/ssl-tcp-tls/apps/app_rpt.c (original)
+++ team/bbryant/ssl-tcp-tls/apps/app_rpt.c Mon Jun 18 15:03:43 2007
@@ -2307,7 +2307,7 @@
case STATS_TIME:
wait_interval(myrpt, DLY_TELEM, mychannel); /* Wait a little bit */
t = time(NULL);
- localtime_r(&t, &localtm);
+ ast_localtime(&t, &localtm, NULL);
/* Say the phase of the day is before the time */
if ((localtm.tm_hour >= 0) && (localtm.tm_hour < 12))
p = "rpt/goodmorning";
Modified: team/bbryant/ssl-tcp-tls/apps/app_speech_utils.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/apps/app_speech_utils.c?view=diff&rev=69799&r1=69798&r2=69799
==============================================================================
--- team/bbryant/ssl-tcp-tls/apps/app_speech_utils.c (original)
+++ team/bbryant/ssl-tcp-tls/apps/app_speech_utils.c Mon Jun 18 15:03:43 2007
@@ -515,7 +515,7 @@
speech->processing_sound = NULL;
}
- speech->processing_sound = strdup(data);
+ speech->processing_sound = ast_strdup(data);
ast_module_user_remove(u);
@@ -543,7 +543,7 @@
static int speech_background(struct ast_channel *chan, void *data)
{
unsigned int timeout = 0;
- int res = 0, done = 0, argc = 0, started = 0, quieted = 0;
+ int res = 0, done = 0, argc = 0, started = 0, quieted = 0, max_dtmf_len = 0;
struct ast_module_user *u = NULL;
struct ast_speech *speech = find_speech(chan);
struct ast_frame *f = NULL;
@@ -552,6 +552,7 @@
time_t start, current;
struct ast_datastore *datastore = NULL;
char *argv[2], *args = NULL, *filename_tmp = NULL, *filename = NULL, tmp[2] = "";
+ const char *tmp2 = NULL;
args = ast_strdupa(data);
@@ -588,6 +589,10 @@
} else
timeout = 0;
}
+
+ /* See if the maximum DTMF length variable is set... we use a variable in case they want to carry it through their entire dialplan */
+ if ((tmp2 = pbx_builtin_getvar_helper(chan, "SPEECH_DTMF_MAXLEN")) && !ast_strlen_zero(tmp2))
+ max_dtmf_len = atoi(tmp2);
/* Before we go into waiting for stuff... make sure the structure is ready, if not - start it again */
if (speech->state == AST_SPEECH_STATE_NOT_READY || speech->state == AST_SPEECH_STATE_DONE) {
@@ -724,6 +729,9 @@
time(&start);
snprintf(tmp, sizeof(tmp), "%c", f->subclass);
strncat(dtmf, tmp, sizeof(dtmf));
+ /* If the maximum length of the DTMF has been reached, stop now */
+ if (max_dtmf_len && strlen(dtmf) == max_dtmf_len)
+ done = 1;
}
break;
case AST_FRAME_CONTROL:
@@ -747,8 +755,8 @@
speech->results = ast_calloc(1, sizeof(*speech->results));
if (speech->results != NULL) {
speech->results->score = 1000;
- speech->results->text = strdup(dtmf);
- speech->results->grammar = strdup("dtmf");
+ speech->results->text = ast_strdup(dtmf);
+ speech->results->grammar = ast_strdup("dtmf");
}
}
Modified: team/bbryant/ssl-tcp-tls/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/apps/app_voicemail.c?view=diff&rev=69799&r1=69798&r2=69799
==============================================================================
--- team/bbryant/ssl-tcp-tls/apps/app_voicemail.c (original)
+++ team/bbryant/ssl-tcp-tls/apps/app_voicemail.c Mon Jun 18 15:03:43 2007
@@ -48,6 +48,7 @@
<category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o">
<member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC">
<depend>unixodbc</depend>
+ <depend>ltdl</depend>
<conflict>IMAP_STORAGE</conflict>
<defaultenabled>no</defaultenabled>
</member>
Modified: team/bbryant/ssl-tcp-tls/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/build_tools/menuselect-deps.in?view=diff&rev=69799&r1=69798&r2=69799
==============================================================================
--- team/bbryant/ssl-tcp-tls/build_tools/menuselect-deps.in (original)
+++ team/bbryant/ssl-tcp-tls/build_tools/menuselect-deps.in Mon Jun 18 15:03:43 2007
@@ -10,6 +10,7 @@
IMAP_TK=@PBX_IMAP_TK@
IXJUSER=@PBX_IXJUSER@
KDE=@PBX_KDE@
+LTDL=@PBX_LTDL@
NBS=@PBX_NBS@
NETSNMP=@PBX_NETSNMP@
NEWT=@PBX_NEWT@
Modified: team/bbryant/ssl-tcp-tls/build_tools/prep_moduledeps
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/build_tools/prep_moduledeps?view=diff&rev=69799&r1=69798&r2=69799
==============================================================================
--- team/bbryant/ssl-tcp-tls/build_tools/prep_moduledeps (original)
+++ team/bbryant/ssl-tcp-tls/build_tools/prep_moduledeps Mon Jun 18 15:03:43 2007
@@ -10,7 +10,7 @@
catsuffix=${3}
displayname=${4}
- echo -e "\t<category name=\"MENUSELECT_${catsuffix}\" displayname=\"${displayname}\" remove_on_change=\"${dir}/modules.link\">"
+ printf "\t<category name=\"MENUSELECT_${catsuffix}\" displayname=\"${displayname}\" remove_on_change=\"${dir}/modules.link\">\n"
for file in `ls ${dir}/${prefix}*.c ${dir}/${prefix}*.cc 2> /dev/null | sort`
do
if [ ! -f ${file} ]; then
@@ -20,12 +20,12 @@
fname=`basename ${fname} .cc`
get_description ${file}
desc=${TDESC}
- echo -e "\t\t<member name=\"${fname}\" displayname=\"${desc}\" remove_on_change=\"${dir}/${fname}.o ${dir}/${fname}.oo ${dir}/${fname}.so\">"
+ printf "\t\t<member name=\"${fname}\" displayname=\"${desc}\" remove_on_change=\"${dir}/${fname}.o ${dir}/${fname}.oo ${dir}/${fname}.so\">\n"
awk -f build_tools/get_moduleinfo ${file}
- echo -e "\t\t</member>"
+ printf "\t\t</member>\n"
awk -f build_tools/get_makeopts ${file} >> .makeoptstmp
done
- echo -e "\t</category>"
+ printf "\t</category>\n"
}
echo "<?xml version=\"1.0\"?>"
Modified: team/bbryant/ssl-tcp-tls/cdr/cdr_odbc.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/cdr/cdr_odbc.c?view=diff&rev=69799&r1=69798&r2=69799
==============================================================================
--- team/bbryant/ssl-tcp-tls/cdr/cdr_odbc.c (original)
+++ team/bbryant/ssl-tcp-tls/cdr/cdr_odbc.c Mon Jun 18 15:03:43 2007
@@ -30,6 +30,7 @@
/*** MODULEINFO
<depend>unixodbc</depend>
+ <depend>ltdl</depend>
***/
#include "asterisk.h"
Modified: team/bbryant/ssl-tcp-tls/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/channels/chan_h323.c?view=diff&rev=69799&r1=69798&r2=69799
==============================================================================
--- team/bbryant/ssl-tcp-tls/channels/chan_h323.c (original)
+++ team/bbryant/ssl-tcp-tls/channels/chan_h323.c Mon Jun 18 15:03:43 2007
@@ -536,7 +536,7 @@
ast_log(LOG_DTMF, "Begin sending inband digit %c on %s\n", digit, c->name);
}
pvt->txDtmfDigit = digit;
- token = pvt->cd.call_token ? strdup(pvt->cd.call_token) : NULL;
+ token = pvt->cd.call_token ? ast_strdup(pvt->cd.call_token) : NULL;
ast_mutex_unlock(&pvt->lock);
h323_send_tone(token, digit);
if (token) {
@@ -575,7 +575,7 @@
ast_log(LOG_DTMF, "End sending inband digit %c on %s, duration %d\n", digit, c->name, duration);
}
pvt->txDtmfDigit = ' ';
- token = pvt->cd.call_token ? strdup(pvt->cd.call_token) : NULL;
+ token = pvt->cd.call_token ? ast_strdup(pvt->cd.call_token) : NULL;
ast_mutex_unlock(&pvt->lock);
h323_send_tone(token, ' ');
if (token) {
@@ -680,7 +680,7 @@
ast_debug(1, "Answering on %s\n", c->name);
ast_mutex_lock(&pvt->lock);
- token = pvt->cd.call_token ? strdup(pvt->cd.call_token) : NULL;
+ token = pvt->cd.call_token ? ast_strdup(pvt->cd.call_token) : NULL;
ast_mutex_unlock(&pvt->lock);
res = h323_answering_call(token, 0);
if (token)
@@ -739,7 +739,7 @@
/* Start the process if it's not already started */
if (!pvt->alreadygone && !pvt->hangupcause) {
- call_token = pvt->cd.call_token ? strdup(pvt->cd.call_token) : NULL;
+ call_token = pvt->cd.call_token ? ast_strdup(pvt->cd.call_token) : NULL;
if (call_token) {
/* Release lock to eliminate deadlock */
ast_mutex_unlock(&pvt->lock);
@@ -877,7 +877,7 @@
int got_progress;
ast_mutex_lock(&pvt->lock);
- token = (pvt->cd.call_token ? strdup(pvt->cd.call_token) : NULL);
+ token = (pvt->cd.call_token ? ast_strdup(pvt->cd.call_token) : NULL);
got_progress = pvt->got_progress;
if (condition == AST_CONTROL_PROGRESS)
pvt->got_progress = 1;
@@ -1092,7 +1092,7 @@
ch->cid.cid_ton = pvt->cd.type_of_number;
if (!ast_strlen_zero(pvt->exten) && strcmp(pvt->exten, "s")) {
- ch->cid.cid_dnid = strdup(pvt->exten);
+ ch->cid.cid_dnid = ast_strdup(pvt->exten);
}
if (pvt->cd.transfer_capability >= 0)
ch->transfercapability = pvt->cd.transfer_capability;
Modified: team/bbryant/ssl-tcp-tls/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/channels/chan_misdn.c?view=diff&rev=69799&r1=69798&r2=69799
==============================================================================
--- team/bbryant/ssl-tcp-tls/channels/chan_misdn.c (original)
+++ team/bbryant/ssl-tcp-tls/channels/chan_misdn.c Mon Jun 18 15:03:43 2007
@@ -1409,7 +1409,7 @@
ast_mutex_unlock(&c->lock);
}
if (c) {
- ret = strdup(c->name);
+ ret = ast_strdup(c->name);
ast_mutex_unlock(&c->lock);
} else
ret = NULL;
@@ -1429,13 +1429,13 @@
switch (pos) {
case 4:
if (*word == 'p')
- return strdup("port");
+ return ast_strdup("port");
else if (*word == 'o')
- return strdup("only");
+ return ast_strdup("only");
break;
case 6:
if (*word == 'o')
- return strdup("only");
+ return ast_strdup("only");
break;
}
return NULL;
@@ -1452,15 +1452,15 @@
switch (pos) {
case 3:
if ((!strncmp(word, "description", wordlen)) && (++which > state))
- return strdup("description");
+ return ast_strdup("description");
if ((!strncmp(word, "descriptions", wordlen)) && (++which > state))
- return strdup("descriptions");
+ return ast_strdup("descriptions");
if ((!strncmp(word, "0", wordlen)) && (++which > state))
- return strdup("0");
+ return ast_strdup("0");
while ((port = misdn_cfg_get_next_port(port)) != -1) {
snprintf(buffer, sizeof(buffer), "%d", port);
if ((!strncmp(word, buffer, wordlen)) && (++which > state)) {
- return strdup(buffer);
+ return ast_strdup(buffer);
}
}
break;
@@ -1472,14 +1472,14 @@
misdn_cfg_get_name(elem, buffer, sizeof(buffer));
if (!wordlen || !strncmp(word, buffer, wordlen)) {
if (++which > state)
- return strdup(buffer);
+ return ast_strdup(buffer);
}
}
} else if (strstr(line, "descriptions ")) {
if ((!wordlen || !strncmp(word, "general", wordlen)) && (++which > state))
- return strdup("general");
+ return ast_strdup("general");
if ((!wordlen || !strncmp(word, "ports", wordlen)) && (++which > state))
- return strdup("ports");
+ return ast_strdup("ports");
}
break;
}
@@ -1895,7 +1895,7 @@
if ( !ast_strlen_zero(bc->rad) ) {
if (ast->cid.cid_rdnis)
ast_free(ast->cid.cid_rdnis);
- ast->cid.cid_rdnis = strdup(bc->rad);
+ ast->cid.cid_rdnis = ast_strdup(bc->rad);
}
misdn_cfg_get(bc->port, MISDN_CFG_OVERLAP_DIAL, &ch->overlap_dial, sizeof(ch->overlap_dial));
Modified: team/bbryant/ssl-tcp-tls/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/channels/chan_sip.c?view=diff&rev=69799&r1=69798&r2=69799
==============================================================================
--- team/bbryant/ssl-tcp-tls/channels/chan_sip.c (original)
+++ team/bbryant/ssl-tcp-tls/channels/chan_sip.c Mon Jun 18 15:03:43 2007
@@ -1649,6 +1649,7 @@
.send_digit_end = sip_senddigit_end,
.bridge = ast_rtp_bridge,
.send_text = sip_sendtext,
+ .func_channel_read = acf_channel_read,
};
/**--- some list management macros. **/
@@ -3030,7 +3031,7 @@
ast_rtp_set_rtpkeepalive(dialog->trtp, peer->rtpkeepalive);
}
- ast_string_field_set(dialog, peername, peer->username);
+ ast_string_field_set(dialog, peername, peer->name);
ast_string_field_set(dialog, authname, peer->username);
ast_string_field_set(dialog, username, peer->username);
ast_string_field_set(dialog, peersecret, peer->secret);
@@ -13672,7 +13673,7 @@
ast_softhangup_nolock(transferer->chan1, AST_SOFTHANGUP_DEV);
if (target->chan1)
ast_softhangup_nolock(target->chan1, AST_SOFTHANGUP_DEV);
- return -1;
+ return -2;
}
return 0;
}
@@ -14584,13 +14585,16 @@
sip_pvt_unlock(targetcall_pvt);
if (res) {
/* Failed transfer */
- /* Could find better message, but they will get the point */
- transmit_notify_with_sipfrag(transferer, seqno, "486 Busy", TRUE);
+ transmit_notify_with_sipfrag(transferer, seqno, "486 Busy Here", TRUE);
append_history(transferer, "Xfer", "Refer failed");
+ transferer->refer->status = REFER_FAILED;
if (targetcall_pvt->owner)
ast_channel_unlock(targetcall_pvt->owner);
/* Right now, we have to hangup, sorry. Bridge is destroyed */
- ast_hangup(transferer->owner);
+ if (res != -2)
+ ast_hangup(transferer->owner);
+ else
+ ast_clear_flag(&transferer->flags[0], SIP_DEFER_BYE_ON_TRANSFER);
} else {
/* Transfer succeeded! */
@@ -14880,7 +14884,6 @@
be accessible after the transfer! */
*nounlock = 1;
ast_channel_unlock(current.chan1);
- ast_channel_unlock(current.chan2);
/* Connect the call */
@@ -14993,11 +14996,14 @@
if (ast_strlen_zero(args.param) || strcasecmp(args.param, "rtpqos"))
return -1;
+ /* Default arguments of audio,all */
+ if (ast_strlen_zero(args.type))
+ args.type = "audio";
+ if (ast_strlen_zero(args.field))
+ args.field = "all";
+
memset(buf, 0, buflen);
memset(&qos, 0, sizeof(qos));
-
- if (ast_strlen_zero(args.type))
- return -1;
if (strcasecmp(args.type, "AUDIO") == 0) {
all = ast_rtp_get_quality(p->rtp, &qos);
@@ -15006,9 +15012,6 @@
} else if (strcasecmp(args.type, "TEXT") == 0) {
all = ast_rtp_get_quality(p->trtp, &qos);
}
-
- if (ast_strlen_zero(args.field))
- return -1;
if (strcasecmp(args.field, "local_ssrc") == 0)
snprintf(buf, buflen, "%u", qos.local_ssrc);
@@ -15849,6 +15852,10 @@
return;
/* If the call is not in UP state or redirected outside Asterisk, no need to check timers */
if (dialog->owner->_state != AST_STATE_UP || dialog->redirip.sin_addr.s_addr)
+ return;
+
+ /* If the call is involved in a T38 fax session do not check RTP timeout */
+ if (dialog->t38.state == T38_ENABLED)
return;
/* If we have no timers set, return now */
@@ -17874,14 +17881,16 @@
memset(&p->tredirip, 0, sizeof(p->tredirip));
changed = 1;
}
- if (codecs && (p->redircodecs != codecs)) {
- p->redircodecs = codecs;
- changed = 1;
- }
- if ((p->capability & codecs) != p->capability) {
- p->jointcapability &= codecs;
- p->capability &= codecs;
- changed = 1;
+ if (codecs) {
+ if ((p->redircodecs != codecs)) {
+ p->redircodecs = codecs;
+ changed = 1;
+ }
+ if ((p->capability & codecs) != p->capability) {
+ p->jointcapability &= codecs;
+ p->capability &= codecs;
+ changed = 1;
+ }
}
if (changed && !ast_test_flag(&p->flags[0], SIP_GOTREFER)) {
if (chan->_state != AST_STATE_UP) { /* We are in early state */
Modified: team/bbryant/ssl-tcp-tls/channels/chan_vpb.cc
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/channels/chan_vpb.cc?view=diff&rev=69799&r1=69798&r2=69799
==============================================================================
--- team/bbryant/ssl-tcp-tls/channels/chan_vpb.cc (original)
+++ team/bbryant/ssl-tcp-tls/channels/chan_vpb.cc Mon Jun 18 15:03:43 2007
@@ -688,8 +688,8 @@
if (cli_struct->ra_cldn[0]=='\0'){
/*
- owner->cid.cid_num = strdup(cli_struct->cldn);
- owner->cid.cid_name = strdup(cli_struct->cn);
+ owner->cid.cid_num = ast_strdup(cli_struct->cldn);
+ owner->cid.cid_name = ast_strdup(cli_struct->cn);
*/
if (owner){
ast_set_callerid(owner, cli_struct->cldn, cli_struct->cn, cli_struct->cldn);
@@ -2694,7 +2694,7 @@
int oldformat;
struct vpb_pvt *p;
struct ast_channel *tmp = NULL;
- char *name = strdup(data ? (char *)data : "");
+ char *name = ast_strdup(data ? (char *)data : "");
char *s, *sepstr;
int group=-1;
@@ -2940,7 +2940,7 @@
} else if (strcasecmp(v->name, "language") == 0) {
strncpy(language, v->value, sizeof(language)-1);
} else if (strcasecmp(v->name, "callerid") == 0) {
- callerid = strdup(v->value);
+ callerid = ast_strdup(v->value);
} else if (strcasecmp(v->name, "mode") == 0) {
if (strncasecmp(v->value, "di", 2) == 0)
mode = MODE_DIALTONE;
Modified: team/bbryant/ssl-tcp-tls/channels/iax2-provision.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/channels/iax2-provision.c?view=diff&rev=69799&r1=69798&r2=69799
==============================================================================
--- team/bbryant/ssl-tcp-tls/channels/iax2-provision.c (original)
+++ team/bbryant/ssl-tcp-tls/channels/iax2-provision.c Mon Jun 18 15:03:43 2007
@@ -169,7 +169,7 @@
ast_mutex_lock(&provlock);
for (c = templates; c; c = c->next) {
if (!strncasecmp(word, c->name, wordlen) && ++which > state) {
- ret = strdup(c->name);
+ ret = ast_strdup(c->name);
break;
}
}
Modified: team/bbryant/ssl-tcp-tls/configure
URL: http://svn.digium.com/view/asterisk/team/bbryant/ssl-tcp-tls/configure?view=diff&rev=69799&r1=69798&r2=69799
==============================================================================
--- team/bbryant/ssl-tcp-tls/configure (original)
+++ team/bbryant/ssl-tcp-tls/configure Mon Jun 18 15:03:43 2007
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 66175 .
+# From configure.ac Revision: 67029 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
@@ -765,6 +765,10 @@
KDE_INCLUDE
KDE_DIR
PBX_KDE
+LTDL_LIB
+LTDL_INCLUDE
+LTDL_DIR
+PBX_LTDL
MISDN_LIB
MISDN_INCLUDE
MISDN_DIR
@@ -1533,6 +1537,7 @@
--with-imap=PATH use UW IMAP Toolkit files in PATH
--with-isdnnet=PATH use ISDN4Linux Library files in PATH
--with-kde=PATH use KDE files in PATH
+ --with-ltdl=PATH use libtool files in PATH
--with-misdn=PATH use mISDN User Library files in PATH
--with-nbs=PATH use Network Broadcast Sound files in PATH
--with-ncurses=PATH use ncurses files in PATH
@@ -7980,6 +7985,34 @@
fi
PBX_KDE=0
+
+
+
+
+
+
+LTDL_DESCRIP="libtool"
+LTDL_OPTION="ltdl"
+
+# Check whether --with-ltdl was given.
+if test "${with_ltdl+set}" = set; then
+ withval=$with_ltdl;
+case ${withval} in
+ n|no)
+ USE_LTDL=no
+ ;;
+ y|ye|yes)
+ ac_mandatory_list="${ac_mandatory_list} LTDL"
+ ;;
+ *)
+ LTDL_DIR="${withval}"
+ ac_mandatory_list="${ac_mandatory_list} LTDL"
+ ;;
+esac
+
+fi
+
+PBX_LTDL=0
@@ -19303,6 +19336,398 @@
fi
fi
+# Needed by unixodbc
+
+if test "x${PBX_LTDL}" != "x1" -a "${USE_LTDL}" != "no"; then
+ pbxlibdir=""
+ if test "x${LTDL_DIR}" != "x"; then
+ if test -d ${LTDL_DIR}/lib; then
+ pbxlibdir="-L${LTDL_DIR}/lib"
+ else
+ pbxlibdir="-L${LTDL_DIR}"
+ fi
+ fi
+ pbxfuncname="lt_dlinit"
+ if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
+ AST_LTDL_FOUND=yes
+ else
+ as_ac_Lib=`echo "ac_cv_lib_ltdl_${pbxfuncname}" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lltdl" >&5
+echo $ECHO_N "checking for ${pbxfuncname} in -lltdl... $ECHO_C" >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lltdl ${pbxlibdir} $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ${pbxfuncname} ();
+int
+main ()
+{
+return ${pbxfuncname} ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_Lib=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Lib=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval echo '${'$as_ac_Lib'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ AST_LTDL_FOUND=yes
+else
+ AST_LTDL_FOUND=no
+fi
+
+ fi
+
+ if test "${AST_LTDL_FOUND}" = "yes"; then
+ LTDL_LIB="-lltdl "
+ LTDL_HEADER_FOUND="1"
+ if test "x${LTDL_DIR}" != "x"; then
+ LTDL_LIB="${pbxlibdir} ${LTDL_LIB}"
+ LTDL_INCLUDE="-I${LTDL_DIR}/include"
+ saved_cppflags="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} -I${LTDL_DIR}/include"
+ if test "xltdl.h" != "x" ; then
+ as_ac_Header=`echo "ac_cv_header_${LTDL_DIR}/include/ltdl.h" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for ${LTDL_DIR}/include/ltdl.h" >&5
+echo $ECHO_N "checking for ${LTDL_DIR}/include/ltdl.h... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking ${LTDL_DIR}/include/ltdl.h usability" >&5
+echo $ECHO_N "checking ${LTDL_DIR}/include/ltdl.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <${LTDL_DIR}/include/ltdl.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
[... 1185 lines stripped ...]
More information about the asterisk-commits
mailing list