generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-14 15:05:38 +02:00
Code Issues Projects Releases Wiki Activity

Problem: formatting errors

Browse Source 
Solution: apply clang-format-diff
This commit is contained in:
Luca Boccassi
2019-06-10 18:40:30 +01:00
parent 1fdb152b9d
commit 3c06ec118f
5 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/socks.cpp
View File

@@ -129,8 +129,8 @@ void zmq::socks_choice_decoder_t::reset ()
} }
zmq::socks_basic_auth_request_t::socks_basic_auth_request_t (std::string username_, zmq::socks_basic_auth_request_t::socks_basic_auth_request_t (
std::string password_) : std::string username_, std::string password_) :
username (username_), username (username_),
password (password_) password (password_)
{ {
@@ -145,9 +145,9 @@ zmq::socks_basic_auth_request_encoder_t::socks_basic_auth_request_encoder_t () :
{ {
} }
void zmq::socks_basic_auth_request_encoder_t::encode (const socks_basic_auth_request_t &req_) void zmq::socks_basic_auth_request_encoder_t::encode (
const socks_basic_auth_request_t &req_)
{ {
unsigned char *ptr = _buf; unsigned char *ptr = _buf;
*ptr++ = 0x01; *ptr++ = 0x01;
*ptr++ = static_cast<unsigned char> (req_.username.size ()); *ptr++ = static_cast<unsigned char> (req_.username.size ());
@@ -186,7 +186,8 @@ zmq::socks_auth_response_t::socks_auth_response_t (uint8_t response_code_) :
{ {
} }
zmq::socks_auth_response_decoder_t::socks_auth_response_decoder_t () : _bytes_read (0) zmq::socks_auth_response_decoder_t::socks_auth_response_decoder_t () :
_bytes_read (0)
{ {
} }

30
src/socks_connecter.cpp
View File

@@ -103,8 +103,10 @@ void zmq::socks_connecter_t::in_event ()
if (rc == -1) if (rc == -1)
error (); error ();
else { else {
if (choice.method == socks_basic_auth) expected_status = sending_basic_auth_request; if (choice.method == socks_basic_auth)
else expected_status = sending_request; expected_status = sending_basic_auth_request;
else
expected_status = sending_request;
} }
} }
} else if (_status == waiting_for_auth_response) { } else if (_status == waiting_for_auth_response) {
@@ -112,7 +114,8 @@ void zmq::socks_connecter_t::in_event ()
if (rc == 0 || rc == -1) if (rc == 0 || rc == -1)
error (); error ();
else if (_auth_response_decoder.message_ready ()) { else if (_auth_response_decoder.message_ready ()) {
const socks_auth_response_t auth_response = _auth_response_decoder.decode (); const socks_auth_response_t auth_response =
_auth_response_decoder.decode ();
rc = process_server_response (auth_response); rc = process_server_response (auth_response);
if (rc == -1) if (rc == -1)
error (); error ();
@@ -141,7 +144,8 @@ void zmq::socks_connecter_t::in_event ()
error (); error ();
if (expected_status == sending_basic_auth_request) { if (expected_status == sending_basic_auth_request) {
_basic_auth_request_encoder.encode (socks_basic_auth_request_t (_auth_username, _auth_password)); _basic_auth_request_encoder.encode (
socks_basic_auth_request_t (_auth_username, _auth_password));
reset_pollin (_handle); reset_pollin (_handle);
set_pollout (_handle); set_pollout (_handle);
_status = sending_basic_auth_request; _status = sending_basic_auth_request;
@@ -157,23 +161,20 @@ void zmq::socks_connecter_t::in_event ()
_status = sending_request; _status = sending_request;
} }
} }
} }
void zmq::socks_connecter_t::out_event () void zmq::socks_connecter_t::out_event ()
{ {
zmq_assert (_status == waiting_for_proxy_connection zmq_assert (
|| _status == sending_greeting _status == waiting_for_proxy_connection || _status == sending_greeting
|| _status == sending_basic_auth_request || _status == sending_basic_auth_request || _status == sending_request);
|| _status == sending_request);
if (_status == waiting_for_proxy_connection) { if (_status == waiting_for_proxy_connection) {
const int rc = static_cast<int> (check_proxy_connection ()); const int rc = static_cast<int> (check_proxy_connection ());
if (rc == -1) if (rc == -1)
error (); error ();
else { else {
_greeting_encoder.encode ( _greeting_encoder.encode (socks_greeting_t (_auth_method));
socks_greeting_t (_auth_method));
_status = sending_greeting; _status = sending_greeting;
} }
} else if (_status == sending_greeting) { } else if (_status == sending_greeting) {
@@ -241,9 +242,10 @@ void zmq::socks_connecter_t::start_connecting ()
int zmq::socks_connecter_t::process_server_response ( int zmq::socks_connecter_t::process_server_response (
const socks_choice_t &response_) const socks_choice_t &response_)
{ {
return response_.method == socks_no_auth_required || return response_.method == socks_no_auth_required
response_.method == socks_basic_auth ? || response_.method == socks_basic_auth
0 : -1; ? 0
: -1;
} }
int zmq::socks_connecter_t::process_server_response ( int zmq::socks_connecter_t::process_server_response (