From 693124a1e4f1c2be5ee67f412eb511c3b5b808bd Mon Sep 17 00:00:00 2001

Message-Id: <693124a1e4f1c2be5ee67f412eb511c3b5b808bd.1488376602.git.dcaratti@redhat.com>

From: Sabrina Dubroca <sd@queasysnail.net>

Date: Sun, 27 Nov 2016 20:08:46 +0100

Subject: [PATCH] drivers: Move driver_wired_multi() to a common file

This continues refactoring of the common parts of wired drivers code

into a shared file, so that they can be reused by other drivers.

Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>

---

 src/drivers/driver_macsec_qca.c   | 59 ++-------------------------------------

 src/drivers/driver_wired.c        | 59 ++-------------------------------------

 src/drivers/driver_wired_common.c | 57 +++++++++++++++++++++++++++++++++++++

 src/drivers/driver_wired_common.h |  1 +

 4 files changed, 62 insertions(+), 114 deletions(-)

diff --git a/src/drivers/driver_macsec_qca.c b/src/drivers/driver_macsec_qca.c

index e04fb0f..6c07e01 100644

--- a/src/drivers/driver_macsec_qca.c

+++ b/src/drivers/driver_macsec_qca.c

@@ -178,61 +178,6 @@ static int macsec_qca_get_ifstatus(const char *ifname, int *status)

 #endif /* defined(__FreeBSD__) || defined(__DragonFly__) || defined(FreeBSD_kernel__) */

-static int macsec_qca_multi(const char *ifname, const u8 *addr, int add)

-{

-	struct ifreq ifr;

-	int s;

-

-#ifdef __sun__

-	return -1;

-#endif /* __sun__ */

-

-	s = socket(PF_INET, SOCK_DGRAM, 0);

-	if (s < 0) {

-		wpa_printf(MSG_ERROR, "socket: %s", strerror(errno));

-		return -1;

-	}

-

-	os_memset(&ifr, 0, sizeof(ifr));

-	os_strlcpy(ifr.ifr_name, ifname, IFNAMSIZ);

-#ifdef __linux__

-	ifr.ifr_hwaddr.sa_family = AF_UNSPEC;

-	os_memcpy(ifr.ifr_hwaddr.sa_data, addr, ETH_ALEN);

-#endif /* __linux__ */

-#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)

-	{

-		struct sockaddr_dl *dlp;

-		dlp = (struct sockaddr_dl *) &ifr.ifr_addr;

-		dlp->sdl_len = sizeof(struct sockaddr_dl);

-		dlp->sdl_family = AF_LINK;

-		dlp->sdl_index = 0;

-		dlp->sdl_nlen = 0;

-		dlp->sdl_alen = ETH_ALEN;

-		dlp->sdl_slen = 0;

-		os_memcpy(LLADDR(dlp), addr, ETH_ALEN);

-	}

-#endif /* defined(__FreeBSD__) || defined(__DragonFly__) || defined(FreeBSD_kernel__) */

-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)

-	{

-		struct sockaddr *sap;

-		sap = (struct sockaddr *) &ifr.ifr_addr;

-		sap->sa_len = sizeof(struct sockaddr);

-		sap->sa_family = AF_UNSPEC;

-		os_memcpy(sap->sa_data, addr, ETH_ALEN);

-	}

-#endif /* defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) */

-

-	if (ioctl(s, add ? SIOCADDMULTI : SIOCDELMULTI, (caddr_t) &ifr) < 0) {

-		wpa_printf(MSG_ERROR, "ioctl[SIOC{ADD/DEL}MULTI]: %s",

-			   strerror(errno));

-		close(s);

-		return -1;

-	}

-	close(s);

-	return 0;

-}

-

-

 static void __macsec_drv_init(struct macsec_qca_data *drv)

 {

 	int ret = 0;

@@ -320,7 +265,7 @@ static void * macsec_qca_init(void *ctx, const char *ifname)

 			   "%s: Added multicast membership with packet socket",

 			   __func__);

 		drv->common.membership = 1;

-	} else if (macsec_qca_multi(ifname, pae_group_addr, 1) == 0) {

+	} else if (driver_wired_multi(ifname, pae_group_addr, 1) == 0) {

 		wpa_printf(MSG_DEBUG,

 			   "%s: Added multicast membership with SIOCADDMULTI",

 			   __func__);

@@ -373,7 +318,7 @@ static void macsec_qca_deinit(void *priv)

 	}

 	if (drv->common.multi &&

-	    macsec_qca_multi(drv->common.ifname, pae_group_addr, 0) < 0) {

+	    driver_wired_multi(drv->common.ifname, pae_group_addr, 0) < 0) {

 		wpa_printf(MSG_DEBUG,

 			   "%s: Failed to remove PAE multicast group (SIOCDELMULTI)",

 			   __func__);

diff --git a/src/drivers/driver_wired.c b/src/drivers/driver_wired.c

index 68c55fd..20c66e3 100644

--- a/src/drivers/driver_wired.c

+++ b/src/drivers/driver_wired.c

@@ -469,61 +469,6 @@ static int wpa_driver_wired_get_ifstatus(const char *ifname, int *status)

 #endif /* defined(__FreeBSD__) || defined(__DragonFly__) || defined(FreeBSD_kernel__) */

-static int wpa_driver_wired_multi(const char *ifname, const u8 *addr, int add)

-{

-	struct ifreq ifr;

-	int s;

-

-#ifdef __sun__

-	return -1;

-#endif /* __sun__ */

-

-	s = socket(PF_INET, SOCK_DGRAM, 0);

-	if (s < 0) {

-		wpa_printf(MSG_ERROR, "socket: %s", strerror(errno));

-		return -1;

-	}

-

-	os_memset(&ifr, 0, sizeof(ifr));

-	os_strlcpy(ifr.ifr_name, ifname, IFNAMSIZ);

-#ifdef __linux__

-	ifr.ifr_hwaddr.sa_family = AF_UNSPEC;

-	os_memcpy(ifr.ifr_hwaddr.sa_data, addr, ETH_ALEN);

-#endif /* __linux__ */

-#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)

-	{

-		struct sockaddr_dl *dlp;

-		dlp = (struct sockaddr_dl *) &ifr.ifr_addr;

-		dlp->sdl_len = sizeof(struct sockaddr_dl);

-		dlp->sdl_family = AF_LINK;

-		dlp->sdl_index = 0;

-		dlp->sdl_nlen = 0;

-		dlp->sdl_alen = ETH_ALEN;

-		dlp->sdl_slen = 0;

-		os_memcpy(LLADDR(dlp), addr, ETH_ALEN);

-	}

-#endif /* defined(__FreeBSD__) || defined(__DragonFly__) || defined(FreeBSD_kernel__) */

-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)

-	{

-		struct sockaddr *sap;

-		sap = (struct sockaddr *) &ifr.ifr_addr;

-		sap->sa_len = sizeof(struct sockaddr);

-		sap->sa_family = AF_UNSPEC;

-		os_memcpy(sap->sa_data, addr, ETH_ALEN);

-	}

-#endif /* defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) */

-

-	if (ioctl(s, add ? SIOCADDMULTI : SIOCDELMULTI, (caddr_t) &ifr) < 0) {

-		wpa_printf(MSG_ERROR, "ioctl[SIOC{ADD/DEL}MULTI]: %s",

-			   strerror(errno));

-		close(s);

-		return -1;

-	}

-	close(s);

-	return 0;

-}

-

-

 static void * wpa_driver_wired_init(void *ctx, const char *ifname)

 {

 	struct wpa_driver_wired_data *drv;

@@ -555,7 +500,7 @@ static void * wpa_driver_wired_init(void *ctx, const char *ifname)

 		wpa_printf(MSG_DEBUG, "%s: Added multicast membership with "

 			   "packet socket", __func__);

 		drv->common.membership = 1;

-	} else if (wpa_driver_wired_multi(ifname, pae_group_addr, 1) == 0) {

+	} else if (driver_wired_multi(ifname, pae_group_addr, 1) == 0) {

 		wpa_printf(MSG_DEBUG, "%s: Added multicast membership with "

 			   "SIOCADDMULTI", __func__);

 		drv->common.multi = 1;

@@ -607,7 +552,7 @@ static void wpa_driver_wired_deinit(void *priv)

 	}

 	if (drv->common.multi &&

-	    wpa_driver_wired_multi(drv->common.ifname, pae_group_addr, 0) < 0) {

+	    driver_wired_multi(drv->common.ifname, pae_group_addr, 0) < 0) {

 		wpa_printf(MSG_DEBUG, "%s: Failed to remove PAE multicast "

 			   "group (SIOCDELMULTI)", __func__);

 	}

diff --git a/src/drivers/driver_wired_common.c b/src/drivers/driver_wired_common.c

index 3969880..4cb04da 100644

--- a/src/drivers/driver_wired_common.c

+++ b/src/drivers/driver_wired_common.c

@@ -30,6 +30,63 @@

 #endif /* __sun__ */

+int driver_wired_multi(const char *ifname, const u8 *addr, int add)

+{

+	struct ifreq ifr;

+	int s;

+

+#ifdef __sun__

+	return -1;

+#endif /* __sun__ */

+

+	s = socket(PF_INET, SOCK_DGRAM, 0);

+	if (s < 0) {

+		wpa_printf(MSG_ERROR, "socket: %s", strerror(errno));

+		return -1;

+	}

+

+	os_memset(&ifr, 0, sizeof(ifr));

+	os_strlcpy(ifr.ifr_name, ifname, IFNAMSIZ);

+#ifdef __linux__

+	ifr.ifr_hwaddr.sa_family = AF_UNSPEC;

+	os_memcpy(ifr.ifr_hwaddr.sa_data, addr, ETH_ALEN);

+#endif /* __linux__ */

+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)

+	{

+		struct sockaddr_dl *dlp;

+

+		dlp = (struct sockaddr_dl *) &ifr.ifr_addr;

+		dlp->sdl_len = sizeof(struct sockaddr_dl);

+		dlp->sdl_family = AF_LINK;

+		dlp->sdl_index = 0;

+		dlp->sdl_nlen = 0;

+		dlp->sdl_alen = ETH_ALEN;

+		dlp->sdl_slen = 0;

+		os_memcpy(LLADDR(dlp), addr, ETH_ALEN);

+	}

+#endif /* defined(__FreeBSD__) || defined(__DragonFly__) || defined(FreeBSD_kernel__) */

+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)

+	{

+		struct sockaddr *sap;

+

+		sap = (struct sockaddr *) &ifr.ifr_addr;

+		sap->sa_len = sizeof(struct sockaddr);

+		sap->sa_family = AF_UNSPEC;

+		os_memcpy(sap->sa_data, addr, ETH_ALEN);

+	}

+#endif /* defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) */

+

+	if (ioctl(s, add ? SIOCADDMULTI : SIOCDELMULTI, (caddr_t) &ifr) < 0) {

+		wpa_printf(MSG_ERROR, "ioctl[SIOC{ADD/DEL}MULTI]: %s",

+			   strerror(errno));

+		close(s);

+		return -1;

+	}

+	close(s);

+	return 0;

+}

+

+

 int wired_multicast_membership(int sock, int ifindex, const u8 *addr, int add)

 {

 #ifdef __linux__

diff --git a/src/drivers/driver_wired_common.h b/src/drivers/driver_wired_common.h

index 39a57a6..9bbe94f 100644

--- a/src/drivers/driver_wired_common.h

+++ b/src/drivers/driver_wired_common.h

@@ -22,6 +22,7 @@ struct driver_wired_common_data {

 static const u8 pae_group_addr[ETH_ALEN] =

 { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x03 };

+int driver_wired_multi(const char *ifname, const u8 *addr, int add);

 int wired_multicast_membership(int sock, int ifindex, const u8 *addr, int add);

 #endif /* DRIVER_WIRED_COMMON_H */

-- 

2.7.4