config_parser: add missing tcp_proxy_server options (fib, so_mark, netif, bind_ip); tcp_proxy_server: move diag log to TRACE

src/config_parser.c

@@ -1032,6 +1032,17 @@ static struct utun_config* parse_config_internal(FILE *fp, const char *filename)
                 cfg->global.tcp_proxy_server_enabled = 1;
                 if (strcmp(key, "tcp_recv_buf") == 0) {
                     cfg->global.tcp_recv_buf = atoi(value);
+                } else if (strcmp(key, "fib") == 0) {
+                    cfg->global.tcp_proxy_server_fib = atoi(value);
+                } else if (strcmp(key, "so_mark") == 0) {
+                    cfg->global.tcp_proxy_server_so_mark = atoi(value);
+                } else if (strcmp(key, "netif") == 0) {
+                    cfg->global.tcp_proxy_server_netif_index = get_netif_index(value);
+                } else if (strcmp(key, "bind_ip") == 0) {
+                    strncpy(cfg->global.tcp_proxy_server_bind_ip, value, sizeof(cfg->global.tcp_proxy_server_bind_ip) - 1);
+                    cfg->global.tcp_proxy_server_bind_ip[sizeof(cfg->global.tcp_proxy_server_bind_ip) - 1] = '\0';
+                } else {
+                    DEBUG_ERROR(DEBUG_CATEGORY_CONFIG, "%s:%d: Unknown tcp_proxy_server option '%s'. Valid: tcp_recv_buf, fib, so_mark, netif, bind_ip", filename, line_num, key);
                 }
                 break;
             case SECTION_NETWORK:

src/proxy/tcp_proxy_server.c

@@ -193,7 +193,7 @@ static void diag_timer_cb(void* arg) {
     getsockopt(tc->sock, SOL_SOCKET, SO_RCVBUF, (char*)&rcv_buf, &optlen);
     getsockopt(tc->sock, SOL_SOCKET, SO_SNDBUF, (char*)&snd_buf, &optlen);
 
-    DEBUG_DEBUG(DEBUG_CATEGORY_PROXY,
+    DEBUG_TRACE(DEBUG_CATEGORY_PROXY,
         "SOCK:DIAG fd=%d sid=%08x conn=%d fin=%d "
         "rq=%d(%zub) wq=%d(%zub) wbuf=%s "
         "ent_f=%d dat_f=%d tcp_rb=%zu tcp_sb=%zu",