From patchwork Wed May 18 07:39:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vitaly Cheptsov X-Patchwork-Id: 1632636 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L34gc3cjlz9sBB for ; Wed, 18 May 2022 17:41:47 +1000 (AEST) Received: from localhost ([::1]:38232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrEJU-0008O8-PJ for incoming@patchwork.ozlabs.org; Wed, 18 May 2022 03:41:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrEIF-0008Kl-EJ for qemu-devel@nongnu.org; Wed, 18 May 2022 03:40:30 -0400 Received: from mail.ispras.ru ([83.149.199.84]:58146) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrEI9-0008Lu-Qv for qemu-devel@nongnu.org; Wed, 18 May 2022 03:40:24 -0400 Received: from localhost.localdomain (unknown [77.37.166.174]) by mail.ispras.ru (Postfix) with ESMTPSA id 3184940755E5; Wed, 18 May 2022 07:39:50 +0000 (UTC) From: Vitaly Cheptsov To: qemu-devel@nongnu.org Cc: Vitaly Cheptsov , Jason Wang , "Daniel P . Berrange" , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= Subject: [PATCH v2] net: fix multicast support with BSD (macOS) socket implementations Date: Wed, 18 May 2022 10:39:45 +0300 Message-Id: <20220518073945.24787-1-cheptsov@ispras.ru> X-Mailer: git-send-email 2.32.1 (Apple Git-133) MIME-Version: 1.0 Received-SPF: pass client-ip=83.149.199.84; envelope-from=cheptsov@ispras.ru; helo=mail.ispras.ru X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Cc: Jason Wang Cc: Daniel P. Berrange Cc: Philippe Mathieu-Daudé Signed-off-by: Vitaly Cheptsov --- net/socket.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/net/socket.c b/net/socket.c index bfd8596250..583f788a22 100644 --- a/net/socket.c +++ b/net/socket.c @@ -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));