[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/ospfd/ChangeLog b/ospfd/ChangeLog
index 610eadb..d329bfa 100644
--- 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 159422b..80b97fa 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -799,7 +799,7 @@
 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 &&