summaryrefslogtreecommitdiff
path: root/ospfd
diff options
context:
space:
mode:
authorAndrew J. Schorr <ajschorr@alumni.princeton.edu>2007-04-30 16:52:05 +0000
committerAndrew J. Schorr <ajschorr@alumni.princeton.edu>2007-04-30 16:52:05 +0000
commitf0ec832a78549a85cf4e47d884036c1178f749d3 (patch)
tree6c3384cccf81993d69208f13145c33741abd7afc /ospfd
parenta857eb6be5b7f639e76fe3ef7711a3700abe20bc (diff)
[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.
Diffstat (limited to 'ospfd')
-rw-r--r--ospfd/ChangeLog7
-rw-r--r--ospfd/ospfd.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 610eadb1..d329bfaf 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 159422b4..80b97fab 100644
--- 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 &&