@@ -34,13 +34,13 @@ void SocketServer::Initialize(
34
34
if (port_num.empty ()) {
35
35
TS_LOG (FATAL, " Wrong arguments passed. No socket port given." );
36
36
}
37
- port_ = htons ( stoi (port_num) );
37
+ port_ = stoi (port_num);
38
38
}
39
39
} else {
40
40
TS_LOG (FATAL, " Incomplete data provided" );
41
41
}
42
42
43
- TS_LOGF (INFO, " Listening on port: {}" , socket_name );
43
+ TS_LOGF (INFO, " Listening on {}" , socket_name_ );
44
44
server_socket_ = socket (socket_family, SOCK_STREAM, 0 );
45
45
if (server_socket_ == -1 ) {
46
46
TS_LOGF (FATAL, " Failed to create socket descriptor. errno: {}" , errno);
@@ -60,24 +60,25 @@ void SocketServer::Run() {
60
60
}
61
61
62
62
sockaddr *srv_sock_address = nullptr , client_sock_address{};
63
+ sockaddr_un sock_addr_un{};
64
+ sockaddr_in sock_addr_in{};
63
65
socklen_t name_len = 0 ;
64
66
if (socket_type_ == " unix" ) {
65
67
TS_LOG (INFO, " Binding to unix socket" );
66
- sockaddr_un sock_addr{};
67
- std::memset (&sock_addr, 0 , sizeof (sock_addr));
68
- sock_addr.sun_family = AF_UNIX;
69
- std::strncpy (sock_addr.sun_path , socket_name_.c_str (),
70
- sizeof (sock_addr.sun_path ));
71
- srv_sock_address = reinterpret_cast <sockaddr*>(&sock_addr);
72
- name_len = SUN_LEN (&sock_addr);
68
+ std::memset (&sock_addr_un, 0 , sizeof (sock_addr_un));
69
+ sock_addr_un.sun_family = AF_UNIX;
70
+ std::strncpy (sock_addr_un.sun_path , socket_name_.c_str (),
71
+ sizeof (sock_addr_un.sun_path ));
72
+ srv_sock_address = reinterpret_cast <sockaddr*>(&sock_addr_un);
73
+ name_len = SUN_LEN (&sock_addr_un);
73
74
} else {
74
75
TS_LOG (INFO, " Binding to tcp socket" );
75
- sockaddr_in sock_addr{} ;
76
- std::memset (&sock_addr, 0 , sizeof (sock_addr)) ;
77
- sock_addr. sin_family = AF_INET ;
78
- sock_addr .sin_port = port_;
79
- sock_addr .sin_addr .s_addr = inet_addr (socket_name_.c_str ());
80
- srv_sock_address = reinterpret_cast <sockaddr*>(&sock_addr );
76
+ std::memset (&sock_addr_in, 0 , sizeof (sock_addr_in)) ;
77
+ sock_addr_in. sin_family = AF_INET ;
78
+ TS_LOGF (INFO, " Listening on port {} " , port_) ;
79
+ sock_addr_in .sin_port = htons ( port_) ;
80
+ sock_addr_in .sin_addr .s_addr = inet_addr (socket_name_.c_str ());
81
+ srv_sock_address = reinterpret_cast <sockaddr*>(&sock_addr_in );
81
82
name_len = sizeof (*srv_sock_address);
82
83
}
83
84
0 commit comments