Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Synced to new interface code.

Browse source
This commit is contained in:
Martin Mares 1998-06-01 21:41:32 +00:00
parent 4cc78c5082
commit 869c695998
3 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysdep/unix/io.c
View file

@ -412,7 +412,7 @@ sk_open(sock *s)
if (has_src) if (has_src)
set_inaddr(&mreq, s->saddr); set_inaddr(&mreq, s->saddr);
else else
set_inaddr(&mreq, s->iface->ifa->ip); set_inaddr(&mreq, s->iface->ip);
memcpy(&mreq_add.imr_interface, &mreq, sizeof(struct in_addr)); memcpy(&mreq_add.imr_interface, &mreq, sizeof(struct in_addr));
#endif #endif
set_inaddr(&mreq_add.imr_multiaddr, s->daddr); set_inaddr(&mreq_add.imr_multiaddr, s->daddr);

1
sysdep/unix/main.c
View file

@ -31,6 +31,7 @@ handle_sigusr(int sig)
sk_dump_all(); sk_dump_all();
tm_dump_all(); tm_dump_all();
if_dump_all(); if_dump_all();
neigh_dump_all();
rta_dump_all(); rta_dump_all();
rt_dump_all(); rt_dump_all();

28
sysdep/unix/sync-if.c
View file

@ -30,7 +30,6 @@ static void
scan_ifs(struct ifreq *r, int cnt) scan_ifs(struct ifreq *r, int cnt)
{ {
struct iface i; struct iface i;
struct ifa a;
char *err; char *err;
unsigned fl; unsigned fl;
ip_addr netmask; ip_addr netmask;
@ -39,13 +38,11 @@ scan_ifs(struct ifreq *r, int cnt)
for (cnt /= sizeof(struct ifreq); cnt; cnt--, r++) for (cnt /= sizeof(struct ifreq); cnt; cnt--, r++)
{ {
bzero(&i, sizeof(i)); bzero(&i, sizeof(i));
bzero(&a, sizeof(a));
debug("%s\n", r->ifr_ifrn.ifrn_name); debug("%s\n", r->ifr_ifrn.ifrn_name);
strncpy(i.name, r->ifr_ifrn.ifrn_name, sizeof(i.name) - 1); strncpy(i.name, r->ifr_ifrn.ifrn_name, sizeof(i.name) - 1);
i.name[sizeof(i.name) - 1] = 0; i.name[sizeof(i.name) - 1] = 0;
i.ifa = &a; get_sockaddr((struct sockaddr_in *) &r->ifr_addr, &i.ip, NULL);
get_sockaddr((struct sockaddr_in *) &r->ifr_addr, &a.ip, NULL); l = ipa_classify(i.ip);
l = ipa_classify(a.ip);
if (l < 0 || !(l & IADDR_HOST)) if (l < 0 || !(l & IADDR_HOST))
{ {
log(L_ERR "%s: Invalid interface address", i.name); log(L_ERR "%s: Invalid interface address", i.name);
@ -76,15 +73,15 @@ scan_ifs(struct ifreq *r, int cnt)
log(L_ERR "%s: Invalid netmask", i.name); log(L_ERR "%s: Invalid netmask", i.name);
goto bad; goto bad;
} }
a.pxlen = l; i.pxlen = l;
if (fl & IFF_POINTOPOINT) if (fl & IFF_POINTOPOINT)
{ {
i.flags |= IF_UNNUMBERED; i.flags |= IF_UNNUMBERED;
a.pxlen = BITS_PER_IP_ADDRESS; i.pxlen = BITS_PER_IP_ADDRESS;
if (ioctl(if_scan_sock, SIOCGIFDSTADDR, r) < 0) if (ioctl(if_scan_sock, SIOCGIFDSTADDR, r) < 0)
{ err = "SIOCGIFDSTADDR"; goto faulty; } { err = "SIOCGIFDSTADDR"; goto faulty; }
get_sockaddr((struct sockaddr_in *) &r->ifr_addr, &a.opposite, NULL); get_sockaddr((struct sockaddr_in *) &r->ifr_addr, &i.opposite, NULL);
} }
if (fl & IFF_LOOPBACK) if (fl & IFF_LOOPBACK)
i.flags |= IF_LOOPBACK | IF_IGNORE; i.flags |= IF_LOOPBACK | IF_IGNORE;
@ -93,24 +90,24 @@ scan_ifs(struct ifreq *r, int cnt)
#endif #endif
i.flags |= IF_MULTICAST; i.flags |= IF_MULTICAST;
a.prefix = ipa_and(a.ip, ipa_mkmask(a.pxlen)); i.prefix = ipa_and(i.ip, ipa_mkmask(i.pxlen));
if (a.pxlen < 32) if (i.pxlen < 32)
{ {
a.brd = ipa_or(a.prefix, ipa_not(ipa_mkmask(a.pxlen))); i.brd = ipa_or(i.prefix, ipa_not(ipa_mkmask(i.pxlen)));
if (ipa_equal(a.ip, a.prefix) || ipa_equal(a.ip, a.brd)) if (ipa_equal(i.ip, i.prefix) || ipa_equal(i.ip, i.brd))
{ {
log(L_ERR "%s: Using network or broadcast address for interface", i.name); log(L_ERR "%s: Using network or broadcast address for interface", i.name);
goto bad; goto bad;
} }
if (fl & IFF_BROADCAST) if (fl & IFF_BROADCAST)
i.flags |= IF_BROADCAST; i.flags |= IF_BROADCAST;
if (a.pxlen < 30) if (i.pxlen < 30)
i.flags |= IF_MULTIACCESS; i.flags |= IF_MULTIACCESS;
else else
a.opposite = ipa_opposite(a.ip); i.opposite = ipa_opposite(i.ip);
} }
else else
a.brd = a.opposite; i.brd = i.opposite;
if (ioctl(if_scan_sock, SIOCGIFMTU, r) < 0) if (ioctl(if_scan_sock, SIOCGIFMTU, r) < 0)
{ err = "SIOCGIFMTU"; goto faulty; } { err = "SIOCGIFMTU"; goto faulty; }
@ -124,6 +121,7 @@ scan_ifs(struct ifreq *r, int cnt)
if_update(&i); if_update(&i);
} }
if_end_update();
} }
static void static void