Date: Thu, 19 Jan 2012 16:38:38 +0200 From: Gleb Kurtsou <gleb.kurtsou@gmail.com> To: Gleb Smirnoff <glebius@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r230207 - in head/sys: netinet sys Message-ID: <20120119143837.GA28308@reks> In-Reply-To: <201201160953.q0G9rPp8026625@svn.freebsd.org> References: <201201160953.q0G9rPp8026625@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On (16/01/2012 09:53), Gleb Smirnoff wrote: > Author: glebius > Date: Mon Jan 16 09:53:24 2012 > New Revision: 230207 > URL: http://svn.freebsd.org/changeset/base/230207 > > Log: > Drop support for SIOCSIFADDR, SIOCSIFNETMASK, SIOCSIFBRDADDR, SIOCSIFDSTADDR > ioctl commands. What was the reason for dropping them? "80-ish ioctl" doesn't justify reducing compatibility with other unix-like OS'es (namely linux). Thanks, Gleb. > > PR: 163524 > Reviewed by: net > > Modified: > head/sys/netinet/in.c > head/sys/sys/param.h > > Modified: head/sys/netinet/in.c > ============================================================================== > --- head/sys/netinet/in.c Mon Jan 16 08:31:32 2012 (r230206) > +++ head/sys/netinet/in.c Mon Jan 16 09:53:24 2012 (r230207) > @@ -73,7 +73,7 @@ static int in_lifaddr_ioctl(struct socke > > static void in_socktrim(struct sockaddr_in *); > static int in_ifinit(struct ifnet *, struct in_ifaddr *, > - struct sockaddr_in *, int, int, int); > + struct sockaddr_in *, int, int); > static void in_purgemaddrs(struct ifnet *); > > static VNET_DEFINE(int, nosameprefix); > @@ -220,7 +220,6 @@ in_control(struct socket *so, u_long cmd > struct in_addr dst; > struct in_ifinfo *ii; > struct in_aliasreq *ifra = (struct in_aliasreq *)data; > - struct sockaddr_in oldaddr; > int error, hostIsNew, iaIsNew, maskIsNew; > int iaIsFirst; > u_long ocmd = cmd; > @@ -278,10 +277,8 @@ in_control(struct socket *so, u_long cmd > case SIOCSIFBRDADDR: > case SIOCSIFDSTADDR: > case SIOCSIFNETMASK: > - if (ifr->ifr_addr.sa_family != AF_INET || > - ifr->ifr_addr.sa_len != sizeof(struct sockaddr_in)) > - return (EINVAL); > - break; > + /* We no longer support that old commands. */ > + return (EINVAL); > > case SIOCALIFADDR: > if (td != NULL) { > @@ -322,10 +319,6 @@ in_control(struct socket *so, u_long cmd > */ > switch (cmd) { > case SIOCAIFADDR: > - case SIOCSIFADDR: > - case SIOCSIFBRDADDR: > - case SIOCSIFNETMASK: > - case SIOCSIFDSTADDR: > if (td != NULL) { > error = priv_check(td, PRIV_NET_ADDIFADDR); > if (error) > @@ -413,10 +406,6 @@ in_control(struct socket *so, u_long cmd > error = EADDRNOTAVAIL; > goto out; > } > - /* FALLTHROUGH */ > - case SIOCSIFADDR: > - case SIOCSIFNETMASK: > - case SIOCSIFDSTADDR: > if (ia == NULL) { > ia = (struct in_ifaddr *) > malloc(sizeof *ia, M_IFADDR, M_NOWAIT | > @@ -452,7 +441,6 @@ in_control(struct socket *so, u_long cmd > } > break; > > - case SIOCSIFBRDADDR: > case SIOCGIFADDR: > case SIOCGIFNETMASK: > case SIOCGIFDSTADDR: > @@ -493,61 +481,6 @@ in_control(struct socket *so, u_long cmd > *((struct sockaddr_in *)&ifr->ifr_addr) = ia->ia_sockmask; > goto out; > > - case SIOCSIFDSTADDR: > - if ((ifp->if_flags & IFF_POINTOPOINT) == 0) { > - error = EINVAL; > - goto out; > - } > - oldaddr = ia->ia_dstaddr; > - ia->ia_dstaddr = *(struct sockaddr_in *)&ifr->ifr_dstaddr; > - if (ifp->if_ioctl != NULL) { > - error = (*ifp->if_ioctl)(ifp, SIOCSIFDSTADDR, > - (caddr_t)ia); > - if (error) { > - ia->ia_dstaddr = oldaddr; > - goto out; > - } > - } > - if (ia->ia_flags & IFA_ROUTE) { > - ia->ia_ifa.ifa_dstaddr = (struct sockaddr *)&oldaddr; > - rtinit(&(ia->ia_ifa), (int)RTM_DELETE, RTF_HOST); > - ia->ia_ifa.ifa_dstaddr = > - (struct sockaddr *)&ia->ia_dstaddr; > - rtinit(&(ia->ia_ifa), (int)RTM_ADD, RTF_HOST|RTF_UP); > - } > - goto out; > - > - case SIOCSIFBRDADDR: > - if ((ifp->if_flags & IFF_BROADCAST) == 0) { > - error = EINVAL; > - goto out; > - } > - ia->ia_broadaddr = *(struct sockaddr_in *)&ifr->ifr_broadaddr; > - goto out; > - > - case SIOCSIFADDR: > - error = in_ifinit(ifp, ia, > - (struct sockaddr_in *) &ifr->ifr_addr, 1, 0, 0); > - if (error != 0 && iaIsNew) > - break; > - if (error == 0) { > - ii = ((struct in_ifinfo *)ifp->if_afdata[AF_INET]); > - if (iaIsFirst && > - (ifp->if_flags & IFF_MULTICAST) != 0) { > - error = in_joingroup(ifp, &allhosts_addr, > - NULL, &ii->ii_allhosts); > - } > - EVENTHANDLER_INVOKE(ifaddr_event, ifp); > - } > - error = 0; > - goto out; > - > - case SIOCSIFNETMASK: > - ia->ia_sockmask.sin_addr = ((struct sockaddr_in *) > - &ifr->ifr_addr)->sin_addr; > - ia->ia_subnetmask = ntohl(ia->ia_sockmask.sin_addr.s_addr); > - goto out; > - > case SIOCAIFADDR: > maskIsNew = 0; > hostIsNew = 1; > @@ -579,8 +512,8 @@ in_control(struct socket *so, u_long cmd > maskIsNew = 1; /* We lie; but the effect's the same */ > } > if (hostIsNew || maskIsNew) > - error = in_ifinit(ifp, ia, &ifra->ifra_addr, 0, > - maskIsNew, (ocmd == cmd ? ifra->ifra_vhid : 0)); > + error = in_ifinit(ifp, ia, &ifra->ifra_addr, maskIsNew, > + (ocmd == cmd ? ifra->ifra_vhid : 0)); > if (error != 0 && iaIsNew) > break; > > @@ -863,14 +796,11 @@ in_ifscrub(struct ifnet *ifp, struct in_ > */ > static int > in_ifinit(struct ifnet *ifp, struct in_ifaddr *ia, struct sockaddr_in *sin, > - int scrub, int masksupplied, int vhid) > + int masksupplied, int vhid) > { > register u_long i = ntohl(sin->sin_addr.s_addr); > int flags = RTF_UP, error = 0; > > - if (scrub) > - in_scrubprefix(ia, LLE_STATIC); > - > IN_IFADDR_WLOCK(); > if (ia->ia_addr.sin_family == AF_INET) > LIST_REMOVE(ia, ia_hash); > > Modified: head/sys/sys/param.h > ============================================================================== > --- head/sys/sys/param.h Mon Jan 16 08:31:32 2012 (r230206) > +++ head/sys/sys/param.h Mon Jan 16 09:53:24 2012 (r230207) > @@ -58,7 +58,7 @@ > * in the range 5 to 9. > */ > #undef __FreeBSD_version > -#define __FreeBSD_version 1000004 /* Master, propagated to newvers */ > +#define __FreeBSD_version 1000005 /* Master, propagated to newvers */ > > /* > * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120119143837.GA28308>