diff options
author | Vamsi Nagineni <Vamsi.Krishna@Sun.COM> | 2009-07-09 22:14:05 -0700 |
---|---|---|
committer | Vamsi Nagineni <Vamsi.Krishna@Sun.COM> | 2009-07-09 22:14:05 -0700 |
commit | 2e48140345cdddc047ba174318125297131e0976 (patch) | |
tree | aa0e50d557e86f433c90d6d11d31881dcda8f758 /usr | |
parent | 7b4c5c8b4fd48b69fab033a244cf1eaf942ee6bd (diff) | |
download | illumos-gate-2e48140345cdddc047ba174318125297131e0976.tar.gz |
6848271 zoneadmd: initial assignment of ip address ending with .0 .255 (cidr) doesn't work
Diffstat (limited to 'usr')
-rw-r--r-- | usr/src/cmd/zoneadmd/vplat.c | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/usr/src/cmd/zoneadmd/vplat.c b/usr/src/cmd/zoneadmd/vplat.c index dd9ad55755..8a89d34bb0 100644 --- a/usr/src/cmd/zoneadmd/vplat.c +++ b/usr/src/cmd/zoneadmd/vplat.c @@ -2211,6 +2211,7 @@ configure_one_interface(zlog_t *zlogp, zoneid_t zone_id, struct lifreq lifr; struct sockaddr_in netmask4; struct sockaddr_in6 netmask6; + struct sockaddr_storage laddr; struct in_addr in4; sa_family_t af; char *slashp = strchr(nwiftabptr->zone_nwif_address, '/'); @@ -2234,8 +2235,19 @@ configure_one_interface(zlog_t *zlogp, zoneid_t zone_id, return (-1); } + /* + * This is a similar kind of "hack" like in addif() to get around + * the problem of SIOCLIFADDIF. The problem is that this ioctl + * does not include the netmask when adding a logical interface. + * To get around this problem, we first add the logical interface + * with a 0 address. After that, we set the netmask if provided. + * Finally we set the interface address. + */ + laddr = lifr.lifr_addr; (void) strlcpy(lifr.lifr_name, nwiftabptr->zone_nwif_physical, sizeof (lifr.lifr_name)); + (void) memset(&lifr.lifr_addr, 0, sizeof (lifr.lifr_addr)); + if (ioctl(s, SIOCLIFADDIF, (caddr_t)&lifr) < 0) { /* * Here, we know that the interface can't be brought up. @@ -2250,13 +2262,6 @@ configure_one_interface(zlog_t *zlogp, zoneid_t zone_id, return (Z_OK); } - if (ioctl(s, SIOCSLIFADDR, (caddr_t)&lifr) < 0) { - zerror(zlogp, B_TRUE, - "%s: could not set IP address to %s", - lifr.lifr_name, nwiftabptr->zone_nwif_address); - goto bad; - } - /* Preserve literal IPv4 address for later potential printing. */ if (af == AF_INET) (void) inet_ntop(AF_INET, &in4, addrstr4, INET_ADDRSTRLEN); @@ -2330,20 +2335,12 @@ configure_one_interface(zlog_t *zlogp, zoneid_t zone_id, goto bad; } - /* - * This doesn't set the broadcast address at all. Rather, it - * gets, then sets the interface's address, relying on the fact - * that resetting the address will reset the broadcast address. - */ - if (ioctl(s, SIOCGLIFADDR, (caddr_t)&lifr) < 0) { - zerror(zlogp, B_TRUE, "%s: could not get address", - lifr.lifr_name); - goto bad; - } + /* Set the interface address */ + lifr.lifr_addr = laddr; if (ioctl(s, SIOCSLIFADDR, (caddr_t)&lifr) < 0) { zerror(zlogp, B_TRUE, - "%s: could not reset broadcast address", - lifr.lifr_name); + "%s: could not set IP address to %s", + lifr.lifr_name, nwiftabptr->zone_nwif_address); goto bad; } |