View | Details | Raw Unified | Return to bug 184288
Collapse All | Expand All

(-)./libnetutil/netutil.cc (-2 / +10 lines)
Lines 1319-1325 Link Here
1319
    /* The first time through the loop we add the primary interface record.
1319
    /* The first time through the loop we add the primary interface record.
1320
       After that we add the aliases one at a time. */
1320
       After that we add the aliases one at a time. */
1321
    if (!primary_done) {
1321
    if (!primary_done) {
1322
      if (addr_ntos(&entry->intf_addr, (struct sockaddr *) &tmpss) == -1) {
1322
      if ( (addr_ntos(&entry->intf_addr, (struct sockaddr *) &tmpss) == -1)
1323
#ifdef AF_LINK
1324
              || (tmpss.ss_family == AF_LINK)
1325
#endif
1326
         ) {
1323
        dcrn->ifaces[dcrn->numifaces].addr.ss_family = 0;
1327
        dcrn->ifaces[dcrn->numifaces].addr.ss_family = 0;
1324
      } else {
1328
      } else {
1325
        rc = canonicalize_address(&tmpss, &dcrn->ifaces[dcrn->numifaces].addr);
1329
        rc = canonicalize_address(&tmpss, &dcrn->ifaces[dcrn->numifaces].addr);
Lines 1328-1334 Link Here
1328
      dcrn->ifaces[dcrn->numifaces].netmask_bits = entry->intf_addr.addr_bits;
1332
      dcrn->ifaces[dcrn->numifaces].netmask_bits = entry->intf_addr.addr_bits;
1329
      primary_done = true;
1333
      primary_done = true;
1330
    } else if (num_aliases_done < entry->intf_alias_num) {
1334
    } else if (num_aliases_done < entry->intf_alias_num) {
1331
      if (addr_ntos(&entry->intf_alias_addrs[num_aliases_done], (struct sockaddr *) &tmpss) == -1) {
1335
      if ( (addr_ntos(&entry->intf_alias_addrs[num_aliases_done], (struct sockaddr *) &tmpss) == -1)
1336
#ifdef AF_LINK
1337
              || (tmpss.ss_family == AF_LINK)
1338
#endif
1339
         ) {
1332
        dcrn->ifaces[dcrn->numifaces].addr.ss_family = 0;
1340
        dcrn->ifaces[dcrn->numifaces].addr.ss_family = 0;
1333
      } else {
1341
      } else {
1334
        rc = canonicalize_address(&tmpss, &dcrn->ifaces[dcrn->numifaces].addr);
1342
        rc = canonicalize_address(&tmpss, &dcrn->ifaces[dcrn->numifaces].addr);

Return to bug 184288