diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-17 15:44:14 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-17 15:44:14 +0000 |
| commit | e65354adcb542a9cf84e96a05af09dc520644a16 (patch) | |
| tree | ad226b4036236b18a47be40199e6ec0d13e416e7 /include | |
| parent | a60d260ad9fc8f53a91716e94594b064d717f0ff (diff) | |
Merged revisions 219139 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r219139 | mnicholson | 2009-09-17 10:18:01 -0500 (Thu, 17 Sep 2009) | 17 lines
Merged revisions 219136 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r219136 | mnicholson | 2009-09-17 09:58:39 -0500 (Thu, 17 Sep 2009) | 10 lines
Prevent a potential race condition and crash when hanging up a channel by removing the channel from the channel list before begining channel tear down.
This fix may potentially cause problems with CDR backends that access the channel a CDR is associated with via the channel list. This fix makes the channel unavabile at the time when the CDR backend is invoked. This has been documented in include/asterisk/cdr.h.
(closes issue #15316)
Reported by: vmarrone
Tested by: mnicholson
Review: https://reviewboard.asterisk.org/r/362/
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@219199 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/cdr.h | 6 | ||||
| -rw-r--r-- | include/asterisk/channel.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h index 0b94fd73c..6d633b990 100644 --- a/include/asterisk/cdr.h +++ b/include/asterisk/cdr.h @@ -120,6 +120,12 @@ int ast_cdr_serialize_variables(struct ast_cdr *cdr, struct ast_str **buf, char void ast_cdr_free_vars(struct ast_cdr *cdr, int recur); int ast_cdr_copy_vars(struct ast_cdr *to_cdr, struct ast_cdr *from_cdr); +/*! + * \brief CDR backend callback + * \warning CDR backends should NOT attempt to access the channel associated + * with a CDR record. This channel is not guaranteed to exist when the CDR + * backend is invoked. + */ typedef int (*ast_cdrbe)(struct ast_cdr *cdr); /*! \brief Return TRUE if CDR subsystem is enabled */ diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index e24e72a6f..d551891db 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -562,6 +562,8 @@ enum { * bridge terminates, this will allow the hangup in the pbx loop to be run instead. * */ AST_FLAG_BRIDGE_HANGUP_DONT = (1 << 18), + /*! This flag indicates whether the channel is in the channel list or not. */ + AST_FLAG_IN_CHANNEL_LIST = (1 << 19), }; /*! \brief ast_bridge_config flags */ |