Olle Johansson [Mon, 13 Nov 2006 16:08:12 +0000 (16:08 +0000)]
Only produce error message once, don't fill the screen with them...
(Testing SIPP thanks to JerJer and Greg)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47541
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 13 Nov 2006 14:29:31 +0000 (14:29 +0000)]
merge from astobj2-r47450: use UNLINK to remove a packet from its queue,
and related code rearrangement.
Approved by: oej
This could be made better if we declared
struct sip_pvt *dialpg = pkt->owner;
at the beginning of the function, and use it throughout the function.
I'll let the boss decide :)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47539
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 13 Nov 2006 14:14:54 +0000 (14:14 +0000)]
merge from codename-pineapple and astobj2 47499:
simplify __sip_ack() removing a strcmp for looking up packets.
no functional change, only performance, so don't need to merging
to earlier branches now.
Approved By: oej
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47538
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 13 Nov 2006 12:04:05 +0000 (12:04 +0000)]
stop looking for new entries when we know we are done.
there is no functional change, so it is not necessary to
bother merging this to 1.4 now.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47537
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 13 Nov 2006 12:01:25 +0000 (12:01 +0000)]
free memory when unregistering an entry.
needs to be merged to 1.4
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47536
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 13 Nov 2006 05:58:14 +0000 (05:58 +0000)]
Feature: allow the sanity SQL to be customized per connection class (Issue 6453)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47530
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 13 Nov 2006 05:51:30 +0000 (05:51 +0000)]
Merged revisions 47527 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47527 | russell | 2006-11-13 00:48:18 -0500 (Mon, 13 Nov 2006) | 5 lines
AC_PROG_SED is included in autoconf 2.60, but apparently it is not included
in 2.59. So, to maintain compatability with 2.59 since it is a small change,
copy this macro into acinclude.m4 and rename it to AST_PROG_SED.
(issue #8345)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47529
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 13 Nov 2006 05:48:27 +0000 (05:48 +0000)]
Merged revisions 47526 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r47526 | tilghman | 2006-11-12 23:46:18 -0600 (Sun, 12 Nov 2006) | 10 lines
Merged revisions 47525 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r47525 | tilghman | 2006-11-12 23:45:11 -0600 (Sun, 12 Nov 2006) | 2 lines
If the execute fails a second time, make sure that we don't pass back a stale handle
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47528
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 13 Nov 2006 01:16:30 +0000 (01:16 +0000)]
Merged revisions 47523 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r47523 | tilghman | 2006-11-12 19:12:01 -0600 (Sun, 12 Nov 2006) | 10 lines
Merged revisions 47522 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r47522 | tilghman | 2006-11-12 18:34:44 -0600 (Sun, 12 Nov 2006) | 2 lines
Don't play dialtone if the seizing the channel fails (Bug 7754)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47524
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Sun, 12 Nov 2006 20:47:25 +0000 (20:47 +0000)]
Part of patch in #7403 to improve tag checking in pedantic mode (stephen_dredge)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47521
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sun, 12 Nov 2006 19:22:19 +0000 (19:22 +0000)]
The use of an ifdef to check for FreeBSD is useless here because the two
versions of the format string are identical. Also, since each format is only
used once, get rid of the use of defines all together. (issue #8344, julieng)
In passing, also clean up the formatting a but to get rid of the nesting
without the use of braces, as defined in the coding guidelines.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47520
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Sun, 12 Nov 2006 16:15:49 +0000 (16:15 +0000)]
Restore auto-framing (DEA). Imported from 1.4
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47514
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Sun, 12 Nov 2006 15:40:03 +0000 (15:40 +0000)]
- Support UDPTL as well as udptl in T38 sdp.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47512
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Sun, 12 Nov 2006 15:30:48 +0000 (15:30 +0000)]
- Don't hangup because of failed re-invite. Go back to previous state.
- Keep RTP running during T.38 session
We might improve the code to issue ast_rtp_stop if T.38 re-invite not fails
later on in the code, but I don't see many reasons to.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47510
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Sun, 12 Nov 2006 15:14:35 +0000 (15:14 +0000)]
- Add some comments to t.38 code
- Remove improper blocking of ptime: in SDP
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47508
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sun, 12 Nov 2006 06:31:39 +0000 (06:31 +0000)]
Merged revisions 47497 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r47497 | russell | 2006-11-12 01:23:23 -0500 (Sun, 12 Nov 2006) | 12 lines
Merged revisions 47496 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r47496 | russell | 2006-11-12 01:09:03 -0500 (Sun, 12 Nov 2006) | 4 lines
Only do the check to determine whether the channel calling this function is an
IAX2 channel when getting the IP address using the special argument,
CURRENTCHANNEL. (issue #8341, jcovert)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47498
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sat, 11 Nov 2006 15:33:06 +0000 (15:33 +0000)]
Merged revisions 47494 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47494 | russell | 2006-11-11 10:31:08 -0500 (Sat, 11 Nov 2006) | 6 lines
Add the target "menuconfig" as an alias for the "menuselect" target. This is
just a favor to users so that if you accidentally type "make menuconfig"
instead of "make menuselect", it still works.
(inspired by a comment on IRC from wangster calling me an "especially devious
asterisk developer" for having it be menuselect instead of menuconfig. :) )
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47495
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sat, 11 Nov 2006 15:22:08 +0000 (15:22 +0000)]
Merged revisions 47492 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47492 | russell | 2006-11-11 10:18:02 -0500 (Sat, 11 Nov 2006) | 2 lines
Tweak the formatting of this new function to better conform to coding guidelines.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47493
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matt O'Gorman [Sat, 11 Nov 2006 02:12:27 +0000 (02:12 +0000)]
safe terminal output is sweet.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47491
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Fredrickson [Fri, 10 Nov 2006 22:06:11 +0000 (22:06 +0000)]
Make sure we don't use 32bits for a value that only requires 1 bit. Also, fix a compiler warning for one of the SS7 functions.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47478
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Fri, 10 Nov 2006 21:55:31 +0000 (21:55 +0000)]
Add some history and fix some debug output for autodestruct.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47477
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Fri, 10 Nov 2006 21:39:58 +0000 (21:39 +0000)]
Proper fix for adding debug...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47475
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Fri, 10 Nov 2006 20:31:57 +0000 (20:31 +0000)]
Make sure we destroy dialog in case of loop
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47468
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Fri, 10 Nov 2006 20:25:32 +0000 (20:25 +0000)]
Cleanup imported from 1.4
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47467
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 10 Nov 2006 20:05:31 +0000 (20:05 +0000)]
Fine, take this.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47465
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 10 Nov 2006 19:51:15 +0000 (19:51 +0000)]
A trunk that builds is a productive trunk.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47464
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 10 Nov 2006 19:42:15 +0000 (19:42 +0000)]
Hello compiler working, goodbye compiler warning. (fix compiler warning introduced from pbx_dundi optimizations)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47461
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 10 Nov 2006 19:40:01 +0000 (19:40 +0000)]
Merged revisions 47457 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47457 | file | 2006-11-10 14:36:25 -0500 (Fri, 10 Nov 2006) | 2 lines
Let's give this a go...
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47459
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Fredrickson [Fri, 10 Nov 2006 19:35:41 +0000 (19:35 +0000)]
Add fix for 7321. Ability to hide calleridname from zapata.conf
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47456
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Fri, 10 Nov 2006 19:01:12 +0000 (19:01 +0000)]
Issue 8336- fix support for multipart SDP (imported from 1.2/1.4). (Alphaque)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47455
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 10 Nov 2006 17:53:46 +0000 (17:53 +0000)]
Blocked revisions 47444 via svnmerge
........
r47444 | rizzo | 2006-11-10 12:13:34 -0500 (Fri, 10 Nov 2006) | 3 lines
grep -m is not available on BSD, so use head -1 instead
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47446
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Fri, 10 Nov 2006 17:22:51 +0000 (17:22 +0000)]
manual merge from 1.4:
grep -m not available on bsd, use head -1 which works for all
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47445
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 10 Nov 2006 17:01:06 +0000 (17:01 +0000)]
Merged revisions 47436 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47436 | tilghman | 2006-11-10 10:51:55 -0600 (Fri, 10 Nov 2006) | 2 lines
Discussion of these CLI changes resulted in more consistency (Bug 8236)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47439
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 10 Nov 2006 16:55:13 +0000 (16:55 +0000)]
Merged revisions 47437 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47437 | file | 2006-11-10 11:53:16 -0500 (Fri, 10 Nov 2006) | 2 lines
Only split up extension and context if a value exists. (issue #8332 reported by loloski)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47438
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Fri, 10 Nov 2006 16:38:33 +0000 (16:38 +0000)]
Merged revisions 47433 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47433 | kpfleming | 2006-11-10 10:36:49 -0600 (Fri, 10 Nov 2006) | 2 lines
if adding a queue member is LOG_NOTICE, then removing them should be LOG_NOTICE, not LOG_DEBUG
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47435
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Fri, 10 Nov 2006 16:37:42 +0000 (16:37 +0000)]
Merged revisions 47432 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47432 | kpfleming | 2006-11-10 10:34:04 -0600 (Fri, 10 Nov 2006) | 2 lines
reflect addition/removal of dynamic queue members in queue_log, so that people using dialplan replacement for AgentCallbackLogin can still track login/logout (issue #7736, reported/patched by whoiswes but this commit was written by me and covers all three paths for AQM/RQM)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47434
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Fri, 10 Nov 2006 13:14:44 +0000 (13:14 +0000)]
Ripping out bad support for 491 replies to INVITE's. Let's try again properly later.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47419
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Fri, 10 Nov 2006 12:22:44 +0000 (12:22 +0000)]
Fix badly defined flag. Thanks fenlander!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47416
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Fri, 10 Nov 2006 12:11:06 +0000 (12:11 +0000)]
Small simplification and documentation correction.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47415
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 10 Nov 2006 04:30:23 +0000 (04:30 +0000)]
Various little bits of code cleanup to reduce nesting, remove useless casts,
and to remove a duplicated error message after a memory allocation error
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47410
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 10 Nov 2006 03:59:48 +0000 (03:59 +0000)]
Add the ability to specify multiple prompts to the Read() dialplan application,
similar to Background() and Playback().
(issue #7897, jsmith, with some modifications)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47408
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 10 Nov 2006 03:45:59 +0000 (03:45 +0000)]
Merged revisions 47405 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47405 | file | 2006-11-09 22:44:36 -0500 (Thu, 09 Nov 2006) | 2 lines
Fix building of chan_h323 by completeing some structure definitions. (issue #8327 reported by Mithraen)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47406
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 10 Nov 2006 03:34:13 +0000 (03:34 +0000)]
This should already be called while locked.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47404
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 9 Nov 2006 22:34:00 +0000 (22:34 +0000)]
Merged revisions 47398 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47398 | file | 2006-11-09 17:32:30 -0500 (Thu, 09 Nov 2006) | 2 lines
Do conversion in a more easier to read and working way for \r, \n, and \t. (issue #8324 reported by johnlange)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47399
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 9 Nov 2006 21:32:27 +0000 (21:32 +0000)]
Merged revisions 47391 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47391 | russell | 2006-11-09 16:26:27 -0500 (Thu, 09 Nov 2006) | 7 lines
Work around an issue that caused menuselect to display a bogus description for
app_voicemail and chan_zap. These modules use some preprocessor directives to
determine what it will report to Asterisk as its description. However, the way
we extract this information from the source files for menuselect is not smart
enough to figure this out.
(issue #8326, #8328)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47392
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 9 Nov 2006 17:08:29 +0000 (17:08 +0000)]
Merged revisions 47380 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r47380 | file | 2006-11-09 11:53:25 -0500 (Thu, 09 Nov 2006) | 10 lines
Merged revisions 47379 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r47379 | file | 2006-11-09 11:48:05 -0500 (Thu, 09 Nov 2006) | 2 lines
Don't include compiler.h on kernels 2.6.18 and higher as, well, it's apparently going to be removed. This should make all you FC6 fans happy as your Asterisk will now build without any mods.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47382
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 9 Nov 2006 16:30:06 +0000 (16:30 +0000)]
Merged revisions 47377 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47377 | russell | 2006-11-09 11:28:15 -0500 (Thu, 09 Nov 2006) | 2 lines
fix tab completion for "core debug channel" and "core no debug channel"
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47378
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 9 Nov 2006 16:26:47 +0000 (16:26 +0000)]
Merged revisions 47375 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47375 | russell | 2006-11-09 11:24:02 -0500 (Thu, 09 Nov 2006) | 3 lines
Fix "core show channel". Also, fix tab completion for both "core show channel"
and "core show channels".
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47376
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 9 Nov 2006 16:20:43 +0000 (16:20 +0000)]
Merged revisions 47372 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47372 | russell | 2006-11-09 11:18:33 -0500 (Thu, 09 Nov 2006) | 3 lines
Fix "core debug channel <whatever>". I guess someone needs to go through and
audit every CLI command that changed number of arguments ...
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47374
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 9 Nov 2006 16:15:49 +0000 (16:15 +0000)]
Blocked revisions 47369 via svnmerge
........
r47369 | russell | 2006-11-09 11:04:38 -0500 (Thu, 09 Nov 2006) | 3 lines
Fix argument parsing for the "core show profile" CLI command
(fixed by rizzo in his branch, team/rizzo/astobj2)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47371
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 9 Nov 2006 15:51:15 +0000 (15:51 +0000)]
Merged revisions 47366 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47366 | russell | 2006-11-09 10:49:39 -0500 (Thu, 09 Nov 2006) | 3 lines
Fix another CLI command, "core show uptime" ...
(issue #8323, reported by johnlange, fixed by myself)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47367
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 9 Nov 2006 06:35:05 +0000 (06:35 +0000)]
Merged revisions 47352 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47352 | russell | 2006-11-09 01:31:37 -0500 (Thu, 09 Nov 2006) | 3 lines
fix "core show version" to reflect the new number of arguments for this
CLI command (issue #8316, kshumard)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47353
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Thu, 9 Nov 2006 00:46:24 +0000 (00:46 +0000)]
Blocking 47344 from automerging into trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47351
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Thu, 9 Nov 2006 00:40:14 +0000 (00:40 +0000)]
Blocking 47348 from automerging into trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47350
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Wed, 8 Nov 2006 23:17:27 +0000 (23:17 +0000)]
This mod via bug 7531
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47349
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Wed, 8 Nov 2006 22:52:01 +0000 (22:52 +0000)]
committed in behalf of bug 8190
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47343
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 8 Nov 2006 22:35:22 +0000 (22:35 +0000)]
- Add Max-Forwards higher in the packet, following recommendations
- Fix documentation for sip_pvt_lock/unlock - doxygen does not inherit like zapata.conf !!!
- Change doc for a sip_pvt setting
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47341
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Wed, 8 Nov 2006 21:59:51 +0000 (21:59 +0000)]
restore display of G.722 codec
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47339
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Wed, 8 Nov 2006 18:28:53 +0000 (18:28 +0000)]
Merged revisions 47333 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47333 | kpfleming | 2006-11-08 12:07:16 -0600 (Wed, 08 Nov 2006) | 2 lines
add simple fix for SDP to report proper sample rate for G.722 media sessions
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47337
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Wed, 8 Nov 2006 18:26:52 +0000 (18:26 +0000)]
Display CID matching information when using dialplan show. (issue #8279 reported by caio1982)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47335
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 8 Nov 2006 17:06:33 +0000 (17:06 +0000)]
Merged revisions 47331 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47331 | russell | 2006-11-08 12:03:09 -0500 (Wed, 08 Nov 2006) | 5 lines
I occasionally get email from users that are trying to figure out what this
does, or due to some misunderstanding as to what it is supposed to do, can't
get it to work. So, I have added some text here to hopefully explain what
this application does and does not do.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47332
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 8 Nov 2006 16:59:04 +0000 (16:59 +0000)]
Blocked revisions 47329 via svnmerge
........
r47329 | russell | 2006-11-08 11:55:35 -0500 (Wed, 08 Nov 2006) | 2 lines
Make this module build again
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47330
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 8 Nov 2006 16:36:45 +0000 (16:36 +0000)]
Merged revisions 47327 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47327 | russell | 2006-11-08 11:31:59 -0500 (Wed, 08 Nov 2006) | 4 lines
Copy the macros from libtool.m4 to our own acinclude.m4 such that libtool is
no longer required to be installed to be able to generate the configure
script.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47328
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 8 Nov 2006 16:29:41 +0000 (16:29 +0000)]
Blocked revisions 47323 via svnmerge
........
r47323 | russell | 2006-11-08 11:08:50 -0500 (Wed, 08 Nov 2006) | 3 lines
Remove aclocal.m4 from the tree since it is just an intermediate file created
while generating the configure script.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47325
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Wed, 8 Nov 2006 15:28:39 +0000 (15:28 +0000)]
coding guidelines, coding guidelines, coding guidelines
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47321
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 8 Nov 2006 13:59:32 +0000 (13:59 +0000)]
merge from team/rizzo/astobj2 rev.47271
avoid doing p > 0 when p is a pointer;
move a lock closer to the place where it is needed
Approved By: oej
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47318
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 8 Nov 2006 13:53:01 +0000 (13:53 +0000)]
merge from team/rizzo/astobj2 rev.47246
Same as for peers and users, replace ASTOBJ_UNREF(r, sip_registry_destroy)
with unref_registry(r);
Approved By: oej
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47317
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 8 Nov 2006 13:49:25 +0000 (13:49 +0000)]
merge from team/rizzo/astobj2, rev 47243, 47244, 47245:
Replace ASTOBJ_UNREF(peer, sip_destroy_peer) with unref_peer(peer);
This places the name of the destructor in one place only (where it
should be), eliminates the chance of errors in case you specify the wrong
destructor, and also lets the compiler do type checking on the argument,
again helping with keeping the code clean.
Same for users.
remove two duplicate definitions.
Approved By: oej
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47316
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 8 Nov 2006 13:44:27 +0000 (13:44 +0000)]
merge rev.47224 from team/rizzo/astobj2:
hide dialoglist lock/unlocking in wrapper functions.
Approved By: oej
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47315
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 8 Nov 2006 13:43:06 +0000 (13:43 +0000)]
silence compiler about uninitialized variables.
The compiler is wrong, but it has the last word.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47314
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 8 Nov 2006 08:01:44 +0000 (08:01 +0000)]
Destroy dialog properly at unload (rizzo)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47313
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 8 Nov 2006 07:21:45 +0000 (07:21 +0000)]
fix compilation.
Overall i think the previous change to ast_channel_alloc()
to close bug 7506 should have been done by defining
an ast_set_callerid_noevent() function that does the
setting without generating the event.
Lot less code duplication, and easier to handle.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47306
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 8 Nov 2006 03:13:46 +0000 (03:13 +0000)]
add a comment about where AC_PROG_LD comes from
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47305
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 8 Nov 2006 03:12:31 +0000 (03:12 +0000)]
remove aclocal.m4 from the tree since it is just an intermediate file created
while generating the configure script.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47304
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Tue, 7 Nov 2006 23:14:04 +0000 (23:14 +0000)]
fix "core show profile" parsing.
Needs to go in 1.4 too, but ENOTIME now
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47300
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Tue, 7 Nov 2006 22:26:48 +0000 (22:26 +0000)]
%ld and time_t don't match, so cast the argument to long
to ease portability problems
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47295
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Tue, 7 Nov 2006 21:47:49 +0000 (21:47 +0000)]
A fair number of changes for the sake of bug 7506
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47290
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 7 Nov 2006 20:16:02 +0000 (20:16 +0000)]
Merged revisions 47287 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47287 | file | 2006-11-07 15:14:58 -0500 (Tue, 07 Nov 2006) | 2 lines
This is not the commit you are looking for...
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47288
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 7 Nov 2006 20:12:30 +0000 (20:12 +0000)]
Merged revisions 47284 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47284 | file | 2006-11-07 15:08:52 -0500 (Tue, 07 Nov 2006) | 2 lines
Make MOH work as it did before in chan_local, without this then it can go funky when transfers and MOH are involved. (issue #7671 reported by jmls)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47285
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Tue, 7 Nov 2006 18:56:56 +0000 (18:56 +0000)]
Merged revisions 47279 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47279 | kpfleming | 2006-11-07 12:56:21 -0600 (Tue, 07 Nov 2006) | 2 lines
clean up sample config, and make native file playback the more obvious default choice
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47280
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matt O'Gorman [Tue, 7 Nov 2006 18:50:58 +0000 (18:50 +0000)]
rge overhaul to voicemail imap support. Allows support for more imap servers,
also a better implementation of several parts of the original work.
patch provided by 8033 with major upgrades. minor differences from 1.4 patch do to
changes in app_voicemail
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47278
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 7 Nov 2006 17:33:24 +0000 (17:33 +0000)]
Break -> continue to make stuff work... Thanks, Luigi!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47269
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Tue, 7 Nov 2006 14:25:00 +0000 (14:25 +0000)]
remove another broken property merge
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47259
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Tue, 7 Nov 2006 14:24:19 +0000 (14:24 +0000)]
remove properties that shouldn't be merged to this branch
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47258
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Tue, 7 Nov 2006 14:17:53 +0000 (14:17 +0000)]
use editable URL for menuselect, and switch to trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47257
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 7 Nov 2006 13:26:31 +0000 (13:26 +0000)]
issue #8265 - don't reply to ACK. Imported from 1.2, 1.4
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47252
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 7 Nov 2006 13:16:05 +0000 (13:16 +0000)]
Stealing Tilghman's explanation from the -dev list and producing documentation...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47251
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Tue, 7 Nov 2006 08:34:26 +0000 (08:34 +0000)]
explain why ast_carefulwrite is written the way it is,
and also that it doesn't really work as claimed.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47242
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 7 Nov 2006 01:28:08 +0000 (01:28 +0000)]
Merged revisions 47239 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r47239 | russell | 2006-11-06 20:25:10 -0500 (Mon, 06 Nov 2006) | 13 lines
Merged revisions 47238 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r47238 | russell | 2006-11-06 20:22:58 -0500 (Mon, 06 Nov 2006) | 5 lines
If random order is enabled for files mode music on hold, set a random initial
position, instead of always starting at the first file, and doing the random
operation only when switching to the next file.
(bug reported by John Lange on the asterisk-dev mailing list)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47240
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 6 Nov 2006 18:05:11 +0000 (18:05 +0000)]
check for failure after call to calloc() (issue #8295)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47232
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Mon, 6 Nov 2006 17:27:28 +0000 (17:27 +0000)]
minor change to test live syncing
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47230
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 6 Nov 2006 17:05:04 +0000 (17:05 +0000)]
Add support for manager hooks, so you could fire off manager events over IRC if you were crazy enough. (issue #5161 reported by anthm with mods by moi)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47229
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sun, 5 Nov 2006 01:04:29 +0000 (01:04 +0000)]
Make pbx_dundi compile again. Sorry. :(
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47213
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sat, 4 Nov 2006 22:41:12 +0000 (22:41 +0000)]
List ss7 with the rest of the valid signalling types. Group SS7 options
together and comment them out by default.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47210
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Sat, 4 Nov 2006 22:16:57 +0000 (22:16 +0000)]
Don't lock dialoglist if monitor runs __sip_destroy.
Hmmm. I did not change pbx_dundi and yet it doesn't compile ;-)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47209
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sat, 4 Nov 2006 22:08:35 +0000 (22:08 +0000)]
use the AST_MODULE_LOAD_* return codes from load_module()
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47207
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sat, 4 Nov 2006 21:54:37 +0000 (21:54 +0000)]
simplify a couple of loops
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47206
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Sat, 4 Nov 2006 21:48:02 +0000 (21:48 +0000)]
Move IP address selection for media out of add_sdp
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47205
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sat, 4 Nov 2006 21:44:48 +0000 (21:44 +0000)]
Do some minor cleanup to the section of code that sets the EID by getting the
mac address for an ethernet interface
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47204
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Sat, 4 Nov 2006 21:17:40 +0000 (21:17 +0000)]
Make srvlookup global_srvlookup to follow the rest of the code
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47203
65c4cc65-6c06-0410-ace0-
fbb531ad65f3