diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-04-26 04:56:36 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-04-26 04:56:36 -0500 |
| commit | 4efc6b43155452b2f9cb5f96c7aea4cdfc1a84d1 (patch) | |
| tree | fad4c64e7f960c6bbe533f050af750b38ff5b61e /include/asterisk/bridge_technology.h | |
| parent | 83dadc4683abcd10f0c4566abef541d997dcf5b8 (diff) | |
| parent | 1e93f3d7232a2a087a190a18e4a3f490a41d42d1 (diff) | |
Merge changes from topic 'system_stress_patches' into 13
* changes:
Bridge system: Fix memory leaks and double frees on impart failure.
bridge_softmix.c: Fix crash if channel fails to join mixing tech.
Diffstat (limited to 'include/asterisk/bridge_technology.h')
| -rw-r--r-- | include/asterisk/bridge_technology.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asterisk/bridge_technology.h b/include/asterisk/bridge_technology.h index 7de573a23..7f5d746f8 100644 --- a/include/asterisk/bridge_technology.h +++ b/include/asterisk/bridge_technology.h @@ -107,6 +107,9 @@ struct ast_bridge_technology { * \retval -1 on failure * * \note On entry, bridge is already locked. + * + * \note The bridge technology must tollerate a failed to join channel + * until it can be kicked from the bridge. */ int (*join)(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel); /*! |