From 6d9a85e061122b1f0e6bf4b69b0471129c967ca4 Mon Sep 17 00:00:00 2001 From: Sergey Dryabzhinsky Date: Fri, 24 Jun 2016 00:00:14 +0300 Subject: [PATCH 1/4] Type conversion - remove double var definition - add conversion to u_char for socketaddr --- ngx_rtmp_core_module.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ngx_rtmp_core_module.c b/ngx_rtmp_core_module.c index 567f011..f1f9e94 100644 --- a/ngx_rtmp_core_module.c +++ b/ngx_rtmp_core_module.c @@ -504,6 +504,7 @@ ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) struct sockaddr *sa; ngx_rtmp_listen_t *ls; struct sockaddr_in *sin; + u_char *sa_cp; ngx_rtmp_core_main_conf_t *cmcf; #if (NGX_HAVE_INET6) struct sockaddr_in6 *sin6; @@ -558,7 +559,8 @@ ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) } #if (nginx_version >= 1011000) - if (ngx_memcmp(ls[i].sockaddr + off, &u.sockaddr + off, len) != 0) { + sa_cp = (u_char *)(&u.sockaddr); + if (ngx_memcmp(ls[i].sockaddr + off, sa_cp + off, len) != 0) { #else if (ngx_memcmp(ls[i].sockaddr + off, u.sockaddr + off, len) != 0) { #endif @@ -582,7 +584,8 @@ ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ngx_memzero(ls, sizeof(ngx_rtmp_listen_t)); #if (nginx_version >= 1011000) - ngx_memcpy(ls->sockaddr, &u.sockaddr, u.socklen); + sa_cp = (u_char *)(&u.sockaddr); + ngx_memcpy(ls->sockaddr, sa_cp, u.socklen); #else ngx_memcpy(ls->sockaddr, u.sockaddr, u.socklen); #endif @@ -600,7 +603,6 @@ ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) { #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) - struct sockaddr *sa; u_char buf[NGX_SOCKADDR_STRLEN]; sa = (struct sockaddr *) ls->sockaddr; From 77ba897d2f335a53576e9d98af670279ad335fe0 Mon Sep 17 00:00:00 2001 From: Sergey Dryabzhinsky Date: Sat, 25 Jun 2016 13:55:08 +0300 Subject: [PATCH 2/4] Another compiler warning fix --- ngx_rtmp_codec_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ngx_rtmp_codec_module.c b/ngx_rtmp_codec_module.c index 2f1eb68..228536d 100644 --- a/ngx_rtmp_codec_module.c +++ b/ngx_rtmp_codec_module.c @@ -454,7 +454,7 @@ ngx_rtmp_codec_parse_avc_header(ngx_rtmp_session_t *s, ngx_chain_t *in) if (sl_next != 0) { /* convert to signed: (-1)**k+1 * ceil(k/2) */ - sl_udelta = ngx_rtmp_bit_read_golomb(&br); + sl_udelta = (ngx_uint_t)ngx_rtmp_bit_read_golomb(&br); sl_delta = (sl_udelta + 1) >> 1; if ((sl_udelta & 1) == 0) { sl_delta = -sl_delta; From 2b0596051e53d36ac7a91ad68dbe52ee3aa3523d Mon Sep 17 00:00:00 2001 From: Sergey Dryabzhinsky Date: Sat, 25 Jun 2016 16:00:57 +0300 Subject: [PATCH 3/4] Another type conversion fix for MSVS --- hls/ngx_rtmp_hls_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hls/ngx_rtmp_hls_module.c b/hls/ngx_rtmp_hls_module.c index d018811..94e393b 100644 --- a/hls/ngx_rtmp_hls_module.c +++ b/hls/ngx_rtmp_hls_module.c @@ -1050,7 +1050,7 @@ ngx_rtmp_hls_open_fragment(ngx_rtmp_session_t *s, uint64_t ts, } // This is continuity counter for TS header - mpegts_cc = (ctx->nfrags + ctx->frag); + mpegts_cc = (ngx_uint_t)(ctx->nfrags + ctx->frag); ngx_log_debug7(NGX_LOG_DEBUG_RTMP, s->connection->log, 0, "hls: open fragment file='%s', keyfile='%s', " From eca3fa3b04d62bd7315175b1858cd4ff0e04fb8a Mon Sep 17 00:00:00 2001 From: Sergey Dryabzhinsky Date: Sat, 25 Jun 2016 17:13:46 +0300 Subject: [PATCH 4/4] Fix unused var warning for nginx < 1.11 --- ngx_rtmp_core_module.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ngx_rtmp_core_module.c b/ngx_rtmp_core_module.c index f1f9e94..c03183e 100644 --- a/ngx_rtmp_core_module.c +++ b/ngx_rtmp_core_module.c @@ -504,7 +504,9 @@ ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) struct sockaddr *sa; ngx_rtmp_listen_t *ls; struct sockaddr_in *sin; +#if (nginx_version >= 1011000) u_char *sa_cp; +#endif ngx_rtmp_core_main_conf_t *cmcf; #if (NGX_HAVE_INET6) struct sockaddr_in6 *sin6;