]> git.ipfire.org Git - thirdparty/asterisk.git/commit
Merged revisions 318671 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Fri, 13 May 2011 01:09:40 +0000 (01:09 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Fri, 13 May 2011 01:09:40 +0000 (01:09 +0000)
commit2f024e45446b1cf2dcce107663324e1c58a933ba
tree9411e3238adfa941d2b604db9d06ffd584b80b66
parentbdf971df607c1bd5eaffdd3b907067c60f252052
Merged revisions 318671 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

* The applicable fixes for v1.4 are the SIP deadlock and the in progress
masquerade check for multiple parties trying to pickup the same call.
      issue18654_v1.4.patch uploaded by rmudgett (license 664)

* Backported to v1.6.2.
      issue18654_v1.6.2.patch uploaded by rmudgett (license 664)

........
  r318671 | alecdavis | 2011-05-13 10:52:08 +1200 (Fri, 13 May 2011) | 30 lines

  Fix directed group pickup feature code *8 with pickupsounds enabled

  Since 1.6.2, the new pickupsound and pickupfailsound in features.conf cause many issues.

  1). chan_sip:handle_request_invite() shouldn't be playing out the fail/success audio, as it has 'netlock' locked.
  2). dialplan applications for directed_pickups shouldn't beep.
  3). feature code for directed pickup should beep on success/failure if configured.

  Created a sip_pickup() thread to handle the pickup and playout the audio, spawned from handle_request_invite.

  Moved app_directed:pickup_do() to features:ast_do_pickup().

  Functions below, all now use the new ast_do_pickup()
  app_directed_pickup.c:
     pickup_by_channel()
     pickup_by_exten()
     pickup_by_mark()
     pickup_by_part()
  features.c:
     ast_pickup_call()

  (closes issue #18654)
  Reported by: Docent
  Patches:
        ast_do_pickup_1.8_trunk.diff.txt uploaded by alecdavis (license 585)
  Tested by: lmadsen, francesco_r, amilcar, isis242, alecdavis, irroot, rymkus, loloski, rmudgett

  Review: https://reviewboard.asterisk.org/r/1185/
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@318734 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_directed_pickup.c
channels/chan_sip.c
res/res_features.c