diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-04-25 21:08:15 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-04-25 21:08:15 -0500 |
| commit | 807a765cfb924aca07936379b9802e141f833d38 (patch) | |
| tree | 48e8a36f57ee0e76a844762eae7a4f3adcddc8a5 /include | |
| parent | 456600a641f0caa4ea778d94a4d93c161f44d288 (diff) | |
| parent | 71dfa355403e41850fd7c4cb4228626e5d9476b9 (diff) | |
Merge "bridge_softmix.c: Fix crash if channel fails to join mixing tech."
Diffstat (limited to 'include')
| -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 b83a51b69..8df19d9e9 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); /*! |