From b620b2cc40676676320e19458e4b85ac87e66866 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 2 May 2024 13:21:44 +0800 Subject: [PATCH 1/2] add remote ip to logs --- src/server/ns_turn_server.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/server/ns_turn_server.c b/src/server/ns_turn_server.c index 7eee05c4..ae1a26e2 100644 --- a/src/server/ns_turn_server.c +++ b/src/server/ns_turn_server.c @@ -81,6 +81,10 @@ int TURN_MAX_ALLOCATE_TIMEOUT = 60; int TURN_MAX_ALLOCATE_TIMEOUT_STUN_ONLY = 3; static inline void log_method(ts_ur_super_session *ss, const char *method, int err_code, const uint8_t *reason) { + char sraddr[129] = "\0"; + if (ss->client_socket) { + addr_to_string(get_remote_addr_from_ioa_socket(ss->client_socket), (uint8_t *)sraddr); + } if (ss) { if (!method) { method = "unknown"; @@ -88,13 +92,13 @@ static inline void log_method(ts_ur_super_session *ss, const char *method, int e if (!err_code) { if (ss->origin[0]) { TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, - "session %018llu: origin <%s> realm <%s> user <%s>: incoming packet %s processed, success\n", + "session %018llu: origin <%s> realm <%s> user <%s> remote <%s>: incoming packet %s processed, success\n", (unsigned long long)(ss->id), (const char *)(ss->origin), (const char *)(ss->realm_options.name), - (const char *)(ss->username), method); + (const char *)(ss->username), (const char *)sraddr, method); } else { TURN_LOG_FUNC( - TURN_LOG_LEVEL_INFO, "session %018llu: realm <%s> user <%s>: incoming packet %s processed, success\n", - (unsigned long long)(ss->id), (const char *)(ss->realm_options.name), (const char *)(ss->username), method); + TURN_LOG_LEVEL_INFO, "session %018llu: realm <%s> user <%s> remote <%s>: incoming packet %s processed, success\n", + (unsigned long long)(ss->id), (const char *)(ss->realm_options.name), (const char *)(ss->username), (const char *)sraddr, method); } } else { if (!reason) { @@ -102,14 +106,14 @@ static inline void log_method(ts_ur_super_session *ss, const char *method, int e } if (ss->origin[0]) { TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, - "session %018llu: origin <%s> realm <%s> user <%s>: incoming packet %s processed, error %d: %s\n", + "session %018llu: origin <%s> realm <%s> user <%s> remote <%s>: incoming packet %s processed, error %d: %s\n", (unsigned long long)(ss->id), (const char *)(ss->origin), (const char *)(ss->realm_options.name), - (const char *)(ss->username), method, err_code, reason); + (const char *)(ss->username), (const char *)sraddr, method, err_code, reason); } else { TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, - "session %018llu: realm <%s> user <%s>: incoming packet %s processed, error %d: %s\n", + "session %018llu: realm <%s> user <%s> remote <%s>: incoming packet %s processed, error %d: %s\n", (unsigned long long)(ss->id), (const char *)(ss->realm_options.name), - (const char *)(ss->username), method, err_code, reason); + (const char *)(ss->username), (const char *)sraddr, method, err_code, reason); } } } From 44efff3ff8be79fb711c47476fc21024b0439a9f Mon Sep 17 00:00:00 2001 From: root Date: Tue, 7 May 2024 09:12:47 +0800 Subject: [PATCH 2/2] linter actions --- src/server/ns_turn_server.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/server/ns_turn_server.c b/src/server/ns_turn_server.c index ae1a26e2..ad821818 100644 --- a/src/server/ns_turn_server.c +++ b/src/server/ns_turn_server.c @@ -91,14 +91,16 @@ static inline void log_method(ts_ur_super_session *ss, const char *method, int e } if (!err_code) { if (ss->origin[0]) { + TURN_LOG_FUNC( + TURN_LOG_LEVEL_INFO, + "session %018llu: origin <%s> realm <%s> user <%s> remote <%s>: incoming packet %s processed, success\n", + (unsigned long long)(ss->id), (const char *)(ss->origin), (const char *)(ss->realm_options.name), + (const char *)(ss->username), (const char *)sraddr, method); + } else { TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, - "session %018llu: origin <%s> realm <%s> user <%s> remote <%s>: incoming packet %s processed, success\n", - (unsigned long long)(ss->id), (const char *)(ss->origin), (const char *)(ss->realm_options.name), + "session %018llu: realm <%s> user <%s> remote <%s>: incoming packet %s processed, success\n", + (unsigned long long)(ss->id), (const char *)(ss->realm_options.name), (const char *)(ss->username), (const char *)sraddr, method); - } else { - TURN_LOG_FUNC( - TURN_LOG_LEVEL_INFO, "session %018llu: realm <%s> user <%s> remote <%s>: incoming packet %s processed, success\n", - (unsigned long long)(ss->id), (const char *)(ss->realm_options.name), (const char *)(ss->username), (const char *)sraddr, method); } } else { if (!reason) { @@ -106,7 +108,8 @@ static inline void log_method(ts_ur_super_session *ss, const char *method, int e } if (ss->origin[0]) { TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, - "session %018llu: origin <%s> realm <%s> user <%s> remote <%s>: incoming packet %s processed, error %d: %s\n", + "session %018llu: origin <%s> realm <%s> user <%s> remote <%s>: incoming packet %s processed, " + "error %d: %s\n", (unsigned long long)(ss->id), (const char *)(ss->origin), (const char *)(ss->realm_options.name), (const char *)(ss->username), (const char *)sraddr, method, err_code, reason); } else {