You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Steve Murphy a7aeaf341b Merged revisions 166665 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/trunk This merged from trunk with no conflicts. I tested mostly the 'tired' cases, and for the most part ignored the tests for reconnecting and dialing in to fetch a parked call, after the first case. ................ r166665 | murf | 2008-12-23 11:13:49 -0700 (Tue, 23 Dec 2008) | 153 lines Merged revisions 166093 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 In order to merge this 1.4 patch into trunk, I had to resolve some conflicts and wait for Russell to make some changes to res_agi. I re-ran all the tests; 39 calls in all, and made fairly careful notes and comparisons: I don't want this to blow up some aspect of asterisk; I completely removed the KEEPALIVE from the pbx.h decls. The first 3 scenarios involving feature park; feature xfer to 700; hookflash park to Park() app call all behave the same, don't appear to leave hung channels, and no crashes. ........ r166093 | murf | 2008-12-19 15:30:32 -0700 (Fri, 19 Dec 2008) | 131 lines This merges the masqpark branch into 1.4 These changes eliminate the need for (and use of) the KEEPALIVE return code in res_features.c; There are other places that use this result code for similar purposes at a higher level, these appear to be left alone in 1.4, but attacked in trunk. The reason these changes are being made in 1.4, is that parking ends a channel's life, in some situations, and the code in the bridge (and some other places), was not checking the result code properly, and dereferencing the channel pointer, which could lead to memory corruption and crashes. Calling the masq_park function eliminates this danger in higher levels. A series of previous commits have replaced some parking calls with masq_park, but this patch puts them ALL to rest, (except one, purposely left alone because a masquerade is done anyway), and gets rid of the code that tests the KEEPALIVE result, and the NOHANGUP_PEER result codes. While bug 13820 inspired this work, this patch does not solve all the problems mentioned there. I have tested this patch (again) to make sure I have not introduced regressions. Crashes that occurred when a parked party hung up while the parking party was listening to the numbers of the parking stall being assigned, is eliminated. These are the cases where parking code may be activated: 1. Feature one touch (eg. *3) 2. Feature blind xfer to parking lot (eg ##700) 3. Run Park() app from dialplan (eg sip xfer to 700) (eg. dahdi hookflash xfer to 700) 4. Run Park via manager. The interesting testing cases for parking are: I. A calls B, A parks B a. B hangs up while A is getting the numbers announced. b. B hangs up after A gets the announcement, but before the parking time expires c. B waits, time expires, A is redialed, A answers, B and A are connected, after which, B hangs up. d. C picks up B while still in parking lot. II. A calls B, B parks A a. A hangs up while B is getting the numbers announced. b. A hangs up after B gets the announcement, but before the parking time expires c. A waits, time expires, B is redialed, B answers, A and B are connected, after which, A hangs up. d. C picks up A while still in parking lot. Testing this throroughly involves acting all the permutations of I and II, in situations 1,2,3, and 4. Since I added a few more changes (ALL references to KEEPALIVE in the bridge code eliimated (I missed one earlier), I retested most of the above cases, and no crashes. H-extension weirdness. Current h-extension execution is not completely correct for several of the cases. For the case where A calls B, and A parks B, the 'h' exten is run on A's channel as soon as the park is accomplished. This is expected behavior. But when A calls B, and B parks A, this will be current behavior: After B parks A, B is hung up by the system, and the 'h' (hangup) exten gets run, but the channel mentioned will be a derivative of A's... Thus, if A is DAHDI/1, and B is DAHDI/2, the h-extension will be run on channel Parked/DAHDI/1-1<ZOMBIE>, and the start/answer/end info will be those relating to Channel A. And, in the case where A is reconnected to B after the park time expires, when both parties hang up after the joyful reunion, no h-exten will be run at all. In the case where C picks up A from the parking lot, when either A or C hang up, the h-exten will be run for the C channel. CDR's are a separate issue, and not addressed here. As to WHY this strange behavior occurs, the answer lies in the procedure followed to accomplish handing over the channel to the parking manager thread. This procedure is called masquerading. In the process, a duplicate copy of the channel is created, and most of the active data is given to the new copy. The original channel gets its name changed to XXX<ZOMBIE> and keeps the PBX information for the sake of the original thread (preserving its role as a call originator, if it had this role to begin with), while the new channel is without this info and becomes a call target (a "peer"). In this case, the parking lot manager thread is handed the new (masqueraded) channel. It will not run an h-exten on the channel if it hangs up while in the parking lot. The h exten will be run on the original channel instead, in the original thread, after the bridge completes. See bug 13820 for our intentions as to how to clean up the h exten behavior. Review: http://reviewboard.digium.com/r/29/ ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@166730 65c4cc65-6c06-0410-ace0-fbb531ad65f3		18 years ago
..
Makefile	Merged revisions 127892,127895 via svnmerge from	18 years ago
app_adsiprog.c	import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch	18 years ago
app_alarmreceiver.c	- revert change to ast_queue_hangup and create ast_queue_hangup_with_cause	18 years ago
app_amd.c	Create a centralized configuration option for silencethreshold	19 years ago
app_authenticate.c	import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch	18 years ago
app_cdr.c	whitespace fixes only.	19 years ago
app_chanisavail.c	Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.	18 years ago
app_channelredirect.c	Use proper return values for a few application modules	18 years ago
app_chanspy.c	Merged revisions 165890 via svnmerge from	18 years ago
app_controlplayback.c	whitespace fixes only.	19 years ago
app_dahdibarge.c	More RSW merges. Everything from apps/ except for the big offenders	18 years ago
app_dahdiras.c	build against the now-typedef-free dahdi/user.h, and remove some #ifdefs for features that will always be present in DAHDI	18 years ago
app_dahdiscan.c	More RSW merges. Everything from apps/ except for the big offenders	18 years ago
app_db.c	whitespace fixes only.	19 years ago
app_dial.c	Merged revisions 166665 via svnmerge from	18 years ago
app_dictate.c	whitespace fixes only.	19 years ago
app_directed_pickup.c	Merged revisions 162342 via svnmerge from	18 years ago
app_directory.c	Merged revisions 165318 via svnmerge from	18 years ago
app_disa.c	Merged revisions 162016 via svnmerge from	18 years ago
app_dumpchan.c	Modify TIMEOUT() to be accurate down to the millisecond.	18 years ago
app_echo.c	Merged revisions 149588 via svnmerge from	18 years ago
app_exec.c	For the purpose of making the changed syntax to ExecIf easier to transition,	18 years ago
app_externalivr.c	Merged revisions 151101 via svnmerge from	18 years ago
app_fax.c	Merged revisions 164257 via svnmerge from	18 years ago
app_festival.c	Merged revisions 162275 via svnmerge from	18 years ago
app_flash.c	Merged revisions 125132 via svnmerge from	18 years ago
app_followme.c	Merged revisions 157306 via svnmerge from	18 years ago
app_forkcdr.c	More RSW merges. Everything from apps/ except for the big offenders	18 years ago
app_getcpeid.c	Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.	18 years ago
app_ices.c	Merged revisions 135058 via svnmerge from	18 years ago
app_image.c	Change SendImage() to output a more consistent status variable.	18 years ago
app_ivrdemo.c	include "logger.h" and errno.h from asterisk.h - usage shows that they	19 years ago
app_jack.c	Merged revisions 140566 via svnmerge from	18 years ago
app_macro.c	Merged revisions 166665 via svnmerge from	18 years ago
app_meetme.c	Merged revisions 162291 via svnmerge from	18 years ago
app_milliwatt.c	Janitor patch to change uses of sizeof to ARRAY_LEN	18 years ago
app_minivm.c	Merged revisions 164623 via svnmerge from	18 years ago
app_mixmonitor.c	Merged revisions 151371 via svnmerge from	18 years ago
app_morsecode.c	Lock around variables retrieved, and copy the values, if they stay persistent,	18 years ago
app_mp3.c	- revert change to ast_queue_hangup and create ast_queue_hangup_with_cause	18 years ago
app_nbscat.c	- revert change to ast_queue_hangup and create ast_queue_hangup_with_cause	18 years ago
app_osplookup.c	More RSW merges. Everything from apps/ except for the big offenders	18 years ago
app_page.c	Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.	18 years ago
app_parkandannounce.c	remove remaining Zaptel references in various places	18 years ago
app_playback.c	Merged revisions 144569 via svnmerge from	18 years ago
app_privacy.c	add a new argument to PrivacyManager to specify a context	18 years ago
app_queue.c	Merged revisions 166665 via svnmerge from	18 years ago
app_read.c	Modify TIMEOUT() to be accurate down to the millisecond.	18 years ago
app_readexten.c	Merged revisions 159853 via svnmerge from	18 years ago
app_readfile.c	remove another set of redundant #include "asterisk/options.h"	19 years ago
app_record.c	Merged revisions 164942 via svnmerge from	18 years ago
app_rpt.c	Merged revisions 159050 via svnmerge from	18 years ago
app_sayunixtime.c	remove another set of redundant #include "asterisk/options.h"	19 years ago
app_senddtmf.c	Document that the duration of dtmf may be passed to	18 years ago
app_sendtext.c	Fix a bug where SENDTEXTSTATUS isn't set properly when it isn't	18 years ago
app_setcallerid.c	Merged revisions 114242 via svnmerge from	19 years ago
app_skel.c	Re-introduce proper error handling that was removed in recent commits.	18 years ago
app_sms.c	import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch	18 years ago
app_softhangup.c	include "logger.h" and errno.h from asterisk.h - usage shows that they	19 years ago
app_speech_utils.c	Merged revisions 147518 via svnmerge from	18 years ago
app_stack.c	Merged revisions 161493 via svnmerge from	18 years ago
app_system.c	shuffle a little bit the content of header files to reduce dependencies.	19 years ago
app_talkdetect.c	Add an option, specifying maximum analysis time for talk detection.	18 years ago
app_test.c	- revert change to ast_queue_hangup and create ast_queue_hangup_with_cause	18 years ago
app_transfer.c	Merged revisions 152132 via svnmerge from	18 years ago
app_url.c	shuffle a little bit the content of header files to reduce dependencies.	19 years ago
app_userevent.c	remove redundant headers	19 years ago
app_verbose.c	more header removal	19 years ago
app_voicemail.c	Merged revisions 165797 via svnmerge from	18 years ago
app_waitforring.c	Whitespace changes only	19 years ago
app_waitforsilence.c	Merged revisions 149062 via svnmerge from	18 years ago
app_waituntil.c	More RSW merges. Everything from apps/ except for the big offenders	18 years ago
app_while.c	Merged revisions 156756 via svnmerge from	18 years ago
app_zapateller.c	Use defined return values in load_module in more places.	19 years ago
enter.h	…
leave.h	…
rpt_flow.pdf	…