Commit Graph

5277 Commits

Author SHA1 Message Date
Tilghman Lesher
af9f8bf291 Merged revisions 137848 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r137848 | tilghman | 2008-08-14 11:52:43 -0500 (Thu, 14 Aug 2008) | 17 lines

Merged revisions 137847 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r137847 | tilghman | 2008-08-14 11:47:30 -0500 (Thu, 14 Aug 2008) | 9 lines

When creating the secondary subchannel name, it is necessary to compare to
the existing channel name without the "Zap/" or "DAHDI/" prefix, since our
test string is also without that prefix.
(closes issue #13027)
 Reported by: dferrer
 Patches: 
       chan_zap-1.4.21.1_fix2.patch uploaded by dferrer (license 525)
       (Slightly modified by me, to compensate for both names)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@137849 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 16:54:22 +00:00
Jason Parker
17f520666d Merged revisions 137812 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r137812 | qwell | 2008-08-14 10:32:16 -0500 (Thu, 14 Aug 2008) | 8 lines

Make sure we set the socket port, so we don't try to use <ip address>:0.

(closes issue #13255)
Reported by: falves11
Patches:
      13255-socketport.diff uploaded by qwell (license 4)
Tested by: falves11

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@137814 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 15:37:35 +00:00
Jason Parker
c6681ec41d Merged revisions 137532 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r137532 | qwell | 2008-08-13 16:08:58 -0500 (Wed, 13 Aug 2008) | 8 lines

Correctly end locally ended calls.

(closes issue #12170)
Reported by: pj
Patches:
      20080702__issue12170_clear_pendinginvite.diff uploaded by bbryant (license 36)
Tested by: bbryant, pabelanger

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@137533 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 21:09:36 +00:00
Richard Mudgett
bca2b8aea0 Merged revisions 136594 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r136594 | rmudgett | 2008-08-07 14:01:03 -0500 (Thu, 07 Aug 2008) | 13 lines

Merged revisions 136241 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r136241 | rmudgett | 2008-08-06 16:18:53 -0500 (Wed, 06 Aug 2008) | 5 lines

*  The allowed_bearers setting in misdn.conf misspelled one
of its options: digital_restricted.
*  Fixed some other spelling errors and typos.


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@136598 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-07 19:19:49 +00:00
Mark Michelson
b9dfa2fe6c Merged revisions 136063 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r136063 | mmichelson | 2008-08-06 10:59:29 -0500 (Wed, 06 Aug 2008) | 24 lines

Merged revisions 136062 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r136062 | mmichelson | 2008-08-06 10:58:40 -0500 (Wed, 06 Aug 2008) | 16 lines

Since adding the AST_CONTROL_SRCUPDATE frame type,
there are places where ast_rtp_new_source may be called
where the tech_pvt of a channel may not yet have an
rtp structure allocated. This caused a crash in chan_skinny,
which was fixed earlier, but now the same crash has been 
reported against chan_h323 as well. It seems that the best 
solution is to modify ast_rtp_new_source to not attempt to 
set the marker bit if the rtp structure passed in is NULL.

This change to ast_rtp_new_source also allows the removal
of what is now a redundant pointer check from chan_skinny.

(closes issue #13247)
Reported by: pj


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@136064 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-06 16:00:07 +00:00
Tilghman Lesher
2085534aef Merged revisions 135748 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r135748 | tilghman | 2008-08-05 16:37:35 -0500 (Tue, 05 Aug 2008) | 17 lines

Merged revisions 135747 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135747 | tilghman | 2008-08-05 16:34:46 -0500 (Tue, 05 Aug 2008) | 9 lines

In a conversion to use ast_strlen_zero, the meaning of the flag IAX_HASCALLERID
was perverted.  This change reverts IAX2 to the original meaning, which was,
that the callerid set on the client should be overridden on the server, even if
that means the resulting callerid is blank.  In other words, if you set
"callerid=" in the IAX config, then the callerid should be overridden to blank,
even if set on the client.  Note that there's a distinction, even on realtime,
between the field not existing (NULL in databases) and the field existing, but
set to blank (override callerid to blank).

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135749 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-05 21:38:29 +00:00
Russell Bryant
bf7ca7ec97 Merged revisions 135439 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r135439 | russell | 2008-08-04 10:02:12 -0500 (Mon, 04 Aug 2008) | 4 lines

Be explicit that we don't want a result from this callback.  The callback would
never indicate a match, so nothing would have been returned anyway, but it was
still a poor example of proper usage.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135440 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-04 15:02:44 +00:00
Sean Bright
3f6647d7ad Merged revisions 135197 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r135197 | seanbright | 2008-08-01 15:29:26 -0400 (Fri, 01 Aug 2008) | 6 lines

Remove some code that used to do something but does not anymore, mainly
to get rid of a shadow warning (but this seemed legitimate enough to fix
here instead of in my branch).

Thanks to putnopvut for taking a look as well.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135198 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 19:30:31 +00:00
Tilghman Lesher
45253fa663 Merged revisions 135128 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r135128 | tilghman | 2008-08-01 12:09:50 -0500 (Fri, 01 Aug 2008) | 2 lines

Picky, picky, buildbot

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135129 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 17:10:29 +00:00
Tilghman Lesher
4802c70d3a Merged revisions 135126 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r135126 | tilghman | 2008-08-01 11:39:51 -0500 (Fri, 01 Aug 2008) | 9 lines

SIP should use the transport type set in the Moved Temporarily for the next
invite.
(closes issue #11843)
 Reported by: pestermann
 Patches: 
       20080723__issue11843_302_ignores_transport_16branch.diff uploaded by bbryant (license 36)
       20080723__issue11843_302_ignores_transport_trunk.diff uploaded by bbryant (license 36)
 Tested by: pabelanger

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135127 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 16:44:32 +00:00
Michiel van Baak
5468f7fe62 Merged revisions 135056 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r135056 | mvanbaak | 2008-08-01 13:00:13 +0200 (Fri, 01 Aug 2008) | 16 lines

Merged revisions 135055 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135055 | mvanbaak | 2008-08-01 12:55:27 +0200 (Fri, 01 Aug 2008) | 8 lines

fix some potential deadlocks in chan_skinny

(closes issue #13215)
Reported by: qwell
Patches:
      2008080100_bug13215.diff.txt uploaded by mvanbaak (license 7)
Tested by: mvanbaak

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135057 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 11:03:07 +00:00
Russell Bryant
3abfb2c7d4 Merged revisions 134815 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134815 | russell | 2008-07-31 11:50:10 -0500 (Thu, 31 Jul 2008) | 15 lines

Merged revisions 134814 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r134814 | russell | 2008-07-31 11:45:31 -0500 (Thu, 31 Jul 2008) | 7 lines

In case we have some processing threads that free more frames than they allocate,
do not let the frame cache grow forever.

(closes issue #13160)
Reported by: tavius
Tested by: tavius, russell

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134816 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 16:53:18 +00:00
Mark Michelson
d6b4e025b0 Merged revisions 134556 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134556 | mmichelson | 2008-07-30 15:24:40 -0500 (Wed, 30 Jul 2008) | 7 lines

Fix the parsing of the "reason" parameter in the
Diversion: header.

(closes issue #13195)
Reported by: woodsfsg


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134561 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 20:25:57 +00:00
Kevin P. Fleming
25fe3c40f1 Merged revisions 134260 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134260 | kpfleming | 2008-07-29 17:22:13 -0500 (Tue, 29 Jul 2008) | 2 lines

build against the now-typedef-free dahdi/user.h, and remove some #ifdefs for features that will always be present in DAHDI

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-29 22:29:11 +00:00
Kevin P. Fleming
261a4972f6 Merged revisions 134086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134086 | kpfleming | 2008-07-28 11:42:00 -0500 (Mon, 28 Jul 2008) | 3 lines

remove remaining Zaptel references in various places


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-28 16:49:18 +00:00
Tilghman Lesher
e680b3734f Merged revisions 133665 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r133665 | tilghman | 2008-07-25 12:24:43 -0500 (Fri, 25 Jul 2008) | 16 lines

Merged revisions 133649 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r133649 | tilghman | 2008-07-25 12:19:39 -0500 (Fri, 25 Jul 2008) | 8 lines

Fix some errant device states by making the devicestate API more strict in
terms of the device argument (only without the unique identifier appended).
(closes issue #12771)
 Reported by: davidw
 Patches: 
       20080717__bug12771.diff.txt uploaded by Corydon76 (license 14)
 Tested by: davidw, jvandal, murf

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-25 17:26:38 +00:00
Mark Michelson
19380639cb Merged revisions 133573 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r133573 | mmichelson | 2008-07-25 09:40:52 -0500 (Fri, 25 Jul 2008) | 15 lines

Merged revisions 133572 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r133572 | mmichelson | 2008-07-25 09:40:10 -0500 (Fri, 25 Jul 2008) | 7 lines

We need to make sure to null-terminate the "name"
portion of SIP URI parameters so that there are no
bogus comparisons.

Thanks to bbryant for pointing this out.


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133574 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-25 14:41:40 +00:00
Russell Bryant
6316323815 Merged revisions 133568 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r133568 | russell | 2008-07-25 08:01:59 -0500 (Fri, 25 Jul 2008) | 4 lines

Minor coding guidelines tweaks ...
 - Use ast_strlen_zero in one place
 - check for successful string comparison the way most of Asterisk code does it

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133569 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-25 13:25:10 +00:00
Tilghman Lesher
640d750b3e Merged revisions 133509 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r133509 | tilghman | 2008-07-24 16:27:06 -0500 (Thu, 24 Jul 2008) | 11 lines

Merged revisions 133488 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r133488 | tilghman | 2008-07-24 16:17:55 -0500 (Thu, 24 Jul 2008) | 3 lines

Fix rtautoclear and rtcachefriends
(Closes issue #12707)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133524 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-24 21:31:29 +00:00
Russell Bryant
b1fb1c8da1 Merged revisions 133486 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r133486 | russell | 2008-07-24 15:40:15 -0500 (Thu, 24 Jul 2008) | 3 lines

I made this change from DEVICE_STATE to DEVICE_STATE_CHANGE, but I had it backwards,
this is the right event to subscribe to ...

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133487 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-24 20:41:36 +00:00
Jason Parker
f72194ea8c Merged revisions 133296 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r133296 | qwell | 2008-07-23 16:50:20 -0500 (Wed, 23 Jul 2008) | 9 lines

Merged revisions 133295 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r133295 | qwell | 2008-07-23 16:49:03 -0500 (Wed, 23 Jul 2008) | 1 line

inbandrelease is gone - it's now inbanddisconnect
........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-23 21:50:57 +00:00
Brett Bryant
14bb7ff651 Merged revisions 133197 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r133197 | bbryant | 2008-07-23 15:33:22 -0500 (Wed, 23 Jul 2008) | 2 lines

Fix issue where tcp in sip is enabled by default, despite what it says in the config sample file. Also fix "sip show settings" for tcp connections.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133218 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-23 20:39:37 +00:00
Mark Michelson
880a6f5215 Merged revisions 133041 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r133041 | mmichelson | 2008-07-23 12:54:03 -0500 (Wed, 23 Jul 2008) | 15 lines

Merged revisions 133038 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r133038 | mmichelson | 2008-07-23 12:50:01 -0500 (Wed, 23 Jul 2008) | 7 lines

Small cleanup. Move the declaration of the DAHDI_SPANINFO
variable to the block where it is used. This allows one
less #ifdef HAVE_PRI to clutter things up.

Thanks to Tzafrir for pointing this out on #asterisk-dev


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133042 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-23 17:55:49 +00:00
Tilghman Lesher
817985e1be Merged revisions 132981 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r132981 | tilghman | 2008-07-23 12:20:43 -0500 (Wed, 23 Jul 2008) | 6 lines

Yet another conversion of '|' to ','
(closes issue #13137)
 Reported by: eliel
 Patches: 
       chan_iax2trunk-IAXPEER.patch uploaded by eliel (license 64)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-23 17:21:51 +00:00
Kevin P. Fleming
61e8f3a559 Merged revisions 132883,132966 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r132883 | crichter | 2008-07-23 07:07:15 -0500 (Wed, 23 Jul 2008) | 9 lines

Merged revisions 132826 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r132826 | crichter | 2008-07-23 13:37:50 +0200 (Mi, 23 Jul 2008) | 1 line

another Fix because of r119585, this commit has broken high frequented BRI Ports, there was a possibility that a channel, that was marked as in_use would be reused later, the corresponding port could got stuck then. So it is recommended to upgrade for chan_misdn users.
........

................
r132966 | kpfleming | 2008-07-23 11:38:28 -0500 (Wed, 23 Jul 2008) | 2 lines

use correct function name... please compile with --enable-dev-mode

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132967 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-23 16:42:28 +00:00
Olle Johansson
5881728776 Merged revisions 132823 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r132823 | oej | 2008-07-23 10:13:07 +0200 (Ons, 23 Jul 2008) | 8 lines

Well, the content of a channel variable may be longer than the size of a pointer...
Thanks, eliel!

Reported by: eliel
Patches: 
      chan_siptrunk.SIPPEER.patch uploaded by eliel (license 64)
(closes issue #13135)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132824 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-23 08:18:59 +00:00
Mark Michelson
6985ec34a8 Merged revisions 132795 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r132795 | mmichelson | 2008-07-22 17:17:09 -0500 (Tue, 22 Jul 2008) | 11 lines

Merged revisions 132777 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
Allow Spiraled INVITEs to work correctly within Asterisk.

Prior to this change, a spiraled INVITE would cause a 482
Loop Detected to be sent to the caller. With this change,
if a potential loop is detected, the Request-URI is inspected
to see if it has changed from what was originally received. If
pedantic mode is on, then this inspection is fully RFC 3261
compliant. If pedantic mode is not on, then a string comparison
is used to test the equality of the two R-URIs.

This has been tested by using OpenSER to rewrite the R-URI
and send the INVITE back to Asterisk.

(closes issue #7403)
Reported by: stephen_dredge


Modified:
    branches/1.4/channels/chan_sip.c


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132797 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-22 22:20:50 +00:00
Kevin P. Fleming
b70cace390 Merged revisions 132791 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r132791 | kpfleming | 2008-07-22 17:14:37 -0500 (Tue, 22 Jul 2008) | 2 lines

correct fix made in r132777... the code *did* compile in dev-mode, as long as libpri was installed and enabled

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-22 22:15:54 +00:00
Olle Johansson
62c2359763 Merged revisions 132703 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r132703 | oej | 2008-07-22 22:46:11 +0200 (Tis, 22 Jul 2008) | 17 lines

Merged revisions 132645 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r132645 | oej | 2008-07-22 22:10:26 +0200 (Tis, 22 Jul 2008) | 9 lines

The most common question on the #asterisk iRC channel and on mailing lists
seems to be in regards to an error message when retransmit fails. This
is frequently misunderstood as a failure of Asterisk, not a failure of
the network to reach the other party.

This document tries to assist the Asterisk user in sorting out these
issues by explaining the logic and pointing at some possible 
causes. Hopefully, we will get other questions now :-)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132782 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-22 21:59:38 +00:00
Tilghman Lesher
2ab5c16e5f Merged revisions 132778 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r132778 | tilghman | 2008-07-22 16:53:40 -0500 (Tue, 22 Jul 2008) | 18 lines

Merged revisions 132713 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r132713 | tilghman | 2008-07-22 16:19:39 -0500 (Tue, 22 Jul 2008) | 10 lines

Merged revisions 132711 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r132711 | tilghman | 2008-07-22 16:14:10 -0500 (Tue, 22 Jul 2008) | 2 lines

Fixes for AST-2008-010 and AST-2008-011

........

................

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-22 21:55:06 +00:00
Mark Michelson
1e742cc32f Merged revisions 132777 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r132777 | mmichelson | 2008-07-22 16:52:24 -0500 (Tue, 22 Jul 2008) | 3 lines

Get chan_dahdi to compile in devmode


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132779 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-22 21:54:21 +00:00
Kevin P. Fleming
fdebba2a52 Merged revisions 132721 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r132721 | kpfleming | 2008-07-22 16:21:56 -0500 (Tue, 22 Jul 2008) | 14 lines

Merged revisions 132712 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r132712 | kpfleming | 2008-07-22 16:17:23 -0500 (Tue, 22 Jul 2008) | 6 lines

ensure that if any alarms exist at channel creation time, they are handled identically to if they occurred later, so that later alarm clearing will work properly and 'make sense'

(closes issue #12160)
Reported by: tzafrir


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132729 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-22 21:23:41 +00:00
Kevin P. Fleming
de75687750 Merged revisions 132643 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r132643 | kpfleming | 2008-07-22 14:59:10 -0500 (Tue, 22 Jul 2008) | 10 lines

Merged revisions 132641 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r132641 | kpfleming | 2008-07-22 14:49:11 -0500 (Tue, 22 Jul 2008) | 2 lines

use renamed libpri API call for controlling this feature (was improperly named before)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132644 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-22 20:03:35 +00:00
Kevin P. Fleming
c5552225dd Merged revisions 132573 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r132573 | kpfleming | 2008-07-21 17:51:16 -0500 (Mon, 21 Jul 2008) | 10 lines

Merged revisions 132571 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r132571 | kpfleming | 2008-07-21 17:45:16 -0500 (Mon, 21 Jul 2008) | 2 lines

teach chan_dahdi how to find the D-channel on BRI spans, and don't attempt to use channel 24 as a D-channel on spans of unexpected sizes

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132574 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-21 22:52:36 +00:00
Brett Bryant
63634dedbe Merged revisions 132468 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r132468 | bbryant | 2008-07-21 12:42:45 -0500 (Mon, 21 Jul 2008) | 5 lines

Fix bug where ast_parse_arg would inadvertantly enable sip tcp when parsing a tcpbindaddr if it was disabled.

(closes issue #13117)
Reported by: pj

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-21 17:43:29 +00:00
Brett Bryant
3224dcc7c7 Merged revisions 132466 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r132466 | bbryant | 2008-07-21 12:22:02 -0500 (Mon, 21 Jul 2008) | 3 lines

Fix an issue in iax2 where a call that's been rejected still kept an open channel on the side that attempted to make the call (not the side of the 
call that rejected the call). Changes were load tested and also approved by Russell.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132467 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-21 17:25:09 +00:00
Jeff Peeler
a5962c87e2 Merged revisions 132425 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r132425 | jpeeler | 2008-07-21 10:33:13 -0500 (Mon, 21 Jul 2008) | 2 lines

make buffers config option (chan_dahdi.conf) parsing safer and added logging in case of failure

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132426 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-21 15:34:21 +00:00
Matthew Fredrickson
c1c0583b01 Merged revisions 132108 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r132108 | mattf | 2008-07-18 13:50:00 -0500 (Fri, 18 Jul 2008) | 1 line

Make sure we break the poll so that messages queued will be sent on the SS7 when using CLI commands for blocking and blocking of CICs and linksets.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132111 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-18 18:53:54 +00:00
Tilghman Lesher
5abbe30e52 Merged revisions 131982 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r131982 | tilghman | 2008-07-18 11:33:56 -0500 (Fri, 18 Jul 2008) | 10 lines

Merged revisions 131970 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r131970 | tilghman | 2008-07-18 11:30:31 -0500 (Fri, 18 Jul 2008) | 2 lines

Make the ast_assert call within ast_sched_del report something useful.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@131984 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-18 16:36:39 +00:00
Jeff Peeler
c27203aedb Merged revisions 131868 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r131868 | jpeeler | 2008-07-17 17:40:00 -0500 (Thu, 17 Jul 2008) | 6 lines

Add configuration option to chan_dahdi.conf to allow buffering policy and number of buffers to be configured per channel. Syntax:

buffers=<num of buffers>,<policy>

Where the number of buffers is some non-negative integer and the policy is either "full", "half", or "immediate".

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@131869 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-17 22:45:50 +00:00
Tilghman Lesher
160f124ffc Merged revisions 131791 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r131791 | tilghman | 2008-07-17 15:37:14 -0500 (Thu, 17 Jul 2008) | 15 lines

Merged revisions 131790 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r131790 | tilghman | 2008-07-17 15:35:44 -0500 (Thu, 17 Jul 2008) | 7 lines

Revert part of issue #5620 (revision 6965) as it appears that it was in error.
This should fix talk call progress on analog lines.
(closes issue #12178)
 Reported by: michael-fig
 Patches: 
       20080717__bug12178.diff.txt uploaded by Corydon76 (license 14)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@131792 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-17 20:38:07 +00:00
Brett Bryant
da77ba005f Merged revisions 131492 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r131492 | bbryant | 2008-07-16 17:17:36 -0500 (Wed, 16 Jul 2008) | 14 lines

Merged revisions 131491 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r131491 | bbryant | 2008-07-16 17:17:07 -0500 (Wed, 16 Jul 2008) | 6 lines

Fix a bug in iax2 registration that allowed peers to register with 
case-insensitive names (user_cmp_cb and peer_cmp_cb are now both 
case-sensitive).

(closes issue #13091)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@131493 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-16 22:18:12 +00:00
Russell Bryant
1d83b13558 Merged revisions 131422 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r131422 | russell | 2008-07-16 15:48:27 -0500 (Wed, 16 Jul 2008) | 15 lines

Merged revisions 131421 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r131421 | russell | 2008-07-16 15:47:53 -0500 (Wed, 16 Jul 2008) | 7 lines

Always ensure that the channel's tech_pvt reference is NULL after calling the
destroy callback.
(closes issue #13060)
Reported by: jpgrayson
Patches:
      chan_iax2_tech_pvt_crash.patch uploaded by jpgrayson (license 492)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@131423 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-16 20:48:49 +00:00
Luigi Rizzo
accfd377e7 add missing terminator argument for ast_event_subscribe().
Without it the function will randomly walk on the stack
possibly causing a panic


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@131206 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-16 15:04:25 +00:00
Tilghman Lesher
3570646e54 Merged revisions 131044 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r131044 | tilghman | 2008-07-15 13:25:34 -0500 (Tue, 15 Jul 2008) | 16 lines

Merged revisions 130959 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r130959 | tilghman | 2008-07-15 12:19:13 -0500 (Tue, 15 Jul 2008) | 8 lines

astman_send_error does not need a newline appended -- the API takes care of
that for us.
(closes issue #13068)
 Reported by: gknispel_proformatique
 Patches: 
       asterisk_1_4_astman_send.patch uploaded by gknispel (license 261)
       asterisk_trunk_astman_send.patch uploaded by gknispel (license 261)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@131060 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-15 18:29:31 +00:00
Steve Murphy
e45d4f3bf1 Merged revisions 130145 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

Merging this rev from trunk to 1.6.0 was not
simple. Why? Because we've enhanced trunk to
do a [fast] merge-and-delete operation which 
also solved problems with contexts having 
entries from different registrars.
Fast as in the amount of time the contexts
are locked down. That *is* fast, but traversing
the entire dialplan looking for priorities to
delete takes more time overall.
This particular fix involved pulling in those
enhancements from trunk, along with all the
various fixes and refinements made along the
way.

Merging all this from trunk into 1.6 involved:
a. mergetrunk6 in the stuff from 130145;
b. revert all but the prop changes
c. catalog all revisions to pbx.c since 1.6.0 was forked
   (at rev 105596).
d. catalog all revisions to pbx.c in trunk since 1.6.0
   was forked, making special note of all revs that
   were not merged into 1.6.0.
e. study each rev in trunk not applied to 1.6.0, and
   determine if it was involved in the merge_and_delete
   enhancements in trunk. 25 commits were done in 1.6.0,
   all but one (106306) was a merge from trunk.
   Trunk had 22 additional changes, of which 7 were
   involved in the merge_and_delete enhancements:
    106757
    108894
    109169
    116461
    123358
    130145
    130297
f. Go to trunk and collect patches, one by one,
   of the changes made by each rev across the
   entire source tree, using svn diff -c <num> > pfile
g. Apply each patch in order to 1.6.0, and 
   resolve all failures and compilation problems
   before proceding to the next patch.
h. test the stuff.
i. profit!


........
r130145 | murf | 2008-07-11 12:24:31 -0600 (Fri, 11 Jul 2008) | 40 lines

(closes issue #13041)
Reported by: eliel
Tested by: murf

(closes issue #12960)
Reported by: mnicholson

In this 'omnibus' fix, I **think** I solved both
the problem in 13041, where unloading pbx_ael.so
caused crashes, or incomplete removal of previous
registrar'ed entries. And I added code to completely
remove all includes, switches, and ignorepats that
had a matching registrar entry, which should
appease 12960.

I also added a lot of seemingly useless brackets
around single statement if's, which helped debug 
so much that I'm leaving them there.

I added a routine to check the correlation between
the extension tree lists and the hashtab 
tables. It can be amazingly helpful when you have
lots of dialplan stuff, and need to narrow
down where a problem is occurring. It's ifdef'd
out by default.

I cleaned up the code around the new CIDmatch code.
It was leaving hanging extens with bad ptrs, getting confused
over which objects to remove, etc. I tightened
up the code and changed the call to remove_exten
in the merge_and_delete code.

I added more conditions to check for empty context
worthy of deletion. It's not empty if there are
any includes, switches, or ignorepats present.

If I've missed anything, please re-open this bug,
and be prepared to supply example dialplan code.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@130946 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-15 13:14:07 +00:00
Tilghman Lesher
d962a11e55 Merged revisions 130890 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r130890 | tilghman | 2008-07-14 18:59:54 -0500 (Mon, 14 Jul 2008) | 16 lines

Merged revisions 130889 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r130889 | tilghman | 2008-07-14 18:59:13 -0500 (Mon, 14 Jul 2008) | 8 lines

Override the callerid in all cases when the callerid is set in the user, not
just when a remote callerid is set.  Also, if not set in the user, allow the
remote CallerID to pass through.
(closes issue #12875)
 Reported by: dimas
 Patches: 
       20080714__bug12875.diff.txt uploaded by Corydon76 (license 14)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@130891 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-15 00:00:34 +00:00
Tilghman Lesher
21e2e2de49 Merged revisions 130515 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r130515 | tilghman | 2008-07-13 12:58:47 -0500 (Sun, 13 Jul 2008) | 12 lines

Merged revisions 130514 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r130514 | tilghman | 2008-07-13 12:56:10 -0500 (Sun, 13 Jul 2008) | 4 lines

Reverting 2 changesets, as it breaks incoming IAX2 calls
(Related to issue #12963)
Reported by: mvanbaak

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@130516 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-13 17:59:34 +00:00
Tilghman Lesher
d7bda637b5 Merged revisions 130444 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r130444 | tilghman | 2008-07-12 21:34:32 -0500 (Sat, 12 Jul 2008) | 2 lines

Unlock list before returning

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@130445 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-13 02:35:22 +00:00
Matthew Fredrickson
6e55f169dd Merged revisions 130293 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r130293 | mattf | 2008-07-11 16:36:26 -0500 (Fri, 11 Jul 2008) | 1 line

Support new TRANSPORT definitions in libss7
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@130294 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-11 21:39:48 +00:00