Merge pull request #2231 from gyteng/master

add server port in log file
This commit is contained in:
Max Lv
2018-11-27 07:04:01 +08:00
committed by GitHub
2 changed files with 9 additions and 6 deletions
+2 -2
View File
@@ -927,9 +927,9 @@ server_recv_cb(EV_P_ ev_io *w, int revents)
if (verbose) {
if ((atyp & ADDRTYPE_MASK) == 4)
LOGI("connect to [%s]:%d", host, ntohs(port));
LOGI("[%s] connect to [%s]:%d", remote_port, host, ntohs(port));
else
LOGI("connect to %s:%d", host, ntohs(port));
LOGI("[%s] connect to %s:%d", remote_port, host, ntohs(port));
}
if (!need_query) {
+7 -4
View File
@@ -106,6 +106,8 @@ static int buf_size = DEFAULT_PACKET_SIZE * 2;
static int server_num = 0;
static server_ctx_t *server_ctx_list[MAX_REMOTE_NUM] = { NULL };
const char* s_port = NULL;
#ifndef __MINGW32__
static int
setnonblocking(int fd)
@@ -1116,9 +1118,9 @@ server_recv_cb(EV_P_ ev_io *w, int revents)
char dst[SS_ADDRSTRLEN];
strcpy(src, get_addr_str((struct sockaddr *)&src_addr));
strcpy(dst, get_addr_str((struct sockaddr *)&dst_addr));
LOGI("[udp] cache miss: %s <-> %s", dst, src);
LOGI("[%s] [udp] cache miss: %s <-> %s", s_port, dst, src);
#else
LOGI("[udp] cache miss: %s:%s <-> %s", host, port,
LOGI("[%s] [udp] cache miss: %s:%s <-> %s", s_port, host, port,
get_addr_str((struct sockaddr *)&src_addr));
#endif
}
@@ -1129,9 +1131,9 @@ server_recv_cb(EV_P_ ev_io *w, int revents)
char dst[SS_ADDRSTRLEN];
strcpy(src, get_addr_str((struct sockaddr *)&src_addr));
strcpy(dst, get_addr_str((struct sockaddr *)&dst_addr));
LOGI("[udp] cache hit: %s <-> %s", dst, src);
LOGI("[%s] [udp] cache hit: %s <-> %s", s_port, dst, src);
#else
LOGI("[udp] cache hit: %s:%s <-> %s", host, port,
LOGI("[%s] [udp] cache hit: %s:%s <-> %s", s_port, host, port,
get_addr_str((struct sockaddr *)&src_addr));
#endif
}
@@ -1346,6 +1348,7 @@ init_udprelay(const char *server_host, const char *server_port,
#endif
int mtu, crypto_t *crypto, int timeout, const char *iface)
{
s_port = server_port;
// Initialize ev loop
struct ev_loop *loop = EV_DEFAULT;