diff options
| author | Thomas Groman <tgroman@nuegia.net> | 2020-09-21 15:08:56 -0700 |
|---|---|---|
| committer | Thomas Groman <tgroman@nuegia.net> | 2020-09-21 15:08:56 -0700 |
| commit | 4aa31001bae125293466d582c2ed1dca441c1103 (patch) | |
| tree | 5a2bdfc6d6b0ea1f94c53e7c7108d7108940f8c5 /src/phone.h | |
| parent | effdcc9b1cf185f24e67d9e627a77d823bcfef8f (diff) | |
| parent | b7965d023cb68bce6d9495eb6afbc73206c1afef (diff) | |
| download | twinkle-4aa31001bae125293466d582c2ed1dca441c1103.tar twinkle-4aa31001bae125293466d582c2ed1dca441c1103.tar.gz twinkle-4aa31001bae125293466d582c2ed1dca441c1103.tar.lz twinkle-4aa31001bae125293466d582c2ed1dca441c1103.tar.xz twinkle-4aa31001bae125293466d582c2ed1dca441c1103.zip | |
Merge branch 'master' into jackaudiojackaudio
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); |