[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.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index c84730c0a93afeec5200fee2bc7c70ce44e6e2c4..586852c6ea4b731bd1fcd71703132363591627b7 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -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.

diff --git a/doc/ospfd.texi b/doc/ospfd.texi
index bd53a69248db6187c53534141a3b231b08d02056..f879a9868f490d73db763800e149de6e1aed1c56 100644 (file)
--- a/doc/ospfd.texi
+++ b/doc/ospfd.texi
@@ -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

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 610eadb1336ddd8e26d7248f16322d21753260a0..d329bfafefe573cb86cf11ff6803a3073884d2d0 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -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

diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index 159422b47c6a1758c596470a000452df7ff47185..80b97fab9005acbe785e6d7a179b7c59ea999941 100644 (file)
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -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 &&