Luigi Rizzo
a6ee4667da
Cleanup the installation of samples, avoiding repetitions.
...
I am preserving the behaviour on *.adsi files,
i.e. overwrite anything there without making a backup.
However I am not sure that this is the intended behaviour.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-05 19:22:56 +00:00
Joshua Colp
dbd26a0a19
Merged revisions 88671 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r88671 | file | 2007-11-05 14:47:13 -0400 (Mon, 05 Nov 2007) | 7 lines
If a SIP channel is put on hold multiple times do not keep incrementing the onHold value.
(closes issue #11085 )
Reported by: francesco_r
Tested by: blitzrage
(closes issue #10474 )
Reported by: acennami
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88673 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-05 18:52:12 +00:00
Tilghman Lesher
00ad9612be
Change wording to that suggested by MasterYoda
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88653 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-05 18:22:20 +00:00
Luigi Rizzo
1945af7e71
simplify (hopefully) the printing of $(MAKE) in aligned output.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-05 18:00:24 +00:00
Russell Bryant
6677325afc
Merged revisions 88624 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r88624 | russell | 2007-11-05 11:46:02 -0600 (Mon, 05 Nov 2007) | 5 lines
Fix up datastore handling in ast_do_masquerade(). The code is intended to move
any channel datastores from the old channel to the new one. However, it did
not use the linked list macros properly to accomplish the task. The existing
code would only work if there was only a single datastore on the old channel.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88651 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-05 17:52:08 +00:00
Luigi Rizzo
80023593fc
print messages when entering/leaving a directory so we know where we are
...
(sometimes it is obvious, sometimes it is not).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88615 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-05 17:44:10 +00:00
Luigi Rizzo
cddb1a2532
merge two rules with the same right hand;
...
document a bit what is done here.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88587 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-05 17:27:02 +00:00
Jason Parker
135810daf9
Merged revisions 88585 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #11163 )
........
r88585 | qwell | 2007-11-05 11:19:41 -0600 (Mon, 05 Nov 2007) | 4 lines
Make sure we destroy the config structure on configuration failure.
Issue 11163, patch by eliel.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88586 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-05 17:21:05 +00:00
Kevin P. Fleming
b370079027
use a variable name that actually indicates what it is for
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88584 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-05 17:00:07 +00:00
Luigi Rizzo
f1d2836c8e
Put extra compiler flags into a variable so they are not repeated
...
too many times.
On passing, add some comments and fix indentation a bit.
On passing, i suspect that the following pattern is wrong
%.eoo: %.o
but in case it will be fixed in a later commit.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88553 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-05 16:41:39 +00:00
Tilghman Lesher
87bcdb9273
Merged revisions 88539 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r88539 | tilghman | 2007-11-05 10:20:13 -0600 (Mon, 05 Nov 2007) | 4 lines
Don't check used pooled connections for connection status, as it will cause issues for prepared queries.
Reported by: Nick Gorham (via -dev list)
Patch by: tilghman
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88540 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-05 16:30:51 +00:00
Luigi Rizzo
ba6664ef7d
remove a cygwin-specific function remap that does not work.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88525 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-05 15:15:22 +00:00
Joshua Colp
b543e84ef6
Fix memory leaks and deadlocks in chan_unistim.
...
(closes issue #11158 )
Reported by: eliel
Patches:
chan_unistim.c.patch uploaded by eliel (license 64)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88510 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-05 13:11:37 +00:00
Luigi Rizzo
4f4bb792a5
block merging of not-applicable patch
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88490 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-04 22:42:54 +00:00
Luigi Rizzo
08b10da53b
Simplify the implementation and the API for stringfields;
...
details and examples are in include/asterisk/stringfields.h.
Not applicable to older branches except for 1.4 which will
receive a fix for the routines that free memory pools.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88454 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-04 19:44:31 +00:00
Tilghman Lesher
eb856fbb48
Revert commit #86119 . Some users intentionally do not want colorized terminals, so this was a misfeature.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88437 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-03 14:19:47 +00:00
James Golovich
05dd7fec2c
Set CLI command to the correct name. Rev 85460 introduced two 'database show' commands when this one
...
should have been 'database showkey'
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88422 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-03 04:55:06 +00:00
Russell Bryant
286840b7cb
fix some issues with crashing on unload, when it didn't completely load cleanly
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88409 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 22:36:30 +00:00
Russell Bryant
a99e6015b2
Convert the CLI commands to the new format
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88408 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 22:08:15 +00:00
Russell Bryant
c93520b88b
propagate the DECLINE return value back to the loader
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88376 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 21:39:36 +00:00
Russell Bryant
9a47852673
Don't kill asterisk if extensions.lua is not present.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88371 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 21:36:37 +00:00
Russell Bryant
927901fdef
Show the channel unique ID in the "show channel concise" output
...
(closes issue #11148 , requested by falves11, patched by me)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 21:25:55 +00:00
Russell Bryant
267683eb19
Merge the code from asterisk/team/group/chan_unistim:
...
This introduces a new channel driver, chan_unistim, that supports the Unistim
VoIP protocol for Nortel phones. The following models have been confirmed
to work: i2002, i2004 and i2050.
(closes issue #8864 )
Reported by: c_hans
Patches:
chan_unistim.patch uploaded by c (license 304)
ustm_no_conf.diff uploaded by junky (license 177)
Tested by: c_hans, dbowerman, math, junky, loloski
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88368 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 20:56:12 +00:00
Joshua Colp
17f0f4c3fa
Merged revisions 88366 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r88366 | file | 2007-11-02 17:49:45 -0300 (Fri, 02 Nov 2007) | 4 lines
Make subscribecontext behave as advertised. It will now look for the presence of a hint in the given context (be it subscribecontext or context).
(closes issue #10702 )
Reported by: slavon
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88367 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 20:51:53 +00:00
Joshua Colp
a7c6c47e61
Merged revisions 88328 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r88328 | file | 2007-11-02 17:20:21 -0300 (Fri, 02 Nov 2007) | 6 lines
If an INFO request within a dialog is received with a content length of 0 simply send back a 200 OK. It is valid to do this and the remote side is probably using it to make sure the signalling is still alive.
(closes issue #5747 )
Reported by: chandi
Patches:
infofix-81430-1.patch uploaded by IgorG (license 20)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88329 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 20:22:40 +00:00
Russell Bryant
dffa53f718
Fix replacing the version number when it has a '/' in it, like
...
SVN-group-chan_unistim-r88326M-/trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 20:13:18 +00:00
Tilghman Lesher
ca55e2f671
Oops, some dev-mode changes for ISO C90
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88287 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 17:34:33 +00:00
Jason Parker
4cb45f18a1
Merged revisions 88283 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #11147 )
........
r88283 | qwell | 2007-11-02 11:51:08 -0500 (Fri, 02 Nov 2007) | 4 lines
We need to make sure to specify a language to ast_fileexists, otherwise it may fail for anything besides en
Issue 11147, fix discovered by both citats and myself (independently), with input from Corydon76
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88284 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 16:54:11 +00:00
Tilghman Lesher
a6fb1baef0
Add a few bytes on LUA
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88267 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 16:26:31 +00:00
Tilghman Lesher
e8c781b215
Add pbx_lua as a method of doing extensions
...
Reported by: mnicholson
Patch by: mnicholson
Closes issue #11140
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88250 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 15:36:34 +00:00
Tilghman Lesher
b6c7daa804
Don't re-cache the filename, but check to see if it already exists
...
Reported by: jamesgolovich
Patch by: jamesgolovich
Closes issue #11144
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 13:17:48 +00:00
Tilghman Lesher
ce90623010
Merged revisions 88210 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r88210 | tilghman | 2007-11-02 08:03:03 -0500 (Fri, 02 Nov 2007) | 5 lines
Fix build on Solaris
Reported by: snuffy
Patch by: ys
Closes issue #11143
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88211 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 13:10:29 +00:00
Tilghman Lesher
b5c2bcb169
'h' extension doesn't execute past first priority
...
Reported by: dimas
Patch by: dimas
Closes bug #11146
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88209 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 12:54:31 +00:00
Joshua Colp
16e33c3791
Restore building under 64-bit platforms.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88197 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 03:09:02 +00:00
Jason Parker
2902601eea
Remove traces of gnutls, since we no longer use/need it.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88184 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 23:26:51 +00:00
Tilghman Lesher
90db1316ed
Modify WaitExten to include an optional dialtone
...
Closes issue #10783
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88183 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 23:26:35 +00:00
Tilghman Lesher
4650a56d23
Convert cdr_odbc to use res_odbc managed connections
...
Closes issue #10614
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88182 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 22:43:46 +00:00
Steve Murphy
63f2f04cf4
This commits the performance mods that give the priority processing engine in the pbx, a 25-30% speed boost. The two updates used, are, first, to merge the ast_exists_extension() and the ast_spawn_extension() where they are called sequentially in a loop in the code, into a slightly upgraded version of ast_spawn_extension(), with a few extra args; and, second, I modified the substitute_variables_helper_full, so it zeroes out the byte after the evaluated string instead of demanding you pre-zero the buffer; I also went thru the code and removed the code that zeroed this buffer before every call to the substitute_variables_helper_full. The first fix provides about a 9% speedup, and the second the rest. These figures come from the 'PIPS' benchmark I describe in blogs, conf. reports, etc.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88166 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 22:26:51 +00:00
Jason Parker
842b1a34fe
Crap, accidentally copied the props. Thanks for pointing this out mvanbaak. The odds are quite high that this will break automerge on every team branch.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88165 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 22:19:56 +00:00
Jason Parker
5a58a4c475
Switch res_jabber to use openssl rather than gnutls.
...
Closes issue #9972 , patch by phsultan. Copied from branch at http://svn.digium.com/svn/asterisk/team/phsultan/res_jabber-openssl/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88164 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 22:10:33 +00:00
Tilghman Lesher
49631e20a4
Merged revisions 88116 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r88116 | tilghman | 2007-11-01 12:17:56 -0500 (Thu, 01 Nov 2007) | 2 lines
Add some notes on using valgrind
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88117 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 17:25:58 +00:00
Jason Parker
9a7ce542bc
Merged revisions 88078 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r88078 | qwell | 2007-11-01 11:21:22 -0500 (Thu, 01 Nov 2007) | 4 lines
Make sure we set the poll fds to NULL after free()ing it.
Part of issue 11017, patch by tzafrir.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88079 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 16:22:09 +00:00
Russell Bryant
1c7eb1d82b
Change some uses of free() to ast_free(). (No functional differences.)
...
(closes issue #11138 )
Reported by: eliel
Patches:
pbx_dundi.c.patch uploaded by eliel (license 64)
chan_sip.c.patch uploaded by eliel (license 64)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88077 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 15:56:25 +00:00
Russell Bryant
cac97aa8b4
Remove another copied source file on "make clean".
...
(closes issue #11137 )
Reported by: IgorG
Patches:
addonclean-87971-1.patch uploaded by IgorG (license 20)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88062 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 15:18:06 +00:00
Joshua Colp
e3f3a640c0
Merged revisions 88026 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r88026 | file | 2007-11-01 10:27:37 -0300 (Thu, 01 Nov 2007) | 2 lines
Fix up commit for my Zap channel with spies in Meetme fix. (thanks Tony Mountifield!)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88027 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 13:30:28 +00:00
Tilghman Lesher
c2aee728e9
Conditionally free lock_info->thread_name to avoid a useless warning
...
Reported by: snuffy
Patch by: snuffy
Closes issue #11125
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 06:12:08 +00:00
Tilghman Lesher
97fe45ab93
Janitor: use ast_free to pair calls of ast_malloc and ast_calloc
...
Reported by: eliel
Patch by: eliel
Closes issue #11135
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88008 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 06:07:18 +00:00
Tilghman Lesher
c96c01cfd1
Fix memory leak
...
Reported by: eliel
Fixed by: tilghman
Closes issue #11136
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 05:44:40 +00:00
Joshua Colp
78cae359c8
Merged revisions 87970 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r87970 | file | 2007-10-31 22:53:55 -0300 (Wed, 31 Oct 2007) | 4 lines
If a Zap channel contains a spy or a spy is added take it out of the conference in kernel space and make it go through Asterisk so the spy gets audio from both sides.
(closes issue #10060 )
Reported by: mparker
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87971 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 01:55:38 +00:00
Joshua Colp
284721fdb1
Drop any more references to type in the Exception dialplan function.
...
(closes issue #11134 )
Reported by: blitzrage
Patches:
exception_patch.txt uploaded by blitzrage (license 10)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87953 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 00:04:43 +00:00