zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-05-17 00:51:09 +02:00
Code Issues Projects Releases Wiki Activity

Type conversion

Browse source 
- remove double var definition
- add conversion to u_char for socketaddr
This commit is contained in:
Sergey Dryabzhinsky 2016-06-24 00:00:14 +03:00
parent aee81e3c8f
commit 6d9a85e061
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ngx_rtmp_core_module.c
View file

@ -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;