net: fix multicast support with BSD (macOS) socket implementations
Subsystems (2)
PATCH v2 1/1 net: fix multicast support with BSD (macOS) socket implementations
--- net/socket.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
net/socket.c +18 -0
@@ -239,6 +239,22 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr,return -1 ; } +#ifdef __APPLE__ + val =1 ; + ret =qemu_setsockopt (fd,SOL_SOCKET ,SO_REUSEPORT , &val,sizeof (val)); +if (ret <0 ) { +error_setg_errno (errp, errno, +"can't set socket option SO_REUSEPORT" ); + goto fail; + } + +struct sockaddr_in bindaddr; +memset (&bindaddr,0 ,sizeof (bindaddr)); + bindaddr.sin_family =AF_INET ; + bindaddr.sin_addr.s_addr =htonl (INADDR_ANY ); + bindaddr.sin_port = mcastaddr->sin_port; + ret =bind (fd, (struct sockaddr *)&bindaddr,sizeof (bindaddr)); +#else /* Allow multiple sockets to bind the same multicast ip and port by setting * SO_REUSEADDR. This is the only situation where SO_REUSEADDR should be set * on windows. Use socket_set_fast_reuse otherwise as it sets SO_REUSEADDR
@@ -253,6 +269,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, } ret =bind (fd, (struct sockaddr *)mcastaddr,sizeof (*mcastaddr)); +#endif +if (ret <0 ) {error_setg_errno (errp, errno,"can't bind ip=%s to socket" ,inet_ntoa (mcastaddr->sin_addr));
Signature · 1 line
2.32.1 (Apple Git-133)
V2 version of the previous patch ensures to keep compatibility with non-Apple platforms to avoid any potential compatibility issues with e.g. Windows mentioned in the review.
Quoted 49 lines · Vitaly Cheptsov
Cc Jason Wang <[email protected]>Cc Daniel P. Berrange <[email protected]>Cc Philippe Mathieu-Daudé <[email protected]>Signed-off-by Vitaly Cheptsov <[email protected]>---
net/socket.c| 18 ++++++++++++++++++1 file changed, 18 insertions(+)net/socket.c +18
-1@@ -239,6 +239,22 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr,return -1 ; } +#ifdef __APPLE__ + val =1 ; + ret =qemu_setsockopt (fd,SOL_SOCKET ,SO_REUSEPORT , &val,sizeof (val)); +if (ret <0 ) { +error_setg_errno (errp, errno, +"can't set socket option SO_REUSEPORT" ); + goto fail; + } + +struct sockaddr_in bindaddr; +memset (&bindaddr,0 ,sizeof (bindaddr)); + bindaddr.sin_family =AF_INET ; + bindaddr.sin_addr.s_addr =htonl (INADDR_ANY ); + bindaddr.sin_port = mcastaddr->sin_port; + ret =bind (fd, (struct sockaddr *)&bindaddr,sizeof (bindaddr)); +#else /* Allow multiple sockets to bind the same multicast ip and port by setting * SO_REUSEADDR. This is the only situation where SO_REUSEADDR should be set * on windows. Use socket_set_fast_reuse otherwise as it sets SO_REUSEADDR @@ -253,6 +269,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, } ret =bind (fd, (struct sockaddr *)mcastaddr,sizeof (*mcastaddr)); +#endif +if (ret <0 ) {error_setg_errno (errp, errno,"can't bind ip=%s to socket" ,inet_ntoa (mcastaddr->sin_addr)); --2.32.1 (Apple Git-133)
Quoted 1 line · Vitaly Cheptsov
Hi Vitaly:
We need a changelog to describe why we need this.
Thanks
Quoted 47 lines
Cc Jason Wang <[email protected]>Cc Daniel P. Berrange <[email protected]>Cc Philippe Mathieu-Daudé <[email protected]>Signed-off-by Vitaly Cheptsov <[email protected]>--- net/socket.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)net/socket.c +18
-1@@ -239,6 +239,22 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr,return -1 ; } +#ifdef __APPLE__ + val =1 ; + ret =qemu_setsockopt (fd,SOL_SOCKET ,SO_REUSEPORT , &val,sizeof (val)); +if (ret <0 ) { +error_setg_errno (errp, errno, +"can't set socket option SO_REUSEPORT" ); + goto fail; + } + +struct sockaddr_in bindaddr; +memset (&bindaddr,0 ,sizeof (bindaddr)); + bindaddr.sin_family =AF_INET ; + bindaddr.sin_addr.s_addr =htonl (INADDR_ANY ); + bindaddr.sin_port = mcastaddr->sin_port; + ret =bind (fd, (struct sockaddr *)&bindaddr,sizeof (bindaddr)); +#else /* Allow multiple sockets to bind the same multicast ip and port by setting * SO_REUSEADDR. This is the only situation where SO_REUSEADDR should be set * on windows. Use socket_set_fast_reuse otherwise as it sets SO_REUSEADDR @@ -253,6 +269,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, } ret =bind (fd, (struct sockaddr *)mcastaddr,sizeof (*mcastaddr)); +#endif +if (ret <0 ) {error_setg_errno (errp, errno,"can't bind ip=%s to socket" ,inet_ntoa (mcastaddr->sin_addr)); --2.32.1 (Apple Git-133)
Hi Jason,
This patch fixes socket communication with QEMU -> host and QEMU <--> QEMU on macOS, which was originally impossible due to QEMU and host program having to bind to the same ip/port in a way not supported by BSD sockets. The change was tested on both Linux and macOS.
Basically after applying this patch one will be able to communicate with QEMU when using "-nic socket,mcast=230.0.0.1:1234,model=virtio-net-pci" from QEMU or macOS itself.
Best regards,
Vitaly
Quoted 59 lines · Jason Wang
Quoted 1 line · Vitaly Cheptsov
Hi Vitaly:
We need a changelog to describe why we need this.
Thanks
Quoted 47 lines
Cc Jason Wang <[email protected]>Cc Daniel P. Berrange <[email protected]>Cc Philippe Mathieu-Daudé <[email protected]>Signed-off-by Vitaly Cheptsov <[email protected]>---
net/socket.c| 18 ++++++++++++++++++1 file changed, 18 insertions(+)net/socket.c +18
-1@@ -239,6 +239,22 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr,return -1 ; } +#ifdef __APPLE__ + val =1 ; + ret =qemu_setsockopt (fd,SOL_SOCKET ,SO_REUSEPORT , &val,sizeof (val)); +if (ret <0 ) { +error_setg_errno (errp, errno, +"can't set socket option SO_REUSEPORT" ); + goto fail; + } + +struct sockaddr_in bindaddr; +memset (&bindaddr,0 ,sizeof (bindaddr)); + bindaddr.sin_family =AF_INET ; + bindaddr.sin_addr.s_addr =htonl (INADDR_ANY ); + bindaddr.sin_port = mcastaddr->sin_port; + ret =bind (fd, (struct sockaddr *)&bindaddr,sizeof (bindaddr)); +#else /* Allow multiple sockets to bind the same multicast ip and port by setting * SO_REUSEADDR. This is the only situation where SO_REUSEADDR should be set * on windows. Use socket_set_fast_reuse otherwise as it sets SO_REUSEADDR @@ -253,6 +269,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, } ret =bind (fd, (struct sockaddr *)mcastaddr,sizeof (*mcastaddr)); +#endif +if (ret <0 ) {error_setg_errno (errp, errno,"can't bind ip=%s to socket" ,inet_ntoa (mcastaddr->sin_addr)); --2.32.1 (Apple Git-133)
Quoted 9 lines · Vitaly Cheptsov
Hi Jason,
This patch fixes socket communication with QEMU -> host and QEMU <--> QEMU on macOS, which was originally impossible due to QEMU and host program having to bind to the same ip/port in a way not supported by BSD sockets. The change was tested on both Linux and macOS.
Basically after applying this patch one will be able to communicate with QEMU when using "-nic socket,mcast=230.0.0.1:1234,model=virtio-net-pci" from QEMU or macOS itself.
Best regards,
Vitaly
Would you mind resending the patch with the above as the changelog?
Thanks
Quoted 61 lines
Quoted 60 lines · Jason Wang
Quoted 1 line · Vitaly Cheptsov
Hi Vitaly:
We need a changelog to describe why we need this.
Thanks
Quoted 47 lines
Cc Jason Wang <[email protected]>Cc Daniel P. Berrange <[email protected]>Cc Philippe Mathieu-Daudé <[email protected]>Signed-off-by Vitaly Cheptsov <[email protected]>---
net/socket.c| 18 ++++++++++++++++++1 file changed, 18 insertions(+)net/socket.c +18
-1@@ -239,6 +239,22 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr,return -1 ; } +#ifdef __APPLE__ + val =1 ; + ret =qemu_setsockopt (fd,SOL_SOCKET ,SO_REUSEPORT , &val,sizeof (val)); +if (ret <0 ) { +error_setg_errno (errp, errno, +"can't set socket option SO_REUSEPORT" ); + goto fail; + } + +struct sockaddr_in bindaddr; +memset (&bindaddr,0 ,sizeof (bindaddr)); + bindaddr.sin_family =AF_INET ; + bindaddr.sin_addr.s_addr =htonl (INADDR_ANY ); + bindaddr.sin_port = mcastaddr->sin_port; + ret =bind (fd, (struct sockaddr *)&bindaddr,sizeof (bindaddr)); +#else /* Allow multiple sockets to bind the same multicast ip and port by setting * SO_REUSEADDR. This is the only situation where SO_REUSEADDR should be set * on windows. Use socket_set_fast_reuse otherwise as it sets SO_REUSEADDR @@ -253,6 +269,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, } ret =bind (fd, (struct sockaddr *)mcastaddr,sizeof (*mcastaddr)); +#endif +if (ret <0 ) {error_setg_errno (errp, errno,"can't bind ip=%s to socket" ,inet_ntoa (mcastaddr->sin_addr)); --2.32.1 (Apple Git-133)