summaryrefslogtreecommitdiff
path: root/src/components/transport_manager/src/tcp/tcp_client_listener.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/transport_manager/src/tcp/tcp_client_listener.cc')
-rw-r--r--src/components/transport_manager/src/tcp/tcp_client_listener.cc60
1 files changed, 30 insertions, 30 deletions
diff --git a/src/components/transport_manager/src/tcp/tcp_client_listener.cc b/src/components/transport_manager/src/tcp/tcp_client_listener.cc
index 2ee2e432cb..7a074d9ae9 100644
--- a/src/components/transport_manager/src/tcp/tcp_client_listener.cc
+++ b/src/components/transport_manager/src/tcp/tcp_client_listener.cc
@@ -42,12 +42,12 @@
#include <sys/sysctl.h>
#include <sys/socket.h>
#ifdef __linux__
-# include <linux/tcp.h>
+#include <linux/tcp.h>
#else // __linux__
-# include <sys/time.h>
-# include <netinet/in.h>
-# include <netinet/tcp.h>
-# include <netinet/tcp_var.h>
+#include <sys/time.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <netinet/tcp_var.h>
#endif // __linux__
#include <sstream>
@@ -66,12 +66,12 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager")
TcpClientListener::TcpClientListener(TransportAdapterController* controller,
const uint16_t port,
const bool enable_keepalive)
- : port_(port),
- enable_keepalive_(enable_keepalive),
- controller_(controller),
- thread_(0),
- socket_(-1),
- thread_stop_requested_(false) {
+ : port_(port)
+ , enable_keepalive_(enable_keepalive)
+ , controller_(controller)
+ , thread_(0)
+ , socket_(-1)
+ , thread_stop_requested_(false) {
thread_ = threads::CreateThread("TcpClientListener",
new ListeningThreadDelegate(this));
}
@@ -86,7 +86,7 @@ TransportAdapter::Error TcpClientListener::Init() {
return TransportAdapter::FAIL;
}
- sockaddr_in server_address = { 0 };
+ sockaddr_in server_address = {0};
server_address.sin_family = AF_INET;
server_address.sin_port = htons(port_);
server_address.sin_addr.s_addr = INADDR_ANY;
@@ -96,7 +96,8 @@ TransportAdapter::Error TcpClientListener::Init() {
LOG4CXX_WARN_WITH_ERRNO(logger_, "setsockopt SO_REUSEADDR failed");
}
- if (bind(socket_, reinterpret_cast<sockaddr*>(&server_address),
+ if (bind(socket_,
+ reinterpret_cast<sockaddr*>(&server_address),
sizeof(server_address)) != 0) {
LOG4CXX_ERROR_WITH_ERRNO(logger_, "bind() failed");
return TransportAdapter::FAIL;
@@ -191,7 +192,7 @@ void SetKeepaliveOptions(const int fd) {
tval.tv_sec = keepidle;
setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &yes, sizeof(yes));
setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &tval, sizeof(tval));
-#endif // __QNX__
+#endif // __QNX__
}
void TcpClientListener::Loop() {
@@ -199,9 +200,8 @@ void TcpClientListener::Loop() {
while (!thread_stop_requested_) {
sockaddr_in client_address;
socklen_t client_address_size = sizeof(client_address);
- const int connection_fd = accept(socket_,
- (struct sockaddr*) &client_address,
- &client_address_size);
+ const int connection_fd = accept(
+ socket_, (struct sockaddr*)&client_address, &client_address_size);
if (thread_stop_requested_) {
LOG4CXX_DEBUG(logger_, "thread_stop_requested_");
close(connection_fd);
@@ -220,7 +220,8 @@ void TcpClientListener::Loop() {
}
char device_name[32];
- strncpy(device_name, inet_ntoa(client_address.sin_addr),
+ strncpy(device_name,
+ inet_ntoa(client_address.sin_addr),
sizeof(device_name) / sizeof(device_name[0]));
LOG4CXX_INFO(logger_, "Connected client " << device_name);
@@ -228,16 +229,15 @@ void TcpClientListener::Loop() {
SetKeepaliveOptions(connection_fd);
}
- TcpDevice* tcp_device = new TcpDevice(client_address.sin_addr.s_addr,
- device_name);
+ TcpDevice* tcp_device =
+ new TcpDevice(client_address.sin_addr.s_addr, device_name);
DeviceSptr device = controller_->AddDevice(tcp_device);
tcp_device = static_cast<TcpDevice*>(device.get());
- const ApplicationHandle app_handle = tcp_device->AddIncomingApplication(
- connection_fd);
+ const ApplicationHandle app_handle =
+ tcp_device->AddIncomingApplication(connection_fd);
- TcpSocketConnection* connection(
- new TcpSocketConnection(device->unique_device_id(), app_handle,
- controller_));
+ TcpSocketConnection* connection(new TcpSocketConnection(
+ device->unique_device_id(), app_handle, controller_));
connection->set_socket(connection_fd);
const TransportAdapter::Error error = connection->Start();
if (error != TransportAdapter::OK) {
@@ -251,7 +251,7 @@ void TcpClientListener::StopLoop() {
thread_stop_requested_ = true;
// We need to connect to the listening socket to unblock accept() call
int byesocket = socket(AF_INET, SOCK_STREAM, 0);
- sockaddr_in server_address = { 0 };
+ sockaddr_in server_address = {0};
server_address.sin_family = AF_INET;
server_address.sin_port = htons(port_);
server_address.sin_addr.s_addr = INADDR_ANY;
@@ -270,8 +270,9 @@ void TcpClientListener::StopLoop() {
TransportAdapter::Error TcpClientListener::StartListening() {
LOG4CXX_AUTO_TRACE(logger_);
if (thread_->is_running()) {
- LOG4CXX_WARN(logger_,
- "TransportAdapter::BAD_STATE. Listener has already been started");
+ LOG4CXX_WARN(
+ logger_,
+ "TransportAdapter::BAD_STATE. Listener has already been started");
return TransportAdapter::BAD_STATE;
}
@@ -293,8 +294,7 @@ void TcpClientListener::ListeningThreadDelegate::threadMain() {
TcpClientListener::ListeningThreadDelegate::ListeningThreadDelegate(
TcpClientListener* parent)
- : parent_(parent) {
-}
+ : parent_(parent) {}
TransportAdapter::Error TcpClientListener::StopListening() {
LOG4CXX_AUTO_TRACE(logger_);