drivers: Move driver_wired_get_ifflags() 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>
This commit is contained in:
parent
693124a1e4
commit
567b7d4ec2
4 changed files with 34 additions and 58 deletions
|
@ -99,31 +99,6 @@ static int macsec_qca_get_capa(void *priv, struct wpa_driver_capa *capa)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int macsec_qca_get_ifflags(const char *ifname, int *flags)
|
|
||||||
{
|
|
||||||
struct ifreq ifr;
|
|
||||||
int s;
|
|
||||||
|
|
||||||
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);
|
|
||||||
if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) {
|
|
||||||
wpa_printf(MSG_ERROR, "ioctl[SIOCGIFFLAGS]: %s",
|
|
||||||
strerror(errno));
|
|
||||||
close(s);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
close(s);
|
|
||||||
*flags = ifr.ifr_flags & 0xffff;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static int macsec_qca_set_ifflags(const char *ifname, int flags)
|
static int macsec_qca_set_ifflags(const char *ifname, int flags)
|
||||||
{
|
{
|
||||||
struct ifreq ifr;
|
struct ifreq ifr;
|
||||||
|
@ -252,7 +227,7 @@ static void * macsec_qca_init(void *ctx, const char *ifname)
|
||||||
drv->common.pf_sock = -1;
|
drv->common.pf_sock = -1;
|
||||||
#endif /* __linux__ */
|
#endif /* __linux__ */
|
||||||
|
|
||||||
if (macsec_qca_get_ifflags(ifname, &flags) == 0 &&
|
if (driver_wired_get_ifflags(ifname, &flags) == 0 &&
|
||||||
!(flags & IFF_UP) &&
|
!(flags & IFF_UP) &&
|
||||||
macsec_qca_set_ifflags(ifname, flags | IFF_UP) == 0) {
|
macsec_qca_set_ifflags(ifname, flags | IFF_UP) == 0) {
|
||||||
drv->common.iff_up = 1;
|
drv->common.iff_up = 1;
|
||||||
|
@ -270,7 +245,7 @@ static void * macsec_qca_init(void *ctx, const char *ifname)
|
||||||
"%s: Added multicast membership with SIOCADDMULTI",
|
"%s: Added multicast membership with SIOCADDMULTI",
|
||||||
__func__);
|
__func__);
|
||||||
drv->common.multi = 1;
|
drv->common.multi = 1;
|
||||||
} else if (macsec_qca_get_ifflags(ifname, &flags) < 0) {
|
} else if (driver_wired_get_ifflags(ifname, &flags) < 0) {
|
||||||
wpa_printf(MSG_INFO, "%s: Could not get interface flags",
|
wpa_printf(MSG_INFO, "%s: Could not get interface flags",
|
||||||
__func__);
|
__func__);
|
||||||
os_free(drv);
|
os_free(drv);
|
||||||
|
@ -325,7 +300,7 @@ static void macsec_qca_deinit(void *priv)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (drv->common.iff_allmulti &&
|
if (drv->common.iff_allmulti &&
|
||||||
(macsec_qca_get_ifflags(drv->common.ifname, &flags) < 0 ||
|
(driver_wired_get_ifflags(drv->common.ifname, &flags) < 0 ||
|
||||||
macsec_qca_set_ifflags(drv->common.ifname,
|
macsec_qca_set_ifflags(drv->common.ifname,
|
||||||
flags & ~IFF_ALLMULTI) < 0)) {
|
flags & ~IFF_ALLMULTI) < 0)) {
|
||||||
wpa_printf(MSG_DEBUG, "%s: Failed to disable allmulti mode",
|
wpa_printf(MSG_DEBUG, "%s: Failed to disable allmulti mode",
|
||||||
|
@ -333,7 +308,7 @@ static void macsec_qca_deinit(void *priv)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (drv->common.iff_up &&
|
if (drv->common.iff_up &&
|
||||||
macsec_qca_get_ifflags(drv->common.ifname, &flags) == 0 &&
|
driver_wired_get_ifflags(drv->common.ifname, &flags) == 0 &&
|
||||||
(flags & IFF_UP) &&
|
(flags & IFF_UP) &&
|
||||||
macsec_qca_set_ifflags(drv->common.ifname, flags & ~IFF_UP) < 0) {
|
macsec_qca_set_ifflags(drv->common.ifname, flags & ~IFF_UP) < 0) {
|
||||||
wpa_printf(MSG_DEBUG, "%s: Failed to set the interface down",
|
wpa_printf(MSG_DEBUG, "%s: Failed to set the interface down",
|
||||||
|
|
|
@ -390,31 +390,6 @@ static int wpa_driver_wired_get_capa(void *priv, struct wpa_driver_capa *capa)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int wpa_driver_wired_get_ifflags(const char *ifname, int *flags)
|
|
||||||
{
|
|
||||||
struct ifreq ifr;
|
|
||||||
int s;
|
|
||||||
|
|
||||||
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);
|
|
||||||
if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) {
|
|
||||||
wpa_printf(MSG_ERROR, "ioctl[SIOCGIFFLAGS]: %s",
|
|
||||||
strerror(errno));
|
|
||||||
close(s);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
close(s);
|
|
||||||
*flags = ifr.ifr_flags & 0xffff;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static int wpa_driver_wired_set_ifflags(const char *ifname, int flags)
|
static int wpa_driver_wired_set_ifflags(const char *ifname, int flags)
|
||||||
{
|
{
|
||||||
struct ifreq ifr;
|
struct ifreq ifr;
|
||||||
|
@ -488,7 +463,7 @@ static void * wpa_driver_wired_init(void *ctx, const char *ifname)
|
||||||
drv->common.pf_sock = -1;
|
drv->common.pf_sock = -1;
|
||||||
#endif /* __linux__ */
|
#endif /* __linux__ */
|
||||||
|
|
||||||
if (wpa_driver_wired_get_ifflags(ifname, &flags) == 0 &&
|
if (driver_wired_get_ifflags(ifname, &flags) == 0 &&
|
||||||
!(flags & IFF_UP) &&
|
!(flags & IFF_UP) &&
|
||||||
wpa_driver_wired_set_ifflags(ifname, flags | IFF_UP) == 0) {
|
wpa_driver_wired_set_ifflags(ifname, flags | IFF_UP) == 0) {
|
||||||
drv->common.iff_up = 1;
|
drv->common.iff_up = 1;
|
||||||
|
@ -504,7 +479,7 @@ static void * wpa_driver_wired_init(void *ctx, const char *ifname)
|
||||||
wpa_printf(MSG_DEBUG, "%s: Added multicast membership with "
|
wpa_printf(MSG_DEBUG, "%s: Added multicast membership with "
|
||||||
"SIOCADDMULTI", __func__);
|
"SIOCADDMULTI", __func__);
|
||||||
drv->common.multi = 1;
|
drv->common.multi = 1;
|
||||||
} else if (wpa_driver_wired_get_ifflags(ifname, &flags) < 0) {
|
} else if (driver_wired_get_ifflags(ifname, &flags) < 0) {
|
||||||
wpa_printf(MSG_INFO, "%s: Could not get interface "
|
wpa_printf(MSG_INFO, "%s: Could not get interface "
|
||||||
"flags", __func__);
|
"flags", __func__);
|
||||||
os_free(drv);
|
os_free(drv);
|
||||||
|
@ -558,7 +533,7 @@ static void wpa_driver_wired_deinit(void *priv)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (drv->common.iff_allmulti &&
|
if (drv->common.iff_allmulti &&
|
||||||
(wpa_driver_wired_get_ifflags(drv->common.ifname, &flags) < 0 ||
|
(driver_wired_get_ifflags(drv->common.ifname, &flags) < 0 ||
|
||||||
wpa_driver_wired_set_ifflags(drv->common.ifname,
|
wpa_driver_wired_set_ifflags(drv->common.ifname,
|
||||||
flags & ~IFF_ALLMULTI) < 0)) {
|
flags & ~IFF_ALLMULTI) < 0)) {
|
||||||
wpa_printf(MSG_DEBUG, "%s: Failed to disable allmulti mode",
|
wpa_printf(MSG_DEBUG, "%s: Failed to disable allmulti mode",
|
||||||
|
@ -566,7 +541,7 @@ static void wpa_driver_wired_deinit(void *priv)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (drv->common.iff_up &&
|
if (drv->common.iff_up &&
|
||||||
wpa_driver_wired_get_ifflags(drv->common.ifname, &flags) == 0 &&
|
driver_wired_get_ifflags(drv->common.ifname, &flags) == 0 &&
|
||||||
(flags & IFF_UP) &&
|
(flags & IFF_UP) &&
|
||||||
wpa_driver_wired_set_ifflags(drv->common.ifname,
|
wpa_driver_wired_set_ifflags(drv->common.ifname,
|
||||||
flags & ~IFF_UP) < 0) {
|
flags & ~IFF_UP) < 0) {
|
||||||
|
|
|
@ -30,6 +30,31 @@
|
||||||
#endif /* __sun__ */
|
#endif /* __sun__ */
|
||||||
|
|
||||||
|
|
||||||
|
int driver_wired_get_ifflags(const char *ifname, int *flags)
|
||||||
|
{
|
||||||
|
struct ifreq ifr;
|
||||||
|
int s;
|
||||||
|
|
||||||
|
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);
|
||||||
|
if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) {
|
||||||
|
wpa_printf(MSG_ERROR, "ioctl[SIOCGIFFLAGS]: %s",
|
||||||
|
strerror(errno));
|
||||||
|
close(s);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
close(s);
|
||||||
|
*flags = ifr.ifr_flags & 0xffff;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
int driver_wired_multi(const char *ifname, const u8 *addr, int add)
|
int driver_wired_multi(const char *ifname, const u8 *addr, int add)
|
||||||
{
|
{
|
||||||
struct ifreq ifr;
|
struct ifreq ifr;
|
||||||
|
|
|
@ -22,6 +22,7 @@ struct driver_wired_common_data {
|
||||||
static const u8 pae_group_addr[ETH_ALEN] =
|
static const u8 pae_group_addr[ETH_ALEN] =
|
||||||
{ 0x01, 0x80, 0xc2, 0x00, 0x00, 0x03 };
|
{ 0x01, 0x80, 0xc2, 0x00, 0x00, 0x03 };
|
||||||
|
|
||||||
|
int driver_wired_get_ifflags(const char *ifname, int *flags);
|
||||||
int driver_wired_multi(const char *ifname, const u8 *addr, int add);
|
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);
|
int wired_multicast_membership(int sock, int ifindex, const u8 *addr, int add);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue