diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-13 17:08:34 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-13 17:08:34 +0000 |
| commit | 1ea84dc56d95ceaf85c036127c5045eba0ad50ee (patch) | |
| tree | a8392d1877470f4d7513e3ad853fa843d564a544 /protocols/AimOscar/src/thread.cpp | |
| parent | 5c84f735bc4f40d3f2f645d003ef9a08576878d8 (diff) | |
massive name conflict resolution
git-svn-id: http://svn.miranda-ng.org/main/trunk@14941 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/AimOscar/src/thread.cpp')
| -rw-r--r-- | protocols/AimOscar/src/thread.cpp | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/protocols/AimOscar/src/thread.cpp b/protocols/AimOscar/src/thread.cpp index 8c03fab0a0..35685f24ce 100644 --- a/protocols/AimOscar/src/thread.cpp +++ b/protocols/AimOscar/src/thread.cpp @@ -16,18 +16,18 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
#include "stdafx.h"
void __cdecl CAimProto::accept_file_thread(void* param)//buddy sending file
{
- file_transfer *ft = (file_transfer*)param;
+ file_transfer *ft = (file_transfer*)param;
HANDLE hConn = NULL;
if (ft->peer_force_proxy) //peer is forcing proxy
{
hConn = aim_peer_connect(ft->proxy_ip, get_default_port());
- if (hConn)
- {
+ if (hConn) {
debugLogA("Connected to proxy ip that buddy specified.");
ft->hConn = hConn;
ForkThread(&CAimProto::aim_proxy_helper, ft);
@@ -37,8 +37,7 @@ void __cdecl CAimProto::accept_file_thread(void* param)//buddy sending file else if (ft->me_force_proxy) //we are forcing proxy
{
hConn = aim_peer_connect(AIM_PROXY_SERVER, get_default_port());
- if (hConn)
- {
+ if (hConn) {
debugLogA("Connected to proxy ip because we want to use a proxy for the file transfer.");
ft->requester = true;
ft->hConn = hConn;
@@ -46,47 +45,40 @@ void __cdecl CAimProto::accept_file_thread(void* param)//buddy sending file ft->stop_listen();
}
}
- else
- {
- bool verif = ft->verified_ip != detected_ip;
+ else {
+ bool verif = ft->verified_ip != m_detected_ip;
hConn = aim_peer_connect(verif ? ft->verified_ip : ft->local_ip, ft->port);
- if (hConn)
- {
- debugLogA("Connected to buddy over P2P port via %s ip.", verif ? "verified": "local");
+ if (hConn) {
+ debugLogA("Connected to buddy over P2P port via %s ip.", verif ? "verified" : "local");
ft->accepted = true;
ft->hConn = hConn;
- aim_file_ad(hServerConn, seqno, ft->sn, ft->icbm_cookie, false, ft->max_ver);
+ aim_file_ad(m_hServerConn, m_seqno, ft->sn, ft->icbm_cookie, false, ft->max_ver);
ForkThread(&CAimProto::aim_dc_helper, ft);
ft->stop_listen();
}
- else if (ft->sending)
- {
+ else if (ft->sending) {
hConn = aim_peer_connect(AIM_PROXY_SERVER, get_default_port());
- if (hConn)
- {
+ if (hConn) {
ft->hConn = hConn;
ft->requester = true;
ForkThread(&CAimProto::aim_proxy_helper, ft);
ft->stop_listen();
}
}
- else
- {
+ else {
debugLogA("Failed to connect to buddy- asking buddy to connect to us.");
ft->listen(this);
ft->requester = true;
- aim_send_file(hServerConn, seqno, detected_ip, ft->local_port, false, ft);
+ aim_send_file(m_hServerConn, m_seqno, m_detected_ip, ft->local_port, false, ft);
return;
}
}
- if (hConn == NULL)
- {
+ if (hConn == NULL) {
if (ft->req_num)
- {
- aim_file_ad(hServerConn, seqno, ft->sn, ft->icbm_cookie, true, 0);
- }
+ aim_file_ad(m_hServerConn, m_seqno, ft->sn, ft->icbm_cookie, true, 0);
+
ProtoBroadcastAck(ft->hContact, ACKTYPE_FILE, ACKRESULT_FAILED, ft, 0);
- ft_list.remove_by_ft(ft);
+ m_ft_list.remove_by_ft(ft);
}
}
|