mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-03 15:56:00 +00:00
Code Issues Releases Wiki Activity

- Failover port configuration can now be left to defaults (port 647) as

Browse Source 
described in the -12 revision of the Failover draft (and assigned by
  IANA).  [ISC-Bugs #17738]
This commit is contained in:
David Hankins
2009-02-20 18:20:00 +00:00
parent 819186b746
commit d340bc24fc
4 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RELNOTES
View File

@@ -38,7 +38,9 @@ work on other platforms. Please report any problems and suggested fixes to
Changes since 4.1.0 (new features)
- Failover port configuration can now be left to defaults (port 647) as
described in the -12 revision of the Failover draft (and assigned by
IANA).
Changes since 4.1.0 (bug fixes)

10
includes/failover.h
View File

@@ -74,6 +74,16 @@ typedef struct {
# define DEFAULT_MAX_RESPONSE_DELAY 20
#endif
/*
* IANA has assigned ports 647 ("dhcp-failover") and 847 ("dhcp-failover2").
* Of these, only port 647 is mentioned in the -12 draft revision. We're not
* sure if they are supposed to indicate primary and secondary? No matter,
* we'll stick to the -12 draft revision level.
*/
#ifndef DEFAULT_FAILOVER_PORT
# define DEFAULT_FAILOVER_PORT 647
#endif
#define FM_OFFSET(x) (long)(&(((failover_message_t *)0) -> x))
/* All of the below definitions are mandated by draft-ietf-dhc-failover-12.

9
server/confpars.c
View File

@@ -1131,11 +1131,10 @@ void parse_failover_peer (cfile, group, type)
if (!peer -> partner.address)
parse_warn (cfile, "peer address may not be omitted");
/* XXX - when/if we get a port number assigned, just set as default */
if (!peer -> me.port)
parse_warn (cfile, "local port may not be omitted");
if (!peer -> partner.port)
parse_warn (cfile, "peer port may not be omitted");
if (!peer->me.port)
peer->me.port = DEFAULT_FAILOVER_PORT;
if (!peer->partner.port)
peer->partner.port = DEFAULT_FAILOVER_PORT;
if (peer -> i_am == primary) {
if (!peer -> hba) {

12
server/dhcpd.conf.5
View File

@@ -28,7 +28,7 @@
.\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see
.\" ``http://www.nominum.com''.
.\"
.\" $Id: dhcpd.conf.5,v 1.100 2009/01/22 21:22:42 dhankins Exp $
.\" $Id: dhcpd.conf.5,v 1.101 2009/02/20 18:20:00 dhankins Exp $
.\"
.TH dhcpd.conf 5
.SH NAME
@@ -595,8 +595,8 @@ statement
.PP
The \fBport\fR statement declares the TCP port on which the server
should listen for connections from its failover peer. This statement
may not currently be omitted, because the failover protocol does not
yet have a reserved TCP port number.
may be omitted, in which case the IANA assigned port number 647 will be
used by default.
.RE
.PP
The
@@ -608,10 +608,8 @@ statement
.PP
The \fBpeer port\fR statement declares the TCP port to which the
server should connect to reach its failover peer for failover
messages. This statement may not be omitted because the failover
protocol does not yet have a reserved TCP port number. The port
number declared in the \fBpeer port\fR statement may be the same as
the port number declared in the \fBport\fR statement.
messages. This statement may be omitted, in which case the IANA
assigned port number 647 will be used by default.
.RE
.PP
The