mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-31 14:25:41 +00:00
Code Issues Releases Wiki Activity

Fix opening comment; require a subnet decl for every interface; remove warning about missing aliases on shared networks

Browse Source
This commit is contained in:
Ted Lemon
1996-09-05 23:55:39 +00:00
parent 73eaf8235c
commit 48d507a956
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/dispatch.c
View File

@@ -1,6 +1,6 @@
/* socket.c
/* dispatch.c
BSD socket interface code... */
Network input dispatcher... */
/*
* Copyright (c) 1995, 1996 The Internet Software Consortium.
@@ -42,7 +42,7 @@
#ifndef lint
static char copyright[] =
"$Id: dispatch.c,v 1.22 1996/09/02 21:15:17 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n";
"$Id: dispatch.c,v 1.23 1996/09/05 23:55:39 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -243,6 +243,11 @@ void discover_interfaces ()
memcpy (&foo, &tmp -> tif -> ifr_addr,
sizeof tmp -> tif -> ifr_addr);
/* We must have a subnet declaration for each interface. */
if (!tmp -> shared_network)
error ("No subnet declaration for %s (%s).",
tmp -> name, inet_ntoa (foo.sin_addr));
/* Find subnets that don't have valid interface
addresses... */
for (subnet = (tmp -> shared_network
@@ -250,9 +255,6 @@ void discover_interfaces ()
: (struct subnet *)0);
subnet; subnet = subnet -> next_sibling) {
if (!subnet -> interface_address.len) {
warn ("subnet %s attached to interface %s %s",
piaddr (subnet -> net), tmp -> name,
"but has no alias on that network.");
/* Set the interface address for this subnet
to the first address we found. */
subnet -> interface_address.len = 4;

14
dispatch.c
View File

@@ -1,6 +1,6 @@
/* socket.c
/* dispatch.c
BSD socket interface code... */
Network input dispatcher... */
/*
* Copyright (c) 1995, 1996 The Internet Software Consortium.
@@ -42,7 +42,7 @@
#ifndef lint
static char copyright[] =
"$Id: dispatch.c,v 1.22 1996/09/02 21:15:17 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n";
"$Id: dispatch.c,v 1.23 1996/09/05 23:55:39 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -243,6 +243,11 @@ void discover_interfaces ()
memcpy (&foo, &tmp -> tif -> ifr_addr,
sizeof tmp -> tif -> ifr_addr);
/* We must have a subnet declaration for each interface. */
if (!tmp -> shared_network)
error ("No subnet declaration for %s (%s).",
tmp -> name, inet_ntoa (foo.sin_addr));
/* Find subnets that don't have valid interface
addresses... */
for (subnet = (tmp -> shared_network
@@ -250,9 +255,6 @@ void discover_interfaces ()
: (struct subnet *)0);
subnet; subnet = subnet -> next_sibling) {
if (!subnet -> interface_address.len) {
warn ("subnet %s attached to interface %s %s",
piaddr (subnet -> net), tmp -> name,
"but has no alias on that network.");
/* Set the interface address for this subnet
to the first address we found. */
subnet -> interface_address.len = 4;