diff options
| author | Darrell Anderson <[email protected]> | 2014-02-16 11:34:26 -0600 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2014-02-16 11:34:26 -0600 |
| commit | 246aeb85edaed7bdb44a675c9524719a0341a7be (patch) | |
| tree | 5dbc3e222064f6630788109718cefddff63e0b40 /kopete/protocols/jabber | |
| parent | 8c12b4e76da50193458243b276daf7a888e248c8 (diff) | |
| download | tdenetwork-246aeb85edaed7bdb44a675c9524719a0341a7be.tar.gz tdenetwork-246aeb85edaed7bdb44a675c9524719a0341a7be.zip | |
Fix unintended renaming
Diffstat (limited to 'kopete/protocols/jabber')
| -rw-r--r-- | kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc | 16 | ||||
| -rw-r--r-- | kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc index e1f0db4e..f57043e3 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc @@ -418,14 +418,14 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, out_buf_desc.pBuffers = &out_sec; const ULONG NEG_FLAGS_DEFAULT = - //ISC_RETQ_ALLOCATE_MEMORY - ISC_RETQ_CONFIDENTIALITY - //| ISC_RETQ_EXTENDED_ERROR - //| ISC_RETQ_INTEGRITY - | ISC_RETQ_REPLAY_DETECT - | ISC_RETQ_SEQUENCE_DETECT - //| ISC_RETQ_STREAM - //| ISC_RETQ_USE_SUPPLIED_CREDS + //ISC_REQ_ALLOCATE_MEMORY + ISC_REQ_CONFIDENTIALITY + //| ISC_REQ_EXTENDED_ERROR + //| ISC_REQ_INTEGRITY + | ISC_REQ_REPLAY_DETECT + | ISC_REQ_SEQUENCE_DETECT + //| ISC_REQ_STREAM + //| ISC_REQ_USE_SUPPLIED_CREDS ; TimeStamp lifetime; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp index baa1eb84..f314e23e 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp @@ -208,9 +208,9 @@ void SocksUDP::sn_activated(int) //---------------------------------------------------------------------------- // SocksClient //---------------------------------------------------------------------------- -#define RETQ_CONNECT 0x01 -#define RETQ_BIND 0x02 -#define RETQ_UDPASSOCIATE 0x03 +#define REQ_CONNECT 0x01 +#define REQ_BIND 0x02 +#define REQ_UDPASSOCIATE 0x03 #define RET_SUCCESS 0x00 #define RET_UNREACHABLE 0x04 @@ -838,7 +838,7 @@ void SocksClient::do_request() fprintf(stderr, "SocksClient: Requesting ...\n"); #endif d->step = StepRequest; - int cmd = d->udp ? RETQ_UDPASSOCIATE : RETQ_CONNECT; + int cmd = d->udp ? REQ_UDPASSOCIATE : REQ_CONNECT; TQByteArray buf; if(!d->real_host.isEmpty()) buf = sp_set_request(d->real_host, d->real_port, cmd); @@ -956,7 +956,7 @@ void SocksClient::continueIncoming() } else if(r == 1) { d->waiting = true; - if(s.cmd == RETQ_CONNECT) { + if(s.cmd == REQ_CONNECT) { if(!s.host.isEmpty()) d->rhost = s.host; else @@ -964,7 +964,7 @@ void SocksClient::continueIncoming() d->rport = s.port; incomingConnectRequest(d->rhost, d->rport); } - else if(s.cmd == RETQ_UDPASSOCIATE) { + else if(s.cmd == REQ_UDPASSOCIATE) { incomingUDPAssociateRequest(); } else { |