planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/7u83/actube

Browse Source 
FossilOrigin-Name: 3355f0c68623ed2e18dc5d5287c6e0039fe49bd13a95d7c56f7263f07e54c686
This commit is contained in:
7u83@mail.ru
2016-03-06 11:24:53 +00:00
parent cbc643b4e5 22820a911b
commit 47e9660366
15 changed files with 240 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ac/conf.c
View File

@ -389,7 +389,7 @@ static int init_listen_addrs()
}
if (ifa->ifa_addr->sa_family == AF_INET && conf_ipv4) {
sock_addrtostr(ifa->ifa_addr, str, 100);
sock_addrtostr(ifa->ifa_addr, str, 100,1);
*strchr(str, ':') = 0;
conf_listen_addrs[ctr] =
(char *) cw_setstr((uint8_t **) & conf_listen_addrs[ctr],
@ -400,7 +400,7 @@ static int init_listen_addrs()
}
#ifdef WITH_IPV6
if (ifa->ifa_addr->sa_family == AF_INET6 && conf_ipv6) {
sock_addrtostr(ifa->ifa_addr, str, 100);
sock_addrtostr(ifa->ifa_addr, str, 100,1);
if (strncmp(str, "fe80:", 5) == 0) {
strcat(str, "%");
strcat(str, ifa->ifa_name);
@ -496,7 +496,7 @@ int init_bcast_addrs()
char str[100];
if (ifa->ifa_broadaddr) {
sock_addrtostr(ifa->ifa_broadaddr, str, 100);
sock_addrtostr(ifa->ifa_broadaddr, str, 100,1);
*strchr(str, ':') = 0;
stravltree_add(t, str);
}

2
src/ac/socklist.c
View File

@ -264,7 +264,7 @@ int socklist_add_multicast(const char *addr, const char *port, int ac_proto)
optlen = sizeof(mreq);
char sinin[100];
sock_addrtostr((struct sockaddr *) sain, sinin, 100);
sock_addrtostr((struct sockaddr *) sain, sinin, 100,1);
if (setsockopt(sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP, opt, optlen)
< 0) {