mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
Make this thing work with Microsoft network.
Submitted by: MIHIRA Yoshiro <sanpei@yy.cs.keio.ac.jp>
This commit is contained in:
parent
33b259e1e2
commit
a72ba80bd0
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=3311
2 changed files with 26 additions and 4 deletions
|
@ -1,5 +1,5 @@
|
||||||
--- client/dhcpc_subr.c.org Sat Jan 20 19:40:45 1996
|
--- client/dhcpc_subr.c.org Sat Jul 6 11:00:50 1996
|
||||||
+++ client/dhcpc_subr.c Sat Jan 20 19:40:49 1996
|
+++ client/dhcpc_subr.c Sat Jul 6 11:01:28 1996
|
||||||
@@ -273,7 +273,11 @@
|
@@ -273,7 +273,11 @@
|
||||||
tmp = 0;
|
tmp = 0;
|
||||||
bcopy(&tmp, sarp->arp_spa, sarp->arp_pln);
|
bcopy(&tmp, sarp->arp_spa, sarp->arp_pln);
|
||||||
|
@ -33,6 +33,17 @@
|
||||||
if (ioctl(dhcpif.fd, SIOCGIFADDR, &ifr) < 0) {
|
if (ioctl(dhcpif.fd, SIOCGIFADDR, &ifr) < 0) {
|
||||||
syslog(LOG_WARNING, "ioctl(SIOCGIFADDR) error in initialize(): %m");
|
syslog(LOG_WARNING, "ioctl(SIOCGIFADDR) error in initialize(): %m");
|
||||||
return(-1);
|
return(-1);
|
||||||
|
@@ -1535,8 +1543,8 @@
|
||||||
|
((struct sockaddr_in *)&ridreq.ifr_addr)->sin_addr.s_addr;
|
||||||
|
|
||||||
|
if (current_addr.s_addr == addr->s_addr &&
|
||||||
|
- current_mask.s_addr == mask->s_addr &&
|
||||||
|
- current_brdcst.s_addr == brdcst->s_addr) {
|
||||||
|
+ (mask && current_mask.s_addr == mask->s_addr) &&
|
||||||
|
+ (brdcst && current_brdcst.s_addr == brdcst->s_addr)) {
|
||||||
|
close(sockfd);
|
||||||
|
return(1);
|
||||||
|
}
|
||||||
@@ -1660,7 +1668,7 @@
|
@@ -1660,7 +1668,7 @@
|
||||||
/*
|
/*
|
||||||
* set routing table
|
* set routing table
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- client/dhcpc_subr.c.org Sat Jan 20 19:40:45 1996
|
--- client/dhcpc_subr.c.org Sat Jul 6 11:00:50 1996
|
||||||
+++ client/dhcpc_subr.c Sat Jan 20 19:40:49 1996
|
+++ client/dhcpc_subr.c Sat Jul 6 11:01:28 1996
|
||||||
@@ -273,7 +273,11 @@
|
@@ -273,7 +273,11 @@
|
||||||
tmp = 0;
|
tmp = 0;
|
||||||
bcopy(&tmp, sarp->arp_spa, sarp->arp_pln);
|
bcopy(&tmp, sarp->arp_spa, sarp->arp_pln);
|
||||||
|
@ -33,6 +33,17 @@
|
||||||
if (ioctl(dhcpif.fd, SIOCGIFADDR, &ifr) < 0) {
|
if (ioctl(dhcpif.fd, SIOCGIFADDR, &ifr) < 0) {
|
||||||
syslog(LOG_WARNING, "ioctl(SIOCGIFADDR) error in initialize(): %m");
|
syslog(LOG_WARNING, "ioctl(SIOCGIFADDR) error in initialize(): %m");
|
||||||
return(-1);
|
return(-1);
|
||||||
|
@@ -1535,8 +1543,8 @@
|
||||||
|
((struct sockaddr_in *)&ridreq.ifr_addr)->sin_addr.s_addr;
|
||||||
|
|
||||||
|
if (current_addr.s_addr == addr->s_addr &&
|
||||||
|
- current_mask.s_addr == mask->s_addr &&
|
||||||
|
- current_brdcst.s_addr == brdcst->s_addr) {
|
||||||
|
+ (mask && current_mask.s_addr == mask->s_addr) &&
|
||||||
|
+ (brdcst && current_brdcst.s_addr == brdcst->s_addr)) {
|
||||||
|
close(sockfd);
|
||||||
|
return(1);
|
||||||
|
}
|
||||||
@@ -1660,7 +1668,7 @@
|
@@ -1660,7 +1668,7 @@
|
||||||
/*
|
/*
|
||||||
* set routing table
|
* set routing table
|
||||||
|
|
Loading…
Add table
Reference in a new issue