[ospfd] network command now behaves more logically when a peer prefix is defined

2007-04-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* ospfd/ospfd.c: (ospf_network_match_iface) Comment out
	  COMPATIBILITY_MODE.  Going forward, the ospf "network" command
	  will use a simple test: does the network command prefix
	  contain the connected (destination) prefix of the interface?
	* doc/ospfd.texi: Add a paragraph to the description of the OSPFv2
	  network command to explain how we handle interfaces with
	  peer addresses.
This commit is contained in:
Andrew J. Schorr 2007-04-30 16:52:05 +00:00
parent a857eb6be5
commit f0ec832a78
4 changed files with 21 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2007-04-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ospfd.texi: Add a paragraph to the description of the OSPFv2
network command to explain how we handle interfaces with
peer addresses.
2007-04-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* basic.texi: Document the new 'log timestamp precision' command.

View File

@ -232,6 +232,13 @@ Prefix length in interface must be equal or bigger (ie. smaller network) than
prefix length in network statement. For example statement above doesn't enable
ospf on interface with address 192.168.1.1/23, but it does on interface with
address 192.168.1.129/25.
Note that the behavior when there is a peer address
defined on an interface changed after release 0.99.7.
Currently, if a peer prefix has been configured,
then we test whether the prefix in the network command contains
the destination prefix. Otherwise, we test whether the network command prefix
contains the local address prefix of the interface.
@end deffn
@node OSPF area

View File

@ -1,3 +1,10 @@
2007-04-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ospfd.c: (ospf_network_match_iface) Comment out
COMPATIBILITY_MODE. Going forward, the ospf "network" command
will use a simple test: does the network command prefix
contain the connected (destination) prefix of the interface?
2007-04-21 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ospf_interface.c: (ospf_if_set_multicast) Fix bug: was testing

View File

@ -799,7 +799,7 @@ ospf_network_unset (struct ospf *ospf, struct prefix_ipv4 *p,
int
ospf_network_match_iface(struct connected *co, struct prefix *net)
{
#define COMPATIBILITY_MODE
/* #define COMPATIBILITY_MODE */
/* The old code used to have a special case for PtP interfaces:
if (if_is_pointopoint (co->ifp) && co->destination &&