diff options
Diffstat (limited to 'src/phone.h')
| -rw-r--r-- | src/phone.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/phone.h b/src/phone.h index f9c18d8..52217eb 100644 --- a/src/phone.h +++ b/src/phone.h @@ -130,7 +130,7 @@ private: bool is_3way; // indicates an acitive 3-way t_line *line1_3way; // first line in 3-way conf t_line *line2_3way; // second line in 3-way conf - mutable t_mutex mutex_3way; + mutable t_recursive_mutex mutex_3way; // Call transfer data. When a REFER comes in, the user has // to give permission before the triggered INVITE can be sent. @@ -256,6 +256,8 @@ protected: */ t_line *find_line_in_dialog_request(t_request *r, t_tid tid); + // Variation of get_ip_sip() for when phone_users_mtx is already locked + string get_ip_sip_locked(const t_user *user, const string &auto_ip) const; // Events void recvd_provisional(t_response *r, t_tuid tuid, t_tid tid); void recvd_success(t_response *r, t_tuid tuid, t_tid tid); |