Commit Graph

13 Commits

Author SHA1 Message Date
Mark Michelson
a3a59c0f89 Merged revisions 114064 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114064 | mmichelson | 2008-04-11 10:49:35 -0500 (Fri, 11 Apr 2008) | 19 lines

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

........
r114063 | mmichelson | 2008-04-11 10:44:28 -0500 (Fri, 11 Apr 2008) | 11 lines

Fix a race condition that may happen between a sip hangup
and a "core show channel" command. This patch adds locking
to prevent the resulting crash.

(closes issue #12155)
Reported by: tsearle
Patches:
      show_channels_crash2.patch uploaded by tsearle (license 373)
Tested by: tsearle


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114065 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-11 15:51:10 +00:00
Russell Bryant
4af367c3a9 Merged revisions 109447 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r109447 | twilson | 2008-03-18 10:43:34 -0500 (Tue, 18 Mar 2008) | 3 lines

Go through and fix a bunch of places where character strings were being interpreted as format strings. Most of these changes are solely to make compiling with -Wsecurity and -Wformat=2 happy, and were not
actual problems, per se.  I also added format attributes to any printf wrapper functions I found that didn't have them.  -Wsecurity and -Wmissing-format-attribute added to --enable-dev-mode.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109459 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-18 15:58:50 +00:00
Russell Bryant
68ebba346c Merged revisions 107465 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r107465 | file | 2008-03-11 10:05:17 -0500 (Tue, 11 Mar 2008) | 4 lines

Clarify comment about masquerading and playback of the parking slot.
(closes issue #12180)
Reported by: davidw

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108355 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-12 22:53:24 +00:00
Joshua Colp
a241dd0b5d Merged revisions 107659 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r107659 | file | 2008-03-11 16:23:28 -0300 (Tue, 11 Mar 2008) | 12 lines

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

........
r107646 | file | 2008-03-11 16:20:01 -0300 (Tue, 11 Mar 2008) | 4 lines

Make sure the visible indication is on the right channel so when the masquerade happens the proper indication is enacted.
(closes issue #11707)
Reported by: iam

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107666 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 19:25:00 +00:00
Russell Bryant
9c09333526 Merged revisions 105840 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r105840 | tilghman | 2008-03-04 17:04:29 -0600 (Tue, 04 Mar 2008) | 2 lines

Whitespace changes only

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106306 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:14:32 +00:00
Terry Wilson
7d1891d5c3 Asterisk, when parking can drop rights a caller when a parking timeout occurs. Also, when doing built-in attended transfers, sometimes incorrectly passes rights from the transferrer to the transferee. This patch tries to fixes the parking issue and lays some groundwork for later fixing the transfer issue.
(closes issue #11520)
Reported by: pliew
Tested by: otherwiseguy


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-01 01:30:37 +00:00
Jason Parker
5badb3c48a Merged revisions 104598 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r104598 | qwell | 2008-02-27 11:26:55 -0600 (Wed, 27 Feb 2008) | 8 lines

Inherit language from the transfering channel on a blind transfer.

(closes issue #11682)
Reported by: caio1982
Patches:
      local_atxfer_lang3-1.4.diff uploaded by caio1982 (license 22)
Tested by: caio1982, victoryure

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104617 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-27 17:31:31 +00:00
Mark Michelson
9a9a4e9701 Remove more hardcoded pipe symbols and replace with commas.
(closes issue #12072)
Reported by: SimonSharman
Patches:
      features.patch uploaded by SimonSharman (license 410)
Tested by: SimonSharman



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104127 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-26 14:51:21 +00:00
Jason Parker
1663494073 Merged revisions 102858 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r102858 | qwell | 2008-02-07 13:53:55 -0600 (Thu, 07 Feb 2008) | 7 lines

Specify which digit string was matched in debug message.

(closes issue #11949)
Reported by: dimas
Patches:
      v1-feature-debug.patch uploaded by dimas (license 88)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@102859 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-07 20:02:17 +00:00
Russell Bryant
bcf72e1adb Merge rev 100626 from Asterisk 1.4. The svnmerge of this commit was a NoOp, since
res_features doesn't exist in trunk.  Thanks to qwell for pointing it out!


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100631 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-28 18:41:23 +00:00
Joshua Colp
65e684653d Minor cosmetic change...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100245 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-24 20:32:05 +00:00
Jason Parker
32989872dd Move chan_local dependency into places (only one) that previously depended on res_features, and used local channels
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100121 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-24 16:14:07 +00:00
Jason Parker
3bd33214b9 Move code from res_features into (new file) main/features.c
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100039 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-23 23:09:11 +00:00