diff options
| author | Andrew J. Schorr <ajschorr@alumni.princeton.edu> | 2007-04-30 16:52:05 +0000 |
|---|---|---|
| committer | Andrew J. Schorr <ajschorr@alumni.princeton.edu> | 2007-04-30 16:52:05 +0000 |
| commit | f0ec832a78549a85cf4e47d884036c1178f749d3 (patch) | |
| tree | 6c3384cccf81993d69208f13145c33741abd7afc | |
| parent | a857eb6be5b7f639e76fe3ef7711a3700abe20bc (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.
| -rw-r--r-- | doc/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/ospfd.texi | 7 | ||||
| -rw-r--r-- | ospfd/ChangeLog | 7 | ||||
| -rw-r--r-- | ospfd/ospfd.c | 2 |
4 files changed, 21 insertions, 1 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index c84730c0..586852c6 100644 --- 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 bd53a692..f879a986 100644 --- 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 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 && |