From 349289245045d76c9f3820c8cf7dc0cee0302d84 Mon Sep 17 00:00:00 2001 From: Roman Arutyunyan Date: Mon, 27 Aug 2012 21:07:38 +0400 Subject: [PATCH] fixed bad-looking unix socket client name --- ngx_rtmp_auto_push_module.c | 5 +++++ ngx_rtmp_init.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ngx_rtmp_auto_push_module.c b/ngx_rtmp_auto_push_module.c index 167d1f4..0378c89 100644 --- a/ngx_rtmp_auto_push_module.c +++ b/ngx_rtmp_auto_push_module.c @@ -145,6 +145,11 @@ ngx_rtmp_auto_push_init_process(ngx_cycle_t *cycle) *ls = *lss; + /* Disable unix socket client address extraction + * from accept call + * Nginx generates bad addr_text with this enabled */ + ls->addr_ntop = 0; + ls->socklen = sizeof(struct sockaddr_un); sun = ngx_pcalloc(cycle->pool, ls->socklen); ls->sockaddr = (struct sockaddr *) sun; diff --git a/ngx_rtmp_init.c b/ngx_rtmp_init.c index eee172e..ab02a27 100644 --- a/ngx_rtmp_init.c +++ b/ngx_rtmp_init.c @@ -113,8 +113,8 @@ ngx_rtmp_init_connection(ngx_connection_t *c) } } - /*ngx_log_error(NGX_LOG_INFO, c->log, 0, "*%ui client connected", - c->number, &c->addr_text);*/ + ngx_log_error(NGX_LOG_INFO, c->log, 0, "*%ui client connected '%V'", + c->number, &c->addr_text); s = ngx_rtmp_init_session(c, addr_conf);