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 933e0922c1 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.1@195892 65c4cc65-6c06-0410-ace0-fbb531ad65f3		17 years ago
..
db1-ast	Merged revisions 189419 via svnmerge from	17 years ago
editline	Merged revisions 179396 via svnmerge from	17 years ago
stdtime	Merged revisions 157974 via svnmerge from	17 years ago
Makefile	Merged revisions 187302 via svnmerge from	17 years ago
abstract_jb.c	Another big chunk of changes from the RSW branch. Bunch of stuff from main/	18 years ago
acl.c	Another big chunk of changes from the RSW branch. Bunch of stuff from main/	18 years ago
adsistub.c	remove a bunch of useless #include "options.h"	18 years ago
aescrypt.c	use the OpenSSL AES implementation if it's available (unless configured not to)	19 years ago
aeskey.c	use the OpenSSL AES implementation if it's available (unless configured not to)	19 years ago
aesopt.h	…
aestab.c	use the OpenSSL AES implementation if it's available (unless configured not to)	19 years ago
alaw.c	Whitespace changes only	18 years ago
app.c	Merged revisions 190057 via svnmerge from	17 years ago
ast_expr2.c	Merged revisions 179973 via svnmerge from	17 years ago
ast_expr2.fl	Merged revisions 179973 via svnmerge from	17 years ago
ast_expr2.h	Merged revisions 179973 via svnmerge from	17 years ago
ast_expr2.y	Merged revisions 179973 via svnmerge from	17 years ago
ast_expr2f.c	Merged revisions 179973 via svnmerge from	17 years ago
asterisk.c	Merged revisions 195320 via svnmerge from	17 years ago
astfd.c	Merged revisions 187302 via svnmerge from	17 years ago
astmm.c	Merged revisions 157632 via svnmerge from	17 years ago
astobj2.c	Merged revisions 192357 via svnmerge from	17 years ago
audiohook.c	Merged revisions 187599 via svnmerge from	17 years ago
autoservice.c	Merged revisions 163449 via svnmerge from	17 years ago
buildinfo.c	…
callerid.c	Merged revisions 180195 via svnmerge from	17 years ago
cdr.c	Merged revisions 195882 via svnmerge from	17 years ago
channel.c	Recorded merge of revisions 194357 via svnmerge from	17 years ago
chanvars.c	Merged revisions 149199 via svnmerge from	18 years ago
cli.c	Merged revisions 190057 via svnmerge from	17 years ago
config.c	Merged revisions 189629 via svnmerge from	17 years ago
cryptostub.c	Merged revisions 148200 via svnmerge from	18 years ago
cygload.c	Doxygen updates, formatting.	18 years ago
datastore.c	Merged revisions 192318 via svnmerge from	17 years ago
db.c	Merged revisions 182450 via svnmerge from	17 years ago
devicestate.c	Merged revisions 184339 via svnmerge from	17 years ago
dial.c	This commit contains the bug fixes and documentation updates	18 years ago
dns.c	Merged revisions 159818 via svnmerge from	17 years ago
dnsmgr.c	Merged revisions 166268 via svnmerge from	17 years ago
dsp.c	Merged revisions 158857 via svnmerge from	17 years ago
ecdisa.h	…
enum.c	Merged revisions 180719 via svnmerge from	17 years ago
event.c	Merged revisions 184630 via svnmerge from	17 years ago
features.c	Merged revisions 195698 via svnmerge from	17 years ago
file.c	Merged revisions 188585 via svnmerge from	17 years ago
fixedjitterbuf.c	Start untangling header inclusion in a way that does not affect	18 years ago
fixedjitterbuf.h	Merged revisions 135841,135847,135850 via svnmerge from	18 years ago
frame.c	Merged revisions 195207 via svnmerge from	17 years ago
fskmodem.c	(Step 2 of 2)	18 years ago
fskmodem_float.c	Optionally build integer-based routines for FSK tone decoding (but default	18 years ago
fskmodem_int.c	Optionally build integer-based routines for FSK tone decoding (but default	18 years ago
global_datastores.c	Merged revisions 172580 via svnmerge from	17 years ago
hashtab.c	Merged revisions 149199 via svnmerge from	18 years ago
heap.c	Merged revisions 184512 via svnmerge from	17 years ago
http.c	Merged revisions 187599 via svnmerge from	17 years ago
image.c	Whitespace changes only	18 years ago
indications.c	Merged revisions 168562 via svnmerge from	17 years ago
io.c	Merged revisions 182847 via svnmerge from	17 years ago
jitterbuf.c	Merged revisions 174584 via svnmerge from	17 years ago
loader.c	Merged revisions 183242 via svnmerge from	17 years ago
logger.c	Merged revisions 193194 via svnmerge from	17 years ago
manager.c	Merged revisions 195369 via svnmerge from	17 years ago
md5.c	Start untangling header inclusion in a way that does not affect	18 years ago
netsock.c	Make OpenBSD compile again	18 years ago
pbx.c	Merged revisions 195162 via svnmerge from	17 years ago
plc.c	Start untangling header inclusion in a way that does not affect	18 years ago
poll.c	Merged revisions 182847 via svnmerge from	17 years ago
privacy.c	remove a bunch of useless #include "options.h"	18 years ago
rtp.c	Merged revisions 195096 via svnmerge from	17 years ago
say.c	Merged revisions 169794 via svnmerge from	17 years ago
sched.c	Merged revisions 175882 via svnmerge from	17 years ago
sha1.c	more header removal/normalization	18 years ago
slinfactory.c	Merged revisions 171622 via svnmerge from	17 years ago
srv.c	Merged revisions 168523 via svnmerge from	17 years ago
strcompat.c	Whitespace changes only	18 years ago
taskprocessor.c	Merged revisions 157041 via svnmerge from	17 years ago
tcptls.c	Merged revisions 180719 via svnmerge from	17 years ago
tdd.c	Merged revisions 148200 via svnmerge from	18 years ago
term.c	Whitespace changes only	18 years ago
threadstorage.c	Merged revisions 164737 via svnmerge from	17 years ago
timing.c	Merged revisions 184762 via svnmerge from	17 years ago
translate.c	Merged revisions 181731 via svnmerge from	17 years ago
udptl.c	Merged revisions 175334 via svnmerge from	17 years ago
ulaw.c	another bunch of include removals (errno.h and asterisk/logger.h)	18 years ago
utils.c	Merged revisions 192357 via svnmerge from	17 years ago