Skip to content

P
PPSi
Commit 1063b42b authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

arch-gnu-linux: bugfix: don't ADD_MEMBERSHIP twice 

The second time you do ADD_MEMBERSHIP to a multicast address, the
ioctl returns ADDRINUSE and ptp goes to faulty state.  By removing it
stuff works.  The issue is there since commit f44fa35b, the initial
UDP implementation, which hasn't been used in practice.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent b719cad1
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 16 deletions
arch-gnu-linux/posix-socket.c
View file @ 1063b42b
......@@ -313,22 +313,6 @@ static int posix_open_ch(struct pp_instance *ppi, char *ifname, int chtype)
}
/* End of General multicast Ip address init */
/* multicast sends only on specified interface */
imr.imr_multiaddr.s_addr = net_addr.s_addr;
imr.imr_interface.s_addr = iface_addr.s_addr;
if (setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF,
&imr.imr_interface.s_addr, sizeof(struct in_addr)) < 0) {
pp_diag_error_str2(ppi, "IP_MULTICAST_IF", strerror(errno));
return -1;
}
/* join multicast group (for receiving) on specified interface */
if (setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP,
&imr, sizeof(struct ip_mreq)) < 0) {
pp_diag_error_str2(ppi, "IP_ADD_MEMBERSHIP", strerror(errno));
return -1;
}
/* End of Peer multicast Ip address init */
/* set socket time-to-live */
if (setsockopt(sock, IPPROTO_IP, IP_MULTICAST_TTL,
&OPTS(ppi)->ttl, sizeof(int)) < 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment