NEWS, version and documentation update.

7 files changed, 38 insertions, 24 deletions

diff --git a/NEWS b/NEWS
index d1ce33c1..eb484936 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Version 1.2.0 (2010-01-05)
+  o Implements OSPFv3 (IPv6 support for OSPF). Because the code is
+    shared with OSPFv2 and there were deep changes in it, we suggest
+    caution during upgrade to OSPF users. Some advanced features
+    (like NSSA, vlinks and authentication) are not yet implemented.
+  o Implements MRTdump - binary logging protocol compatible with other
+    routing daemons. Only BGP part of MRTdump is yet implemented.
+  o Changes default value of BGP attribute LOCAL_PREF from 0 to 100.
+    Use 'default bgp_local_pref 0' BGP protocol option for the old
+    behavior. The new value is suggested by RFC 4277.
+  o Changes default mode of pipes from opaque to transparent.
+    Use 'mode opaque' protocol option if the old behavior is needed.
+    Opaque pipe mode is deprecated and might be removed in the future.
+
 Version 1.1.7 (2009-12-20)
   o Implements BGP Route Refresh (RFC 2918).
   o Implements route reload command.
diff --git a/README b/README
index 2ea2aae0..c363d7a5 100644
--- a/README
+++ b/README
@@ -63,7 +63,7 @@ What do we support:
 	o  Multiple routing tables
 	o  BGP
 	o  RIP
-	o  OSPF (IPv4 only)
+	o  OSPF
 	o  Static routes
 	o  Inter-table protocol
 	o  Command-line interface (using the `birdc' client; to get
@@ -77,7 +77,6 @@ What do we support:
 
 What is missing:
 
-	o  OSPF for IPv6
 	o  See the TODO list
 
 Good Luck and enjoy the BIRD :)
diff --git a/TODO b/TODO
index d5c10562..9b770c5b 100644
--- a/TODO
+++ b/TODO
@@ -49,5 +49,4 @@ OSPF
 	- RFC2370 opaque LSA's
 	- Limit export rate of external LSAs (like Gated does)
 	- Bugfix in link state retransmission list (aging)
-	- Rewrite the "dirty patch" in OSPF database (LSA_T_NET)
 	- Graceful OSPF restart - RFC3623
diff --git a/doc/bird.sgml b/doc/bird.sgml
index 0eb476d5..0131546b 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -78,7 +78,7 @@ protocols to be incorporated easily. Among other features, BIRD supports:
 	<item>multiple routing tables
 	<item>the Border Gateway Protocol (BGPv4)
 	<item>the Routing Information Protocol (RIPv2)
-	<item>the Open Shortest Path First protocol (OSPFv2)
+	<item>the Open Shortest Path First protocol (OSPFv2, OSPFv3)
 	<item>a virtual protocol for exchange of routes between different routing tables on a single host
 	<item>a command-line interface allowing on-line control and inspection
 		of status of the daemon
@@ -347,7 +347,7 @@ to zero to disable it. An empty <cf><m/switch/</cf> is equivalent to <cf/on/
 	Specifies a set of interfaces on which the protocol is activated with
 	given interface-specific options. A set of interfaces specified by one
 	interface option is described using an interface pattern. The
-	interface pattern consists of a sequence of clauses (separted by
+	interface pattern consists of a sequence of clauses (separated by
 	commas), each clause may contain a mask, a prefix, or both of them. An
 	interface matches the clause if its name matches the mask (if
 	specified) and its address matches the prefix (if specified). Mask is
@@ -508,7 +508,7 @@ This argument can be omitted if there exists only a single instance.
 	Reload configuration from a given file. BIRD will smoothly
 	switch itself to the new configuration, protocols are
 	reconfigured if possible, restarted otherwise. Changes in
-	filters usualy lead to restart of affected protocols. If
+	filters usually lead to restart of affected protocols. If
 	<cf/soft/ option is used, changes in filters does not cause
 	BIRD to restart affected protocols, therefore already accepted
 	routes (according to old filters) would be still propagated,
@@ -991,7 +991,7 @@ for each neighbor using the following configuration parameters:
 	received from its neighbor against the new filter. As these
 	routes might not be available, there is a BGP protocol
 	extension Route Refresh (specified in RFC 2918) that allows
-	BGP speaker to request re-advertisment of all routes from its
+	BGP speaker to request re-advertisement of all routes from its
 	neighbor. This option specifies whether BIRD advertises this
 	capability and accepts such requests. Even when disabled, BIRD
 	can send route refresh requests. Default: on.
@@ -1301,14 +1301,15 @@ protocol kernel {		# Secondary routing table
 <sect1>Introduction
 
 <p>Open Shortest Path First (OSPF) is a quite complex interior gateway
-protocol. The current IPv4 version (OSPFv2) is defined
-in RFC 2328<htmlurl url="ftp://ftp.rfc-editor.org/in-notes/rfc2328.txt">. It's a link
-state (a.k.a. shortest path first) protocol -- each router maintains a database
-describing the autonomous system's topology. Each participating router
-has an identical copy of the database and all routers run the same algorithm
-calculating a shortest path tree with themselves as a root.
-OSPF chooses the least cost path as the best path.
-(OSPFv3 - OSPF for IPv6 is not supported yet.)
+protocol. The current IPv4 version (OSPFv2) is defined in RFC
+2328<htmlurl url="ftp://ftp.rfc-editor.org/in-notes/rfc2328.txt"> and
+the current IPv6 version (OSPFv3) is defined in RFC 5340<htmlurl
+url="ftp://ftp.rfc-editor.org/in-notes/rfc5340.txt">  It's a link state
+(a.k.a. shortest path first) protocol -- each router maintains a
+database describing the autonomous system's topology. Each participating
+router has an identical copy of the database and all routers run the
+same algorithm calculating a shortest path tree with themselves as a
+root. OSPF chooses the least cost path as the best path.
 
 <p>In OSPF, the autonomous system can be split to several areas in order
 to reduce the amount of resources consumed for exchanging the routing
@@ -1421,7 +1422,7 @@ protocol ospf &lt;name&gt; {
 	 at periodical intervals of <m/num/ seconds. The default value is 1.
 
 	<tag>networks { <m/set/ }</tag>
-         Definition of area IP ranges. This is used in summary lsa origination.
+         Definition of area IP ranges. This is used in summary LSA origination.
 	 Hidden networks are not propagated into other areas.
 
 	<tag>stubnet <m/prefix/ { <m/options/ }</tag>
@@ -1525,7 +1526,7 @@ protocol ospf &lt;name&gt; {
 	<tag>authentication cryptographic</tag>
 	 16-byte long MD5 digest is appended to every packet. For the digest
          generation 16-byte long passwords are used. Those passwords are 
-         not sent via network, so this mechanismus is quite secure.
+         not sent via network, so this mechanism is quite secure.
          Packets can still be read by an attacker.
 
 	<tag>password "<M>text</M>"</tag>
@@ -1754,9 +1755,7 @@ not currently supported. RIPv4 MD5 authentication (RFC 2082<htmlurl url="ftp://f
 
 <p>RIP is a very simple protocol, and it has a lot of shortcomings. Slow
 convergence, big network load and inability to handle larger networks
-makes it pretty much obsolete in IPv4 world. (It is still usable on
-very small networks.) It is widely used in IPv6 networks,
-because there are no good implementations of OSPFv3.
+makes it pretty much obsolete. (It is still usable on very small networks.)
 
 <sect1>Configuration
 
@@ -1896,7 +1895,6 @@ there are still some features which would surely deserve to be
 implemented in future versions of BIRD:
 
 <itemize>
-<item>OSPF for IPv6 networks
 <item>OSPF NSSA areas and opaque LSA's
 <item>Route aggregation and flap dampening
 <item>Generation of IPv6 router advertisements
diff --git a/misc/bird.spec b/misc/bird.spec
index 7a15a0a5..30935c2d 100644
--- a/misc/bird.spec
+++ b/misc/bird.spec
@@ -1,6 +1,6 @@
 Summary: BIRD Internet Routing Daemon
 Name: bird
-Version: 1.1.7
+Version: 1.2.0
 Release: 1
 Copyright: GPL
 Group: Networking/Daemons
diff --git a/nest/mrtdump.h b/nest/mrtdump.h
index 8638804a..73932553 100644
--- a/nest/mrtdump.h
+++ b/nest/mrtdump.h
@@ -1,5 +1,5 @@
 /*
- *	BIRD -- Password handling
+ *	BIRD -- MRTdump handling
  *
  *
  *	Can be freely distributed and used under the terms of the GNU GPL.
@@ -13,8 +13,12 @@
 
 #define MRTDUMP_HDR_LENGTH	12
 
+/* MRTdump types */
+
 #define BGP4MP			16
 
+/* MRTdump subtypes */
+
 #define BGP4MP_MESSAGE		1
 #define BGP4MP_MESSAGE_AS4	4
 #define BGP4MP_STATE_CHANGE_AS4	5
diff --git a/sysdep/config.h b/sysdep/config.h
index 0e92a212..7b731999 100644
--- a/sysdep/config.h
+++ b/sysdep/config.h
@@ -7,7 +7,7 @@
 #define _BIRD_CONFIG_H_
 
 /* BIRD version */
-#define BIRD_VERSION "1.1.7"
+#define BIRD_VERSION "1.2.0"
 
 /* Include parameters determined by configure script */
 #include "sysdep/autoconf.h"