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.

Matthew Nicholson 0c3e56ea9a Merged revisions 195882 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/trunk ................ r195882 | mnicholson | 2009-05-21 10:33:55 -0500 (Thu, 21 May 2009) | 20 lines Merged revisions 195881 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r195881 | mnicholson | 2009-05-21 10:25:50 -0500 (Thu, 21 May 2009) | 13 lines This commit prevents cdr records with AST_CDR_FLAG_ANSLOCKED and AST_CDR_FLAG_LOCKED from being updated in certain cases. This is accomplished by adding two functions to update the answer time and disposition of calls that checks for the proper lock flags. These functions are used in the ast_bridge_call() function so that ForkCDR(A) calls are respected. This patch also modifies the way ast_bridge_call() chooses the cdr record to base the bridged_cdr on. Previously the first unlocked cdr record would be chosen, now instead the first cdr record is chosen and forked cdr records are moved to the bridge_cdr. This allows the original cdr record and any forked cdr records to be properly updated with answer and end times. (closes issue #13797) Reported by: sh0t Tested by: sh0t (closes issue #14744) Reported by: deepesh ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@195883 65c4cc65-6c06-0410-ace0-fbb531ad65f3		16 years ago
..
db1-ast	Merged revisions 157859 via svnmerge from	17 years ago
editline	Merged revisions 179395 via svnmerge from	17 years ago
stdtime	Merged revisions 189539 via svnmerge from	16 years ago
Makefile	Merged revisions 187302 via svnmerge from	16 years ago
abstract_jb.c	Spacing changes only	17 years ago
acl.c	Spacing changes only	17 years ago
adsistub.c	remove a bunch of useless #include "options.h"	18 years ago
aescrypt.c	Spacing changes only	17 years ago
aeskey.c	…
aesopt.h	…
aestab.c	…
alaw.c	Spacing changes only	17 years ago
app.c	Merged revisions 190057 via svnmerge from	16 years ago
ast_expr2.c	Merged revisions 179807 via svnmerge from	17 years ago
ast_expr2.fl	Merged revisions 179807 via svnmerge from	17 years ago
ast_expr2.h	Merged revisions 179807 via svnmerge from	17 years ago
ast_expr2.y	Merged revisions 179807 via svnmerge from	17 years ago
ast_expr2f.c	Merged revisions 185912 via svnmerge from	16 years ago
asterisk.c	Merged revisions 195320 via svnmerge from	16 years ago
astfd.c	Merged revisions 187302 via svnmerge from	16 years ago
astmm.c	Janitor, use ARRAY_LEN() when possible.	17 years ago
astobj2.c	Merged revisions 192357 via svnmerge from	16 years ago
audiohook.c	Merged revisions 187599 via svnmerge from	16 years ago
autoservice.c	Merged revisions 163448 via svnmerge from	17 years ago
bridging.c	Merged revisions 193502 via svnmerge from	16 years ago
buildinfo.c	fix a few small things found by using sparse	17 years ago
callerid.c	Merged revisions 180194 via svnmerge from	17 years ago
cdr.c	Merged revisions 195882 via svnmerge from	16 years ago
channel.c	Recorded merge of revisions 194357 via svnmerge from	16 years ago
chanvars.c	Add additional memory debugging to several core APIs, and fix several memory	17 years ago
cli.c	Merged revisions 190057 via svnmerge from	16 years ago
config.c	If there are no realtime engines, there's no reason to check for realtime families	17 years ago
cryptostub.c	Don't include logger.h in asterisk.h by default as it is causing problems building	17 years ago
cygload.c	Doxygen updates, formatting.	18 years ago
datastore.c	Merged revisions 192318 via svnmerge from	16 years ago
db.c	Merged revisions 182450 via svnmerge from	16 years ago
devicestate.c	Merged revisions 184339 via svnmerge from	16 years ago
dial.c	* Fixed timeout logic in the dialing API as setting timeouts	17 years ago
dns.c	incorporates r159808 from branches/1.4:	17 years ago
dnsmgr.c	Record the previous port in the temporary address structure so that the comparison does not treat the host as having changed even if it did not. This would have been uninitialized before and would have led to a baddddd port.	17 years ago
dsp.c	Add an option, waitfordialtone, for UK analog lines which do not end a call	17 years ago
ecdisa.h	…
enum.c	Add Doxygen documentation for API changes from 1.6.0 to 1.6.1	16 years ago
event.c	Merged revisions 184630 via svnmerge from	16 years ago
features.c	Merged revisions 195698 via svnmerge from	16 years ago
file.c	Merged revisions 188585 via svnmerge from	16 years ago
fixedjitterbuf.c	…
fixedjitterbuf.h	Merged revisions 135841,135847,135850 via svnmerge from	17 years ago
frame.c	Merged revisions 195207 via svnmerge from	16 years ago
fskmodem.c	(Step 2 of 2)	17 years ago
fskmodem_float.c	Optionally build integer-based routines for FSK tone decoding (but default	17 years ago
fskmodem_int.c	Optionally build integer-based routines for FSK tone decoding (but default	17 years ago
global_datastores.c	Merged revisions 172517 via svnmerge from	17 years ago
hashtab.c	Add MALLOC_DEBUG to various utility APIs, so that memory leaks can be tracked back to their source.	16 years ago
heap.c	Merged revisions 184512 via svnmerge from	16 years ago
http.c	Merged revisions 187599 via svnmerge from	16 years ago
image.c	Whitespace changes only	18 years ago
indications.c	Merged revisions 190993 via svnmerge from	16 years ago
io.c	Merged revisions 182847 via svnmerge from	16 years ago
jitterbuf.c	Merged revisions 174583 via svnmerge from	17 years ago
loader.c	Merged revisions 183242 via svnmerge from	16 years ago
logger.c	Merged revisions 193194 via svnmerge from	16 years ago
manager.c	Merged revisions 195369 via svnmerge from	16 years ago
md5.c	…
netsock.c	Make OpenBSD compile again	17 years ago
pbx.c	Merged revisions 195162 via svnmerge from	16 years ago
plc.c	…
poll.c	Merged revisions 182847 via svnmerge from	16 years ago
privacy.c	remove a bunch of useless #include "options.h"	18 years ago
rtp.c	Merged revisions 195096 via svnmerge from	16 years ago
say.c	Fix a crash when saying certain numbers in Chinese	17 years ago
sched.c	Fix a regression in scheduler entry ordering, and add a regression test for it.	17 years ago
sha1.c	more header removal/normalization	18 years ago
slinfactory.c	improve slinfactory API to remove implicit sample rate and require explicit sample rate selection by creator of the slinfactory	17 years ago
srv.c	bump the verbosity of a message in srv.c up by one. It used to be	17 years ago
strcompat.c	Whitespace changes only	18 years ago
strings.c	Merged revisions 186021 via svnmerge from	16 years ago
taskprocessor.c	Merged revisions 185912 via svnmerge from	16 years ago
tcptls.c	Add Doxygen documentation for API changes from 1.6.0 to 1.6.1	16 years ago
tdd.c	Merged revisions 185912 via svnmerge from	16 years ago
term.c	Merge changes from team/group/appdocsxml	17 years ago
threadstorage.c	Merged revisions 164736 via svnmerge from	17 years ago
timing.c	Merged revisions 184762 via svnmerge from	16 years ago
translate.c	Adjust translation table column widths based upon the translation times.	16 years ago
udptl.c	Merged revisions 175311 via svnmerge from	17 years ago
ulaw.c	…
utils.c	Merged revisions 192357 via svnmerge from	16 years ago
xml.c	Merged revisions 195075 via svnmerge from	16 years ago
xmldoc.c	Merged revisions 194635 via svnmerge from	16 years ago