Skip to content

Commit e55eb90

Browse files
fix: use NGX_SOCKADDR_STRLEN for portability on Windows & FreeBSD
NGX_UNIX_ADDRSTRLEN is only defined when Unix domain sockets are supported, which excludes Windows. Use NGX_SOCKADDR_STRLEN instead for the address text buffer in cosocket error logging, which is defined on all platforms.
1 parent cbb8ca4 commit e55eb90

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/ngx_stream_lua_socket_tcp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,11 +493,11 @@ ngx_stream_lua_socket_tcp_log_error(ngx_log_t *log, u_char *buf, size_t len)
493493
len -= p - buf;
494494
if (u->peer.sockaddr != NULL) {
495495
int addr_text_len;
496-
u_char addr_text[NGX_UNIX_ADDRSTRLEN];
496+
u_char addr_text[NGX_SOCKADDR_STRLEN];
497497

498498
buf = p;
499499
addr_text_len = ngx_sock_ntop(u->peer.sockaddr, u->peer.socklen,
500-
addr_text, NGX_UNIX_ADDRSTRLEN, 0);
500+
addr_text, NGX_SOCKADDR_STRLEN, 0);
501501
p = ngx_snprintf(buf, len, "(%*s)", addr_text_len, addr_text);
502502
len -= p - buf;
503503
}

src/ngx_stream_lua_socket_udp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,11 @@ ngx_stream_lua_socket_udp_log_error(ngx_log_t *log, u_char *buf, size_t len)
200200
uc = &u->udp_connection;
201201
if (uc->sockaddr != NULL) {
202202
int addr_text_len;
203-
u_char addr_text[NGX_UNIX_ADDRSTRLEN];
203+
u_char addr_text[NGX_SOCKADDR_STRLEN];
204204

205205
buf = p;
206206
addr_text_len = ngx_sock_ntop(uc->sockaddr, uc->socklen,
207-
addr_text, NGX_UNIX_ADDRSTRLEN, 0);
207+
addr_text, NGX_SOCKADDR_STRLEN, 0);
208208
p = ngx_snprintf(buf, len, "(%*s)", addr_text_len, addr_text);
209209

210210
len -= p - buf;

0 commit comments

Comments
 (0)