ifnet: factor out interface renaming into a separate function.
This change is required to support interface renaming via Netlink. No functional changes intended. Reviewed by: zlei Differential Revision: https://reviews.freebsd.org/D39692 MFC after: 2 weeks
This commit is contained in:
parent
66095010d1
commit
56d4550c4d
116
sys/net/if.c
116
sys/net/if.c
@ -2476,13 +2476,9 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td)
|
|||||||
struct ifreq *ifr;
|
struct ifreq *ifr;
|
||||||
int error = 0, do_ifup = 0;
|
int error = 0, do_ifup = 0;
|
||||||
int new_flags, temp_flags;
|
int new_flags, temp_flags;
|
||||||
size_t namelen, onamelen;
|
|
||||||
size_t descrlen, nvbuflen;
|
size_t descrlen, nvbuflen;
|
||||||
char *descrbuf;
|
char *descrbuf;
|
||||||
char new_name[IFNAMSIZ];
|
char new_name[IFNAMSIZ];
|
||||||
char old_name[IFNAMSIZ], strbuf[IFNAMSIZ + 8];
|
|
||||||
struct ifaddr *ifa;
|
|
||||||
struct sockaddr_dl *sdl;
|
|
||||||
void *buf;
|
void *buf;
|
||||||
nvlist_t *nvcap;
|
nvlist_t *nvcap;
|
||||||
struct siocsifcapnv_driver_data drv_ioctl_data;
|
struct siocsifcapnv_driver_data drv_ioctl_data;
|
||||||
@ -2749,55 +2745,7 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td)
|
|||||||
NULL);
|
NULL);
|
||||||
if (error != 0)
|
if (error != 0)
|
||||||
return (error);
|
return (error);
|
||||||
if (new_name[0] == '\0')
|
error = if_rename(ifp, new_name);
|
||||||
return (EINVAL);
|
|
||||||
if (strcmp(new_name, ifp->if_xname) == 0)
|
|
||||||
break;
|
|
||||||
if (ifunit(new_name) != NULL)
|
|
||||||
return (EEXIST);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* XXX: Locking. Nothing else seems to lock if_flags,
|
|
||||||
* and there are numerous other races with the
|
|
||||||
* ifunit() checks not being atomic with namespace
|
|
||||||
* changes (renames, vmoves, if_attach, etc).
|
|
||||||
*/
|
|
||||||
ifp->if_flags |= IFF_RENAMING;
|
|
||||||
|
|
||||||
EVENTHANDLER_INVOKE(ifnet_departure_event, ifp);
|
|
||||||
|
|
||||||
if_printf(ifp, "changing name to '%s'\n", new_name);
|
|
||||||
|
|
||||||
IF_ADDR_WLOCK(ifp);
|
|
||||||
strlcpy(old_name, ifp->if_xname, sizeof(old_name));
|
|
||||||
strlcpy(ifp->if_xname, new_name, sizeof(ifp->if_xname));
|
|
||||||
ifa = ifp->if_addr;
|
|
||||||
sdl = (struct sockaddr_dl *)ifa->ifa_addr;
|
|
||||||
namelen = strlen(new_name);
|
|
||||||
onamelen = sdl->sdl_nlen;
|
|
||||||
/*
|
|
||||||
* Move the address if needed. This is safe because we
|
|
||||||
* allocate space for a name of length IFNAMSIZ when we
|
|
||||||
* create this in if_attach().
|
|
||||||
*/
|
|
||||||
if (namelen != onamelen) {
|
|
||||||
bcopy(sdl->sdl_data + onamelen,
|
|
||||||
sdl->sdl_data + namelen, sdl->sdl_alen);
|
|
||||||
}
|
|
||||||
bcopy(new_name, sdl->sdl_data, namelen);
|
|
||||||
sdl->sdl_nlen = namelen;
|
|
||||||
sdl = (struct sockaddr_dl *)ifa->ifa_netmask;
|
|
||||||
bzero(sdl->sdl_data, onamelen);
|
|
||||||
while (namelen != 0)
|
|
||||||
sdl->sdl_data[--namelen] = 0xff;
|
|
||||||
IF_ADDR_WUNLOCK(ifp);
|
|
||||||
|
|
||||||
EVENTHANDLER_INVOKE(ifnet_arrival_event, ifp);
|
|
||||||
|
|
||||||
ifp->if_flags &= ~IFF_RENAMING;
|
|
||||||
|
|
||||||
snprintf(strbuf, sizeof(strbuf), "name=%s", new_name);
|
|
||||||
devctl_notify("IFNET", old_name, "RENAME", strbuf);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#ifdef VIMAGE
|
#ifdef VIMAGE
|
||||||
@ -3207,6 +3155,68 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct thread *td)
|
|||||||
return (error);
|
return (error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
if_rename(struct ifnet *ifp, char *new_name)
|
||||||
|
{
|
||||||
|
struct ifaddr *ifa;
|
||||||
|
struct sockaddr_dl *sdl;
|
||||||
|
size_t namelen, onamelen;
|
||||||
|
char old_name[IFNAMSIZ];
|
||||||
|
char strbuf[IFNAMSIZ + 8];
|
||||||
|
|
||||||
|
if (new_name[0] == '\0')
|
||||||
|
return (EINVAL);
|
||||||
|
if (strcmp(new_name, ifp->if_xname) == 0)
|
||||||
|
return (0);
|
||||||
|
if (ifunit(new_name) != NULL)
|
||||||
|
return (EEXIST);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* XXX: Locking. Nothing else seems to lock if_flags,
|
||||||
|
* and there are numerous other races with the
|
||||||
|
* ifunit() checks not being atomic with namespace
|
||||||
|
* changes (renames, vmoves, if_attach, etc).
|
||||||
|
*/
|
||||||
|
ifp->if_flags |= IFF_RENAMING;
|
||||||
|
|
||||||
|
EVENTHANDLER_INVOKE(ifnet_departure_event, ifp);
|
||||||
|
|
||||||
|
if_printf(ifp, "changing name to '%s'\n", new_name);
|
||||||
|
|
||||||
|
IF_ADDR_WLOCK(ifp);
|
||||||
|
strlcpy(old_name, ifp->if_xname, sizeof(old_name));
|
||||||
|
strlcpy(ifp->if_xname, new_name, sizeof(ifp->if_xname));
|
||||||
|
ifa = ifp->if_addr;
|
||||||
|
sdl = (struct sockaddr_dl *)ifa->ifa_addr;
|
||||||
|
namelen = strlen(new_name);
|
||||||
|
onamelen = sdl->sdl_nlen;
|
||||||
|
/*
|
||||||
|
* Move the address if needed. This is safe because we
|
||||||
|
* allocate space for a name of length IFNAMSIZ when we
|
||||||
|
* create this in if_attach().
|
||||||
|
*/
|
||||||
|
if (namelen != onamelen) {
|
||||||
|
bcopy(sdl->sdl_data + onamelen,
|
||||||
|
sdl->sdl_data + namelen, sdl->sdl_alen);
|
||||||
|
}
|
||||||
|
bcopy(new_name, sdl->sdl_data, namelen);
|
||||||
|
sdl->sdl_nlen = namelen;
|
||||||
|
sdl = (struct sockaddr_dl *)ifa->ifa_netmask;
|
||||||
|
bzero(sdl->sdl_data, onamelen);
|
||||||
|
while (namelen != 0)
|
||||||
|
sdl->sdl_data[--namelen] = 0xff;
|
||||||
|
IF_ADDR_WUNLOCK(ifp);
|
||||||
|
|
||||||
|
EVENTHANDLER_INVOKE(ifnet_arrival_event, ifp);
|
||||||
|
|
||||||
|
ifp->if_flags &= ~IFF_RENAMING;
|
||||||
|
|
||||||
|
snprintf(strbuf, sizeof(strbuf), "name=%s", new_name);
|
||||||
|
devctl_notify("IFNET", old_name, "RENAME", strbuf);
|
||||||
|
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The code common to handling reference counted flags,
|
* The code common to handling reference counted flags,
|
||||||
* e.g., in ifpromisc() and if_allmulti().
|
* e.g., in ifpromisc() and if_allmulti().
|
||||||
|
@ -590,6 +590,7 @@ const char *if_getdname(const if_t ifp);
|
|||||||
void if_setdname(if_t ifp, const char *name);
|
void if_setdname(if_t ifp, const char *name);
|
||||||
const char *if_name(if_t ifp);
|
const char *if_name(if_t ifp);
|
||||||
int if_setname(if_t ifp, const char *name);
|
int if_setname(if_t ifp, const char *name);
|
||||||
|
int if_rename(struct ifnet *ifp, char *new_name);
|
||||||
void if_setdescr(if_t ifp, char *descrbuf);
|
void if_setdescr(if_t ifp, char *descrbuf);
|
||||||
char *if_allocdescr(size_t sz, int malloc_flag);
|
char *if_allocdescr(size_t sz, int malloc_flag);
|
||||||
void if_freedescr(char *descrbuf);
|
void if_freedescr(char *descrbuf);
|
||||||
|
Loading…
Reference in New Issue
Block a user