#include <sys/socket.h>
#include "client.h"
+#include "log.h"
#include "markpool.h"
#include "state.pb.h"
#include "stream.h"
socklen_t addr_len = sizeof(addr);
if (getpeername(sock, reinterpret_cast<sockaddr *>(&addr), &addr_len) == -1) {
- perror("getpeername");
+ log_perror("getpeername");
remote_addr = "";
} else {
char buf[INET6_ADDRSTRLEN];
if (inet_ntop(addr.sin6_family, &addr.sin6_addr, buf, sizeof(buf)) == NULL) {
- perror("inet_ntop");
+ log_perror("inet_ntop");
remote_addr = "";
} else {
remote_addr = buf;
}
if (setsockopt(sock, SOL_SOCKET, SO_MARK, &fwmark, sizeof(fwmark)) == -1) {
if (fwmark != 0) {
- perror("setsockopt(SO_MARK)");
+ log_perror("setsockopt(SO_MARK)");
}
+ fwmark = 0;
}
}
ClientStats Client::get_stats() const
{
ClientStats stats;
- stats.stream_id = stream_id;
+ if (stream_id.empty()) {
+ stats.stream_id = "-";
+ } else {
+ stats.stream_id = stream_id;
+ }
+ stats.sock = sock;
+ stats.fwmark = fwmark;
stats.remote_addr = remote_addr;
stats.connect_time = connect_time;
stats.bytes_sent = bytes_sent;