From bms_fbsd at users.sourceforge.net  Fri Apr 16 16:36:02 2010
From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net)
Date: Fri, 16 Apr 2010 23:36:02 +0000
Subject: [Xorp-cvs] SF.net SVN: xorp:[11694] trunk/xorp/libxipc
Message-ID: <E1O2v4s-00088f-7L@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 11694
          http://xorp.svn.sourceforge.net/xorp/?rev=11694&view=rev
Author:   bms_fbsd
Date:     2010-04-16 23:36:01 +0000 (Fri, 16 Apr 2010)

Log Message:
-----------
Fix a critical race condition in XRL method lookup.

Introduce the use of Boost's weak_ptr<T>/shared_ptr<T> for managing
the lifecycle of XrlPFSender objects, which represent open XRL transports.

class Xrl now holds a boost::weak_ptr<XrlPFSender> for its cached, resolved
sender object. This fixes the issue where there was no way of
cleanly invalidating an existing XrlPFSender* transport pointer.

The method in XrlRouter which tries to find an existing RPC endpoint for
outgoing XRLs, has been renamed lookup_sender(), so as not to clash with
the hooks for batch XRL support (which are not currently used).

As most of the XORP code base is not yet thread or Boost aware, we
continue to use XrlPFSender* in most situations.

This change is cumulative with the auto_ptr<T> fix used in the XIF
client-side RPC stubs themselves; this is necessary to ensure the
weak_ptr<T> is private to each XIF client stub instantiation.

This change passes 'scons check' on FreeBSD 8-STABLE/amd64.

Reported by:	Ben Greear, Li Zhao

Modified Paths:
--------------
    trunk/xorp/libxipc/xrl.cc
    trunk/xorp/libxipc/xrl.hh
    trunk/xorp/libxipc/xrl_pf.cc
    trunk/xorp/libxipc/xrl_pf.hh
    trunk/xorp/libxipc/xrl_pf_factory.cc
    trunk/xorp/libxipc/xrl_pf_factory.hh
    trunk/xorp/libxipc/xrl_pf_stcp.cc
    trunk/xorp/libxipc/xrl_router.cc
    trunk/xorp/libxipc/xrl_router.hh

Modified: trunk/xorp/libxipc/xrl.cc
===================================================================
--- trunk/xorp/libxipc/xrl.cc	2010-03-25 13:12:31 UTC (rev 11693)
+++ trunk/xorp/libxipc/xrl.cc	2010-04-16 23:36:01 UTC (rev 11694)
@@ -76,7 +76,7 @@
 	 const XrlArgs&	args)
     : _protocol(protocol), _target(protocol_target), _command(command),
       _args(args), _sna_atom(NULL), _packed_bytes(0), _argp(&_args),
-      _to_finder(-1), _resolved(false), _resolved_sender(NULL)
+      _to_finder(-1), _resolved(false)
 {
 }
 
@@ -85,7 +85,7 @@
 	 const XrlArgs&	args)
     : _protocol(_finder_protocol), _target(target), _command(command),
       _args(args), _sna_atom(NULL), _packed_bytes(0), _argp(&_args),
-      _to_finder(-1), _resolved(false), _resolved_sender(NULL)
+      _to_finder(-1), _resolved(false)
 {
 }
 
@@ -94,7 +94,7 @@
 	 const string& command)
     : _protocol(protocol), _target(protocol_target), _command(command),
       _sna_atom(NULL), _packed_bytes(0), _argp(&_args), _to_finder(-1),
-      _resolved(false), _resolved_sender(NULL)
+      _resolved(false)
 {
 }
 
@@ -102,7 +102,7 @@
 	 const string& command)
     : _protocol(_finder_protocol), _target(target), _command(command),
       _sna_atom(NULL), _packed_bytes(0), _argp(&_args), _to_finder(-1),
-      _resolved(false), _resolved_sender(NULL)
+      _resolved(false)
 {
 }
 
@@ -110,13 +110,13 @@
 	 const char* command)
 	: _protocol(_finder_protocol), _target(target), _command(command),
 	  _sna_atom(NULL), _packed_bytes(0), _argp(&_args), _to_finder(-1),
-	  _resolved(false), _resolved_sender(NULL)
+	  _resolved(false)
 {
 }
 
 Xrl::Xrl(const char* c_str) throw (InvalidString) 
         : _sna_atom(NULL), _packed_bytes(0), _argp(&_args),
-	  _to_finder(-1), _resolved(false), _resolved_sender(NULL)
+	  _to_finder(-1), _resolved(false)
 {
     if (0 == c_str)
 	xorp_throw0(InvalidString);
@@ -136,7 +136,7 @@
 
 Xrl::Xrl() 
     : _sna_atom(0), _packed_bytes(0), _argp(&_args), _to_finder(-1),
-      _resolved(false), _resolved_sender(NULL) 
+      _resolved(false)
 {
 }
 
@@ -335,8 +335,9 @@
     _packed_bytes   = 0;
     _to_finder	    = -1;
     _resolved	    = false;
-    _resolved_sender = NULL;
 
+    _resolved_sender.reset();
+
     delete _sna_atom;
     _sna_atom = NULL;
 }

Modified: trunk/xorp/libxipc/xrl.hh
===================================================================
--- trunk/xorp/libxipc/xrl.hh	2010-03-25 13:12:31 UTC (rev 11693)
+++ trunk/xorp/libxipc/xrl.hh	2010-04-16 23:36:01 UTC (rev 11694)
@@ -26,11 +26,15 @@
 
 #include <string>
 
+#include <boost/weak_ptr.hpp>
+
 #include "libxorp/exceptions.hh"
 #include "xrl_atom.hh"
 #include "xrl_args.hh"
 #include "xrl_tokens.hh"
 
+using boost::weak_ptr;
+
 class XrlPFSender;
 
 /**
@@ -169,9 +173,14 @@
     bool resolved() const { return _resolved; }
     void set_resolved(bool r) const { _resolved = r; }
 
-    XrlPFSender *resolved_sender() const { return _resolved_sender; }
-    void set_resolved_sender(XrlPFSender *s) const { _resolved_sender = s; }
+    weak_ptr<XrlPFSender> resolved_sender() const {
+        return _resolved_sender;
+    }
 
+    void set_resolved_sender(weak_ptr<XrlPFSender> s) const {
+        _resolved_sender = s;
+    }
+
     void set_target(const char* target);
 
 private:
@@ -194,7 +203,7 @@
     mutable XrlArgs*		    _argp; // XXX shouldn't be mutable
     mutable int			    _to_finder;
     mutable bool		    _resolved; // XXX ditto
-    mutable XrlPFSender*	    _resolved_sender; // XXX ditto
+    mutable weak_ptr<XrlPFSender>   _resolved_sender; // XXX ditto
 
     static const string _finder_protocol;
 };

Modified: trunk/xorp/libxipc/xrl_pf.cc
===================================================================
--- trunk/xorp/libxipc/xrl_pf.cc	2010-03-25 13:12:31 UTC (rev 11693)
+++ trunk/xorp/libxipc/xrl_pf.cc	2010-04-16 23:36:01 UTC (rev 11694)
@@ -55,4 +55,5 @@
 
 XrlPFSender::~XrlPFSender()
 {
+    // XXX put a debug_msg() here; we are now deleted through shared_ptr.
 }

Modified: trunk/xorp/libxipc/xrl_pf.hh
===================================================================
--- trunk/xorp/libxipc/xrl_pf.hh	2010-03-25 13:12:31 UTC (rev 11693)
+++ trunk/xorp/libxipc/xrl_pf.hh	2010-04-16 23:36:01 UTC (rev 11694)
@@ -105,7 +105,15 @@
 
     virtual bool	sends_pending() const = 0;
     virtual const char*	protocol() const = 0;
+
+    /**
+     * Determine if the underlying transport is still open.
+     *
+     * @return true if the transport is alive.
+     */
     virtual bool	alive() const = 0;
+
+    // XXX Unfinished support for XRL batching.
     virtual void	batch_start() {}
     virtual void	batch_stop() {}
 

Modified: trunk/xorp/libxipc/xrl_pf_factory.cc
===================================================================
--- trunk/xorp/libxipc/xrl_pf_factory.cc	2010-03-25 13:12:31 UTC (rev 11693)
+++ trunk/xorp/libxipc/xrl_pf_factory.cc	2010-04-16 23:36:01 UTC (rev 11694)
@@ -33,12 +33,14 @@
 #include "xrl_pf_stcp.hh"
 #include "xrl_pf_unix.hh"
 
+//#include <boost/make_shared.hpp>
+//using boost::make_shared;
 
 // STCP senders are a special case.  Constructing an STCP sender has
 // real cost, unlike InProc and SUDP, so we maintain a cache of
 // STCP senders with one per sender destination address.
 
-XrlPFSender*
+shared_ptr<XrlPFSender>
 XrlPFSenderFactory::create_sender(EventLoop&	eventloop,
 				  const char*	protocol,
 				  const char*	address)
@@ -47,18 +49,22 @@
 	      protocol, address);
     try {
 	if (strcmp(XrlPFSTCPSender::protocol_name(), protocol) == 0) {
-	    return new XrlPFSTCPSender(eventloop, address);
+	    // XXX boost::make_shared() candidate.
+	    return shared_ptr<XrlPFSender>(
+		new XrlPFSTCPSender(eventloop, address));
 	}
 	if (strcmp(XrlPFUNIXSender::protocol_name(), protocol) == 0) {
-	    return new XrlPFUNIXSender(eventloop, address);
+	    // XXX boost::make_shared() candidate.
+	    return shared_ptr<XrlPFSender>(
+		new XrlPFUNIXSender(eventloop, address));
 	}
     } catch (XorpException& e) {
 	XLOG_ERROR("XrlPFSenderFactory::create failed: %s\n", e.str().c_str());
     }
-    return 0;
+    return shared_ptr<XrlPFSender>();
 }
 
-XrlPFSender*
+shared_ptr<XrlPFSender>
 XrlPFSenderFactory::create_sender(EventLoop& eventloop,
 				  const char* protocol_colon_address)
 {
@@ -66,7 +72,7 @@
     if (colon == 0) {
 	debug_msg("No colon in supposedly colon separated <protocol><address>"
 		  "combination\n\t\"%s\".\n", protocol_colon_address);
-	return 0;
+	return shared_ptr<XrlPFSender>();
     }
 
     string protocol(protocol_colon_address, colon - protocol_colon_address);
@@ -74,15 +80,6 @@
 }
 
 void
-XrlPFSenderFactory::destroy_sender(XrlPFSender* s)
-{
-    debug_msg("destroying sender pf = \"%s\", addr = \"%s\"\n",
-	      s->protocol(), s->address().c_str());
-
-    delete s;
-}
-
-void
 XrlPFSenderFactory::startup()
 {
 }

Modified: trunk/xorp/libxipc/xrl_pf_factory.hh
===================================================================
--- trunk/xorp/libxipc/xrl_pf_factory.hh	2010-03-25 13:12:31 UTC (rev 11693)
+++ trunk/xorp/libxipc/xrl_pf_factory.hh	2010-04-16 23:36:01 UTC (rev 11694)
@@ -27,19 +27,20 @@
 #include "xrl_error.hh"
 #include "xrl_pf.hh"
 
+#include <boost/shared_ptr.hpp>
+
+using boost::shared_ptr;
+
 class XrlPFSenderFactory {
 public:
     static void	 	startup();
     static void	 	shutdown();
 
-    static XrlPFSender* create_sender(EventLoop&	eventloop,
-				      const char*	proto_colon_addr);
+    static shared_ptr<XrlPFSender> create_sender(
+        EventLoop& eventloop, const char* proto_colon_addr);
 
-    static XrlPFSender* create_sender(EventLoop&	e,
-				      const char*	protocol,
-				      const char*	address);
-
-    static void		destroy_sender(XrlPFSender*	s);
+    static shared_ptr<XrlPFSender> create_sender(EventLoop& e,
+        const char* protocol, const char* address);
 };
 
 #endif // __LIBXIPC_XRL_PF_FACTORY_HH__

Modified: trunk/xorp/libxipc/xrl_pf_stcp.cc
===================================================================
--- trunk/xorp/libxipc/xrl_pf_stcp.cc	2010-03-25 13:12:31 UTC (rev 11693)
+++ trunk/xorp/libxipc/xrl_pf_stcp.cc	2010-04-16 23:36:01 UTC (rev 11694)
@@ -1083,12 +1083,17 @@
 void
 XrlPFSTCPSender::batch_start()
 {
+#if 0
     _batching = true;
+#else
+    XLOG_UNREACHABLE();
+#endif
 }
 
 void
 XrlPFSTCPSender::batch_stop()
 {
+#if 0
     _batching = false;
 
     // If we aint got no requests, we may not be able to signal to the receiver
@@ -1100,4 +1105,7 @@
 
     if (_writer->running() == false)
 	_writer->start();
+#else
+    XLOG_UNREACHABLE();
+#endif
 }

Modified: trunk/xorp/libxipc/xrl_router.cc
===================================================================
--- trunk/xorp/libxipc/xrl_router.cc	2010-03-25 13:12:31 UTC (rev 11693)
+++ trunk/xorp/libxipc/xrl_router.cc	2010-04-16 23:36:01 UTC (rev 11694)
@@ -38,6 +38,10 @@
 
 #include "sockutil.hh"
 
+// XXX should be included nested above.
+//#include <boost/shared_ptr.hpp>
+//#include <boost/weak_ptr.hpp>
+
 //
 // Enable this macro to enable Xrl callback checker that checks each Xrl
 // callback is dispatched just once.
@@ -273,10 +277,8 @@
     _fc->detach_observer(this);
     _fac->set_enabled(false);
 
-    while (_senders.empty() == false) {
-	XrlPFSenderFactory::destroy_sender(_senders.front());
+    while (_senders.empty() == false)
 	_senders.pop_front();
-    }
 
     while (_dsl.empty() == false) {
 	delete _dsl.front();
@@ -389,7 +391,8 @@
 			 bool  direct_call)
 {
     try {
-	XrlPFSender* s = get_sender(xrl, const_cast<FinderDBEntry*>(dbe));
+	shared_ptr<XrlPFSender> s =
+            lookup_sender(xrl, const_cast<FinderDBEntry*>(dbe));
 	if (s == 0) {
 	    // Notify Finder client that result was bad.
 	    _fc->uncache_result(dbe);
@@ -400,10 +403,11 @@
 
 	const Xrl& x = dbe->xrls().front();
     	x.set_args(xrl);
-	if (s) {
+	if (s != 0) {
 	    trace_xrl("Sending ", x);
 	    return s->send(x, direct_call,
-			   callback(this, &XrlRouter::send_callback, s, cb));
+			   callback(this, &XrlRouter::send_callback,
+                                    s.get(), cb));
 	}
 	cb->dispatch(XrlError(SEND_FAILED, "sender not instantiated"), 0);
     } catch (const InvalidString&) {
@@ -412,31 +416,47 @@
     return false;
 }
 
-XrlPFSender*
-XrlRouter::get_sender(const Xrl& xrl, FinderDBEntry* dbe)
+// XXX Return uninitialized shared_ptr, or locked shared_ptr,
+// on desired XrlPFSender.
+shared_ptr<XrlPFSender>
+XrlRouter::lookup_sender(const Xrl& xrl, FinderDBEntry* dbe)
 {
     const Xrl& x = dbe->xrls().front();
-    XrlPFSender* s = NULL;
+    shared_ptr<XrlPFSender> s;
 
-    // Use the cache pointer to the sender.
+    // Try to use the cached pointer to the sender.
     if (xrl.resolved()) {
-	s = xrl.resolved_sender();
+        weak_ptr<XrlPFSender> w = xrl.resolved_sender();
 
-	if (s->alive())
+        // Check if cached weak_ptr to sender is still valid; we may
+        // have lost a race on the XRLDB.
+        // Check if transport layer is still up for this sender.
+        // If good to go, return shared pointer for which we
+        // still hold the lock.
+        s = w.lock();
+        if (s.get() != 0 && s->alive())
 	    return s;
 
+        // We lost the race.
+
+        // XXX Sanity check that this sender's protocol and endpoint
+        // addresses are the same as they were when the Xrl was
+        // instantiated.
 	XLOG_ASSERT(s->protocol() == x.protocol());
 	XLOG_ASSERT(s->address()  == x.target());
 
 	xrl.set_resolved(false);
-	xrl.set_resolved_sender(NULL);
+	xrl.set_resolved_sender(weak_ptr<XrlPFSender>());
     }
 
     // Find a new sender.
-    for (list<XrlPFSender*>::iterator i = _senders.begin();
+    for (list< shared_ptr<XrlPFSender> >::iterator i = _senders.begin();
 	 i != _senders.end(); ++i) {
 	s = *i;
 
+	// This XrlRouter holds the reference, so the pointer should be valid.
+	XLOG_ASSERT(s.get() != 0);
+
 	if (s->protocol() != x.protocol() || s->address()  != x.target())
 	    continue;
 
@@ -448,13 +468,13 @@
 
 	XLOG_INFO("Sender died (protocol = \"%s\", address = \"%s\")",
 		  s->protocol(), s->address().c_str());
-	XrlPFSenderFactory::destroy_sender(s);
+
 	_senders.erase(i);
 	_senders2.erase(xrl.target());
 	break;
     }
 
-    s = NULL;
+    s.reset();
 
     // create sender
     while (dbe->xrls().size()) {
@@ -462,7 +482,7 @@
 
 	s = XrlPFSenderFactory::create_sender(_e, x.protocol().c_str(),
 					      x.target().c_str());
-	if (s)
+	if (s.get() != 0)
 	    break;
 
 	XLOG_ERROR("Could not create XrlPFSender for protocol = \"%s\" "
@@ -471,15 +491,18 @@
 
 	dbe->pop_front();
     }
-    if (!s)
-	return NULL;
 
+    // Unable to instantiate.
+    if (s == 0)
+	return shared_ptr<XrlPFSender>();
+
+    // New sender instantiated, take lock and record state.
     const Xrl& front = dbe->xrls().front();
 
     XLOG_ASSERT(s->protocol() == front.protocol());
     XLOG_ASSERT(s->address()  == front.target());
     _senders.push_back(s);
-    _senders2[xrl.target()] = s;
+    _senders2[xrl.target()] = s.get();
 
     // Don't do this here as it is set in the Xrl that is stored with
     // the finder client, so is not used. But if the connection needs
@@ -506,7 +529,7 @@
     if (e == XrlError::OKAY()) {
 	const Xrl& xrl = ds->xrl();
 	xrl.set_resolved(false);
-	xrl.set_resolved_sender(NULL);
+	xrl.set_resolved_sender(weak_ptr<XrlPFSender>());
 	if (send_resolved(xrl, dbe, ds->cb(), false) == false) {
 	    // We tried to force sender to send xrl and it declined the
 	    // opportunity.  This should only happen when it's out of buffer
@@ -710,25 +733,44 @@
     debug_msg("Finder target ready event: \"%s\"\n", tgt_name.c_str());
 }
 
+//
+// XXX This is unfinished code related to a batch XRL implementation.
+// It is unfortunately incompatible, straight off, with using refcounts to
+// manage XrlPFSender's lifecycle, so it needs to be revisited later by
+// an interested party.
+// Also, the overloading of the get_sender() method name is potentially
+// confusing. --bms
+
 void
 XrlRouter::batch_start(const string& target)
 {
+#if 0
     XrlPFSender& sender = get_sender(target);
 
     sender.batch_start();
+#else
+    XLOG_UNREACHABLE();
+    UNUSED(target);
+#endif
 }
 
 void
 XrlRouter::batch_stop(const string& target)
 {
+#if 0
     XrlPFSender& sender = get_sender(target);
 
     sender.batch_stop();
+#else
+    XLOG_UNREACHABLE();
+    UNUSED(target);
+#endif
 }
 
 XrlPFSender&
 XrlRouter::get_sender(const string& target)
 {
+#if 0
     XrlPFSender* s = 0;
 
     SENDERS::iterator i = _senders2.find(target);
@@ -737,6 +779,12 @@
     s = i->second;
 
     return *s;
+#else
+    XLOG_UNREACHABLE();
+    XrlPFSender* s = 0;
+    return *s;
+    UNUSED(target);
+#endif
 }
 
 

Modified: trunk/xorp/libxipc/xrl_router.hh
===================================================================
--- trunk/xorp/libxipc/xrl_router.hh	2010-03-25 13:12:31 UTC (rev 11693)
+++ trunk/xorp/libxipc/xrl_router.hh	2010-04-16 23:36:01 UTC (rev 11694)
@@ -34,7 +34,10 @@
 #include "finder_constants.hh"
 #include "finder_client_observer.hh"
 
+#include <boost/shared_ptr.hpp>
 
+using boost::shared_ptr;
+
 class DispatchState;
 
 class FinderClient;
@@ -190,6 +193,7 @@
 
     /**
      * Send callback (fast path).
+     * FIXME: use smart ptr.
      */
     void send_callback(const XrlError&	e,
 		       XrlArgs*		reply,
@@ -211,8 +215,9 @@
 		    uint16_t	finder_port);
 
 private:
+    // XXX
     XrlPFSender& get_sender(const string& target);
-    XrlPFSender* get_sender(const Xrl& xrl, FinderDBEntry *dbe);
+    shared_ptr<XrlPFSender> lookup_sender(const Xrl& xrl, FinderDBEntry *dbe);
 
 protected:
     EventLoop&			_e;
@@ -224,10 +229,12 @@
 
     list<XrlPFListener*>	_listeners;		// listeners
     list<XrlRouterDispatchState*> _dsl;			// dispatch state
-    list<XrlPFSender*>		_senders;		// active senders
+    list< shared_ptr<XrlPFSender> > _senders;		// active senders
 
     static uint32_t		_icnt;			// instance count
 
+    // XXX the following are mostly only used by the incomplete
+    // batch support. Stick to using unchecked pointers for now --bms
 private:
     typedef map<string, XI*>		XIM;
     typedef map<string, XrlPFSender*>	SENDERS;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From greear at users.sourceforge.net  Fri Apr 23 09:13:31 2010
From: greear at users.sourceforge.net (greear at users.sourceforge.net)
Date: Fri, 23 Apr 2010 16:13:31 +0000
Subject: [Xorp-cvs] SF.net SVN: xorp:[11695] trunk/xorp/xrl
Message-ID: <E1O5LVT-0003Zb-Lo@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11695
          http://xorp.svn.sourceforge.net/xorp/?rev=11695&view=rev
Author:   greear
Date:     2010-04-23 16:13:30 +0000 (Fri, 23 Apr 2010)

Log Message:
-----------
xif/tgt:  Fix parsing of xif and tgt files on Fedora 12

All methods and target statements must now end with a semi-colon instead
of depending on cpp to not overly change the white-space & newline.

Signed-off-by: Ben Greear <greearb at candelatech.com>

Modified Paths:
--------------
    trunk/xorp/xrl/interfaces/bgp.xif
    trunk/xorp/xrl/interfaces/bgp_mib_traps.xif
    trunk/xorp/xrl/interfaces/cli_manager.xif
    trunk/xorp/xrl/interfaces/cli_processor.xif
    trunk/xorp/xrl/interfaces/common.xif
    trunk/xorp/xrl/interfaces/coord.xif
    trunk/xorp/xrl/interfaces/datain.xif
    trunk/xorp/xrl/interfaces/fea_click.xif
    trunk/xorp/xrl/interfaces/fea_fib.xif
    trunk/xorp/xrl/interfaces/fea_fib_client.xif
    trunk/xorp/xrl/interfaces/fea_firewall.xif
    trunk/xorp/xrl/interfaces/fea_ifmgr.xif
    trunk/xorp/xrl/interfaces/fea_ifmgr_mirror.xif
    trunk/xorp/xrl/interfaces/fea_ifmgr_replicator.xif
    trunk/xorp/xrl/interfaces/fea_rawlink.xif
    trunk/xorp/xrl/interfaces/fea_rawlink_client.xif
    trunk/xorp/xrl/interfaces/fea_rawpkt4.xif
    trunk/xorp/xrl/interfaces/fea_rawpkt4_client.xif
    trunk/xorp/xrl/interfaces/fea_rawpkt6.xif
    trunk/xorp/xrl/interfaces/fea_rawpkt6_client.xif
    trunk/xorp/xrl/interfaces/fib2mrib.xif
    trunk/xorp/xrl/interfaces/finder.xif
    trunk/xorp/xrl/interfaces/finder_client.xif
    trunk/xorp/xrl/interfaces/finder_event_notifier.xif
    trunk/xorp/xrl/interfaces/finder_event_observer.xif
    trunk/xorp/xrl/interfaces/fti.xif
    trunk/xorp/xrl/interfaces/isis.xif
    trunk/xorp/xrl/interfaces/mfea.xif
    trunk/xorp/xrl/interfaces/mfea_client.xif
    trunk/xorp/xrl/interfaces/mld6igmp.xif
    trunk/xorp/xrl/interfaces/mld6igmp_client.xif
    trunk/xorp/xrl/interfaces/olsr4.xif
    trunk/xorp/xrl/interfaces/ospfv2.xif
    trunk/xorp/xrl/interfaces/ospfv3.xif
    trunk/xorp/xrl/interfaces/pim.xif
    trunk/xorp/xrl/interfaces/policy.xif
    trunk/xorp/xrl/interfaces/policy_backend.xif
    trunk/xorp/xrl/interfaces/policy_redist4.xif
    trunk/xorp/xrl/interfaces/policy_redist6.xif
    trunk/xorp/xrl/interfaces/profile.xif
    trunk/xorp/xrl/interfaces/profile_client.xif
    trunk/xorp/xrl/interfaces/redist4.xif
    trunk/xorp/xrl/interfaces/redist6.xif
    trunk/xorp/xrl/interfaces/redist_transaction4.xif
    trunk/xorp/xrl/interfaces/redist_transaction6.xif
    trunk/xorp/xrl/interfaces/rib.xif
    trunk/xorp/xrl/interfaces/rib_client.xif
    trunk/xorp/xrl/interfaces/rip.xif
    trunk/xorp/xrl/interfaces/ripng.xif
    trunk/xorp/xrl/interfaces/rtrmgr.xif
    trunk/xorp/xrl/interfaces/rtrmgr_client.xif
    trunk/xorp/xrl/interfaces/socket4.xif
    trunk/xorp/xrl/interfaces/socket4_user.xif
    trunk/xorp/xrl/interfaces/socket6.xif
    trunk/xorp/xrl/interfaces/socket6_user.xif
    trunk/xorp/xrl/interfaces/static_routes.xif
    trunk/xorp/xrl/interfaces/test.xif
    trunk/xorp/xrl/interfaces/test_peer.xif
    trunk/xorp/xrl/interfaces/test_xrls.xif
    trunk/xorp/xrl/interfaces/vrrp.xif
    trunk/xorp/xrl/scripts/Xif/parse.py
    trunk/xorp/xrl/scripts/tgt-gen
    trunk/xorp/xrl/targets/bgp.tgt
    trunk/xorp/xrl/targets/bgp4_mib.tgt
    trunk/xorp/xrl/targets/cli.tgt
    trunk/xorp/xrl/targets/coord.tgt
    trunk/xorp/xrl/targets/fea.tgt
    trunk/xorp/xrl/targets/fea_ifmgr_mirror.tgt
    trunk/xorp/xrl/targets/fib2mrib.tgt
    trunk/xorp/xrl/targets/finder.tgt
    trunk/xorp/xrl/targets/finder_client.tgt
    trunk/xorp/xrl/targets/mfea.tgt
    trunk/xorp/xrl/targets/mld6igmp.tgt
    trunk/xorp/xrl/targets/olsr4.tgt
    trunk/xorp/xrl/targets/ospfv2.tgt
    trunk/xorp/xrl/targets/ospfv3.tgt
    trunk/xorp/xrl/targets/pim.tgt
    trunk/xorp/xrl/targets/policy.tgt
    trunk/xorp/xrl/targets/profiler.tgt
    trunk/xorp/xrl/targets/rib.tgt
    trunk/xorp/xrl/targets/ribclient.tgt
    trunk/xorp/xrl/targets/rip.tgt
    trunk/xorp/xrl/targets/ripng.tgt
    trunk/xorp/xrl/targets/rtrmgr.tgt
    trunk/xorp/xrl/targets/show_distances.tgt
    trunk/xorp/xrl/targets/show_routes.tgt
    trunk/xorp/xrl/targets/static_routes.tgt
    trunk/xorp/xrl/targets/test.tgt
    trunk/xorp/xrl/targets/test_fea_ifmgr_mirror.tgt
    trunk/xorp/xrl/targets/test_fea_rawlink.tgt
    trunk/xorp/xrl/targets/test_finder_events.tgt
    trunk/xorp/xrl/targets/test_peer.tgt
    trunk/xorp/xrl/targets/test_socket4.tgt
    trunk/xorp/xrl/targets/test_socket6.tgt
    trunk/xorp/xrl/targets/test_xrls.tgt
    trunk/xorp/xrl/targets/vrrp.tgt
    trunk/xorp/xrl/targets/xorpsh.tgt

Modified: trunk/xorp/xrl/interfaces/bgp.xif
===================================================================
--- trunk/xorp/xrl/interfaces/bgp.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/bgp.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -7,7 +7,7 @@
 	/**
 	 *  Get the BGP version currently running.
 	 */
-	get_bgp_version -> version:u32
+	get_bgp_version -> version:u32;
 
 	/**
 	 * Get local config
@@ -20,7 +20,7 @@
 		? \
 		as:txt \
 		& id:ipv4 \
-		& use_4byte_asnums:bool
+		& use_4byte_asnums:bool;
 
 	/**
 	 * Set the local AS number.
@@ -28,7 +28,7 @@
 	 * @param as our AS number.
 	 */
 	
-	set_local_as ? as:txt
+	set_local_as ? as:txt;
 
 	/**
 	 * Allow 4-byte AS numbers.
@@ -36,12 +36,12 @@
 	 * @param enable whether this is enabled.
 	 */
 	
-	set_4byte_as_support ? enable:bool
+	set_4byte_as_support ? enable:bool;
 
 	/**
 	 *  Get the local AS number.
 	 */
-	get_local_as -> as:txt
+	get_local_as -> as:txt;
 
 	/**
          * Set the BGP id.
@@ -49,12 +49,12 @@
 	 * @param id our BGP ID.
 	 */
 
-	set_bgp_id ? id:ipv4
+	set_bgp_id ? id:ipv4;
 
 	/**
 	 *  Get the BGP id.
 	 */
-	get_bgp_id -> id:ipv4
+	get_bgp_id -> id:ipv4;
 
 	/**
 	 * Confederation identifier.
@@ -65,7 +65,7 @@
 	set_confederation_identifier \
 		? \
 		as:txt \
-		& disable:bool
+		& disable:bool;
 
 	/**
 	 * Route reflection.
@@ -76,7 +76,7 @@
 	set_cluster_id \
 		? \
 		cluster_id:ipv4 \
-		& disable:bool
+		& disable:bool;
 
 	/**
 	 * Route Flap Damping. RFC 2439
@@ -93,7 +93,7 @@
 		& max_suppress:u32 \
 		& reuse:u32 \
 		& suppress:u32 \
-	 	& disable:bool
+	 	& disable:bool;
 
 	/** 
 	 * Add peer.
@@ -115,7 +115,7 @@
 		& peer_port:u32 \
 		& as:txt \
 		& next_hop:ipv4 \
-	        & holdtime:u32
+	        & holdtime:u32;
 
 	/**
 	 * Delete peer.
@@ -130,7 +130,7 @@
 		local_ip:txt \
 	        & local_port:u32 \
 		& peer_ip:txt \
-		& peer_port:u32
+		& peer_port:u32;
 
 	/** 
 	 * Enable this peer.
@@ -145,7 +145,7 @@
 		local_ip:txt \
 	        & local_port:u32 \
 		& peer_ip:txt \
-		& peer_port:u32
+		& peer_port:u32;
 
 	/**
 	 * Disable this peer.
@@ -160,7 +160,7 @@
 		local_ip:txt \
 	        & local_port:u32 \
 		& peer_ip:txt \
-		& peer_port:u32
+		& peer_port:u32;
 
 	/**
 	 * Change the local IP address.
@@ -177,7 +177,7 @@
 	        & local_port:u32 \
 		& peer_ip:txt \
 		& peer_port:u32 \
-		& new_local_ip:txt
+		& new_local_ip:txt;
 
 	/**
 	 * Change the local port.
@@ -194,7 +194,7 @@
 	        & local_port:u32 \
 		& peer_ip:txt \
 		& peer_port:u32 \
-		& new_local_port:u32
+		& new_local_port:u32;
 
 	/**
 	 * Change the peer port.
@@ -211,7 +211,7 @@
 	        & local_port:u32 \
 		& peer_ip:txt \
 		& peer_port:u32 \
-		& new_peer_port:u32
+		& new_peer_port:u32;
 
 	/**
 	 * Set the peer's AS number.
@@ -228,7 +228,7 @@
 	        & local_port:u32 \
 		& peer_ip:txt \
 		& peer_port:u32 \
-		& peer_as:txt
+		& peer_as:txt;
 
 	/**
 	 * Set the holdtime
@@ -246,7 +246,7 @@
 	        & local_port:u32 \
 		& peer_ip:txt \
 		& peer_port:u32 \
-		& holdtime:u32
+		& holdtime:u32;
 
 	/**
 	 * Set the delay open time
@@ -264,7 +264,7 @@
 	        & local_port:u32 \
 		& peer_ip:txt \
 		& peer_port:u32 \
-		& delay_open_time:u32
+		& delay_open_time:u32;
 
 	/**
 	 * Set the route reflection client state. Is this peer a route
@@ -282,7 +282,7 @@
 	        & local_port:u32 \
 		& peer_ip:txt \
 		& peer_port:u32 \
-		& state:bool
+		& state:bool;
 		
 	/**
 	 * Is this peer a confederation member.
@@ -299,7 +299,7 @@
 	        & local_port:u32 \
 		& peer_ip:txt \
 		& peer_port:u32 \
-		& state:bool
+		& state:bool;
 
 	/**
 	 * Set the prefix limit.
@@ -318,7 +318,7 @@
 		& peer_ip:txt \
 		& peer_port:u32 \
 		& maximum:u32 \
-		& state:bool
+		& state:bool;
 
 	/**
 	 * Set the peer's AS number.
@@ -335,7 +335,7 @@
 	        & local_port:u32 \
 		& peer_ip:txt \
 		& peer_port:u32 \
-		& next_hop:ipv4
+		& next_hop:ipv4;
 
 	/**
 	 * Set the IPv6 nexthop.
@@ -352,7 +352,7 @@
 	        & local_port:u32 \
 		& peer_ip:txt \
 		& peer_port:u32 \
-		& next_hop:ipv6
+		& next_hop:ipv6;
 
 	/**
 	 * Get the IPv6 nexthop.
@@ -369,7 +369,7 @@
 	        & local_port:u32 \
 		& peer_ip:txt \
 		& peer_port:u32 \
-		-> next_hop:ipv6
+		-> next_hop:ipv6;
 
 	/**
          * Set the peer state enabled or disabled.
@@ -386,7 +386,7 @@
 	        & local_port:u32 \
 		& peer_ip:txt \
 		& peer_port:u32 \
-		& toggle:bool
+		& toggle:bool;
 
 	/**
 	 * Set the peer md5 password.
@@ -403,7 +403,7 @@
 		& local_port:u32 \
 		& peer_ip:txt \
 		& peer_port:u32 \
-		& password:txt
+		& password:txt;
 
 	/**
          * Enable or disable the peering based on the peer state.
@@ -418,7 +418,7 @@
 		local_ip:txt \
 	        & local_port:u32 \
 		& peer_ip:txt \
-		& peer_port:u32
+		& peer_port:u32;
 
 	/**
 	 * Set which parameters we support per peer
@@ -430,7 +430,7 @@
 		& peer_ip:txt \
 		& peer_port:u32 \
 		& parameter:txt \
-		& toggle:bool
+		& toggle:bool;
 
 	/**
 	 * Set next hop rewrite filter.
@@ -450,7 +450,7 @@
 	        & local_port:u32 \
 		& peer_ip:txt \
 		& peer_port:u32 \
-		& next_hop:ipv4
+		& next_hop:ipv4;
 
 	/**
 	 * Originate route IPv4
@@ -465,7 +465,7 @@
 		nlri:ipv4net \
 		& next_hop:ipv4 \
 		& unicast:bool \
-		& multicast:bool
+		& multicast:bool;
 
 	/**
 	 * Originate route IPv6
@@ -480,7 +480,7 @@
 		nlri:ipv6net \
 		& next_hop:ipv6 \
 		& unicast:bool \
-		& multicast:bool
+		& multicast:bool;
 
 	/**
 	 * Withdraw route IPv4
@@ -493,7 +493,7 @@
 		? \
 		nlri:ipv4net \
 		& unicast:bool \
-		& multicast:bool
+		& multicast:bool;
 
 	/**
 	 * Withdraw route IPv6
@@ -506,7 +506,7 @@
 		? \
 		nlri:ipv6net \
 		& unicast:bool \
-		& multicast:bool
+		& multicast:bool;
 
         /**
          * Enable/Disable tracing.
@@ -515,7 +515,7 @@
          * @param enable set to true to enable false to disable.
          */
          trace ? tvar:txt \
-	     & enable:bool
+	     & enable:bool;
 
 	/**
 	 * Get the first item of a list of BGP peers
@@ -528,7 +528,7 @@
 	 */	
 	get_peer_list_start -> \
 		token:u32 \
-		& more:bool 
+		& more:bool;
 
 	/**
 	 * Get the next item of a list of BGP peers
@@ -545,7 +545,7 @@
 		& local_port:u32 \
 		& peer_ip:txt \
 		& peer_port:u32 \
-		& more:bool
+		& more:bool;
 
          
 	get_peer_id \
@@ -555,7 +555,7 @@
 		& peer_ip:txt \
 		& peer_port:u32 \
 		-> \
-		peer_id:ipv4 
+		peer_id:ipv4; 
 
 	get_peer_status \
 		? \
@@ -565,7 +565,7 @@
 		& peer_port:u32 \
 		-> \
 		peer_state:u32 \
-		& admin_status:u32
+		& admin_status:u32;
 
 	get_peer_negotiated_version \
 		? \
@@ -574,7 +574,7 @@
 		& peer_ip:txt \
 		& peer_port:u32 \
 		-> \
-		neg_version:i32 
+		neg_version:i32;
 
 	get_peer_as \
 		? \
@@ -583,7 +583,7 @@
 		& peer_ip:txt \
 		& peer_port:u32 \
 		-> \
-		peer_as:txt 
+		peer_as:txt;
 
 	get_peer_msg_stats \
 		? \
@@ -597,7 +597,7 @@
 		& in_msgs:u32 \
 		& out_msgs:u32 \
 		& last_error:u32 \
-		& in_update_elapsed:u32
+		& in_update_elapsed:u32;
 
 	get_peer_established_stats \
 		? \
@@ -607,7 +607,7 @@
 		& peer_port:u32 \
 		-> \
 		transitions:u32 \
-		& established_time:u32 
+		& established_time:u32;
 
 
 	get_peer_timer_config \
@@ -623,7 +623,7 @@
 		& hold_time_conf:u32 \
 		& keep_alive_conf:u32 \
 		& min_as_orgination_interval:u32 \
-		& min_route_adv_interval:u32 
+		& min_route_adv_interval:u32;
 
 	/**
 	 * Register rib.
@@ -632,7 +632,7 @@
 	 */
 	register_rib \
 		? \
-		name:txt
+		name:txt;
 	/**
 	 * Get the first item of a list of BGP routes
 	 * See RFC 1657 (BGP MIB) for full definitions of return values.
@@ -653,7 +653,7 @@
 		& unicast:bool \
 		& multicast:bool \
 		-> \
-		token:u32
+		token:u32;
 
 	/**
 	 * Get the first item of a list of BGP routes
@@ -675,7 +675,7 @@
 		& unicast:bool \
 		& multicast:bool \
 		-> \
-		token:u32
+		token:u32;
 
 	/**
          * Get the next route in the list
@@ -698,7 +698,7 @@
 		& attr_unknown:binary \
 		& valid:bool \
 	        & unicast:bool \
-	        & multicast:bool
+	        & multicast:bool;
 
 	/**
          * Get the next route in the list
@@ -721,5 +721,5 @@
 		& attr_unknown:binary \
 		& valid:bool \
 	        & unicast:bool \
-	        & multicast:bool
+	        & multicast:bool;
 }

Modified: trunk/xorp/xrl/interfaces/bgp_mib_traps.xif
===================================================================
--- trunk/xorp/xrl/interfaces/bgp_mib_traps.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/bgp_mib_traps.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -11,7 +11,7 @@
 	send_bgp_established_trap \
 		? \
 		bgp_last_error:txt \
-		& bgp_state:u32
+		& bgp_state:u32;
 
 	/**
 	 * Send bgpBackwardTransition trap
@@ -19,5 +19,5 @@
         send_bgp_backward_transition_trap \
 		? \
 		bgp_last_error:txt \
-		& bgp_state:u32
+		& bgp_state:u32;
 }

Modified: trunk/xorp/xrl/interfaces/cli_manager.xif
===================================================================
--- trunk/xorp/xrl/interfaces/cli_manager.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/cli_manager.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -12,9 +12,9 @@
 	 * @param enable if true, then enable the CLI, otherwise
 	 * disable it.
 	 */
-	enable_cli	? enable:bool
-	start_cli
-	stop_cli
+	enable_cli	? enable:bool;
+	start_cli;
+	stop_cli;
 
 	/**
 	 * Add a subnet address to the list of subnet addresses enabled
@@ -24,8 +24,8 @@
 	 *
 	 * @param subnet_addr the subnet address to add.
 	 */
-	add_enable_cli_access_from_subnet4	? subnet_addr:ipv4net
-	add_enable_cli_access_from_subnet6	? subnet_addr:ipv6net
+	add_enable_cli_access_from_subnet4	? subnet_addr:ipv4net;
+	add_enable_cli_access_from_subnet6	? subnet_addr:ipv6net;
 
 	/**
 	 * Delete a subnet address from the list of subnet addresses enabled
@@ -33,8 +33,8 @@
 	 *
 	 * @param subnet_addr the subnet address to delete.
 	 */
-	delete_enable_cli_access_from_subnet4	? subnet_addr:ipv4net
-	delete_enable_cli_access_from_subnet6	? subnet_addr:ipv6net
+	delete_enable_cli_access_from_subnet4	? subnet_addr:ipv4net;
+	delete_enable_cli_access_from_subnet6	? subnet_addr:ipv6net;
 
 	/**
 	 * Add a subnet address to the list of subnet addresses disabled
@@ -44,8 +44,8 @@
 	 *
 	 * @param subnet_addr the subnet address to add.
 	 */
-	add_disable_cli_access_from_subnet4	? subnet_addr:ipv4net
-	add_disable_cli_access_from_subnet6	? subnet_addr:ipv6net
+	add_disable_cli_access_from_subnet4	? subnet_addr:ipv4net;
+	add_disable_cli_access_from_subnet6	? subnet_addr:ipv6net;
 
 	/**
 	 * Delete a subnet address from the list of subnet addresses disabled
@@ -53,8 +53,8 @@
 	 *
 	 * @param subnet_addr the subnet address to delete.
 	 */
-	delete_disable_cli_access_from_subnet4	? subnet_addr:ipv4net
-	delete_disable_cli_access_from_subnet6	? subnet_addr:ipv6net
+	delete_disable_cli_access_from_subnet4	? subnet_addr:ipv4net;
+	delete_disable_cli_access_from_subnet6	? subnet_addr:ipv6net;
 
 	/**
 	 * Add a CLI command to the CLI manager
@@ -76,7 +76,7 @@
 				& command_help:txt			\
 				& is_command_cd:bool			\
 				& command_cd_prompt:txt			\
-				& is_command_processor:bool
+				& is_command_processor:bool;
 
 	/**
 	 * Delete a CLI command from the CLI manager
@@ -84,11 +84,11 @@
 	 * @param processor_name the name of the module that sends the request.
 	 * @param command_name the name of the command to delete.
 	 */	
-	delete_cli_command	? processor_name:txt & command_name:txt
+	delete_cli_command	? processor_name:txt & command_name:txt;
 	
 	/*
 	 * TODO: do we want 'add_cli_commands_done' to indicate
 	 * end-of-adding?
 	 */
-	/* add_cli_commands_done ? processor_name:txt */
+	/* add_cli_commands_done ? processor_name:txt;*/
 }

Modified: trunk/xorp/xrl/interfaces/cli_processor.xif
===================================================================
--- trunk/xorp/xrl/interfaces/cli_processor.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/cli_processor.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -29,5 +29,5 @@
 			-> ret_processor_name:txt			\
 			& ret_cli_term_name:txt				\
 			& ret_cli_session_id:u32			\
-			& ret_command_output:txt
+			& ret_command_output:txt;
 }

Modified: trunk/xorp/xrl/interfaces/common.xif
===================================================================
--- trunk/xorp/xrl/interfaces/common.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/common.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -7,14 +7,14 @@
 
 interface common/0.1 {
 	/** Get name of Xrl Target */
-	get_target_name	-> name:txt
+	get_target_name	-> name:txt;
 
 	/** Get version string from Xrl Target */
-	get_version	-> version:txt
+	get_version	-> version:txt;
 
 	/** Get status of Xrl Target */
-	get_status	-> status:u32 & reason:txt
+	get_status	-> status:u32 & reason:txt;
 
 	/** Request clean shutdown of Xrl Target */
-	shutdown
+	shutdown;
 }

Modified: trunk/xorp/xrl/interfaces/coord.xif
===================================================================
--- trunk/xorp/xrl/interfaces/coord.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/coord.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -10,18 +10,18 @@
 	 *
 	 * @param command to be sent to the coordinator.
 	 */
-	command ? command:txt
+	command ? command:txt;
 
 	/**
 	 * Status, show the state of this peer.
 	 *
 	 */
-	status ? peer:txt -> status:txt
+	status ? peer:txt -> status:txt;
 
 	/**
 	 * If there are still any outstanding commands pending will return
 	 * true. Can be used to poll the coordinating process to verify that
 	 * the previous command has completed.
 	 */
-	pending -> pending:bool
+	pending -> pending:bool;
 }

Modified: trunk/xorp/xrl/interfaces/datain.xif
===================================================================
--- trunk/xorp/xrl/interfaces/datain.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/datain.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -16,7 +16,7 @@
 	 * @param micro. Time that the message was received in microseconds.
 	 * @param data.
 	 */
-	receive ? peer:txt & genid:u32 & status:bool & secs:u32 & micro:u32 & data:binary
+	receive ? peer:txt & genid:u32 & status:bool & secs:u32 & micro:u32 & data:binary;
 
 	/*
 	 * Error. There has been an error on the endpoint.
@@ -25,7 +25,7 @@
 	 * @param genid. The generation id.
 	 * @param reason. The error message
 	 */
-	error ? peer:txt & genid:u32 & reason:txt
+	error ? peer:txt & genid:u32 & reason:txt;
 
 	/*
 	 * Closed. The endpointed has been closed.
@@ -33,5 +33,5 @@
 	 * @param peer. The peers router name.
 	 * @param genid. The generation id.
 	 */
-	closed ? peer:txt & genid:u32
+	closed ? peer:txt & genid:u32;
 }

Modified: trunk/xorp/xrl/interfaces/fea_click.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_click.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_click.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -9,12 +9,12 @@
 	/**
 	 * Load Click FEA support.
 	 */
-	load_click
+	load_click;
 
 	/**
 	 * Unload Click FEA support.
 	 */
-	unload_click
+	unload_click;
 
 	/**
 	 * Enable/disable Click FEA support.
@@ -22,17 +22,17 @@
 	 * @param enable if true, then enable the Click FEA support,
 	 * otherwise disable it.
 	 */
-	enable_click	? enable:bool
+	enable_click	? enable:bool;
 
 	/**
 	 * Start Click FEA support.
 	 */
-	start_click
+	start_click;
 
 	/**
 	 * Stop Click FEA support.
 	 */
-	stop_click
+	stop_click;
 
 	/**
 	 * Enable/disable duplicating the Click routes to the system kernel.
@@ -40,7 +40,7 @@
 	 * @param enable if true, then enable duplicating the Click routes
 	 * to the system kernel, otherwise disable it.
 	 */
-	enable_duplicate_routes_to_kernel		? enable:bool
+	enable_duplicate_routes_to_kernel		? enable:bool;
 
 	/**
 	 * Enable/disable kernel-level Click FEA support.
@@ -48,14 +48,14 @@
 	 * @param enable if true, then enable the kernel-level Click FEA
 	 * support, otherwise disable it.
 	 */
-	enable_kernel_click			? enable:bool
+	enable_kernel_click			? enable:bool;
 
 	/**
 	 * Enable/disable installing kernel-level Click on startup.
 	 *
 	 * @param enable if true, then install kernel-level Click on startup.
 	 */
-	enable_kernel_click_install_on_startup	? enable:bool
+	enable_kernel_click_install_on_startup	? enable:bool;
 
 	/**
 	 * Specify the list of kernel Click modules to load on startup
@@ -65,14 +65,14 @@
 	 * @param modules the list of kernel Click modules (separated by
 	 * colon) to load.
 	 */
-	set_kernel_click_modules		? modules:txt
+	set_kernel_click_modules		? modules:txt;
 
 	/**
 	 * Specify the kernel-level Click mount directory.
 	 *
 	 * @param directory the kernel-level Click mount directory.
 	 */
-	set_kernel_click_mount_directory	? directory:txt
+	set_kernel_click_mount_directory	? directory:txt;
 
 	/**
 	 * Specify the external program to generate the kernel-level Click
@@ -81,7 +81,7 @@
 	 * @param kernel_click_config_generator_file the name of the external
 	 * program to generate the kernel-level Click configuration.
 	 */
-	set_kernel_click_config_generator_file	? kernel_click_config_generator_file:txt
+	set_kernel_click_config_generator_file	? kernel_click_config_generator_file:txt;
 
 	/**
 	 * Enable/disable user-level Click FEA support.
@@ -89,7 +89,7 @@
 	 * @param enable if true, then enable the user-level Click FEA
 	 * support, otherwise disable it.
 	 */
-	enable_user_click			? enable:bool
+	enable_user_click			? enable:bool;
 
 	/**
 	 * Specify the user-level Click command file.
@@ -97,7 +97,7 @@
 	 * @param user_click_command_file the name of the user-level Click
 	 * command file.
 	 */
-	set_user_click_command_file	? user_click_command_file:txt
+	set_user_click_command_file	? user_click_command_file:txt;
 
 	/**
 	 * Specify the extra arguments to the user-level Click command.
@@ -106,7 +106,7 @@
 	 * to the user-level Click command.
 	 */
 	set_user_click_command_extra_arguments		?		\
-					 user_click_command_extra_arguments:txt
+					 user_click_command_extra_arguments:txt;
 
 	/**
 	 * Specify whether to execute on startup the user-level Click command.
@@ -115,7 +115,7 @@
 	 * the user-level Click command on startup.
 	 */
 	set_user_click_command_execute_on_startup	?		\
-				 user_click_command_execute_on_startup:bool
+				 user_click_command_execute_on_startup:bool;
 
 	/**
 	 * Specify the address to use for control access to the
@@ -125,7 +125,7 @@
 	 * control access to the user-level Click.
 	 */
 	set_user_click_control_address			?		\
-				 user_click_control_address:ipv4
+				 user_click_control_address:ipv4;
 
 	/**
 	 * Specify the socket port to use for control access to the
@@ -135,7 +135,7 @@
 	 * control access to the user-level Click.
 	 */
 	set_user_click_control_socket_port		?		\
-				 user_click_control_socket_port:u32
+				 user_click_control_socket_port:u32;
 
 	/**
 	 * Specify the configuration file to be used by user-level Click
@@ -145,7 +145,7 @@
 	 * configuration file to be used by user-level Click on startup.
 	 */
 	set_user_click_startup_config_file		?		\
-				user_click_startup_config_file:txt
+				user_click_startup_config_file:txt;
 
 	/**
 	 * Specify the external program to generate the user-level Click
@@ -154,5 +154,5 @@
 	 * @param user_click_config_generator_file the name of the external
 	 * program to generate the user-level Click configuration.
 	 */
-	set_user_click_config_generator_file	? user_click_config_generator_file:txt
+	set_user_click_config_generator_file	? user_click_config_generator_file:txt;
 }

Modified: trunk/xorp/xrl/interfaces/fea_fib.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_fib.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_fib.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -14,16 +14,16 @@
 	 */
 	add_fib_client4		? client_target_name:txt	\
 				& send_updates:bool		\
-				& send_resolves:bool
+				& send_resolves:bool;
 	add_fib_client6		? client_target_name:txt	\
 				& send_updates:bool		\
-				& send_resolves:bool
+				& send_resolves:bool;
 	/**
 	 * Delete a FIB client.
 	 *
 	 * @param client_target_name the target name of the FIB client to
 	 * delete.
 	 */
-	delete_fib_client4	? client_target_name:txt
-	delete_fib_client6	? client_target_name:txt
+	delete_fib_client4	? client_target_name:txt;
+	delete_fib_client6	? client_target_name:txt;
 }

Modified: trunk/xorp/xrl/interfaces/fea_fib_client.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_fib_client.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_fib_client.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -24,10 +24,10 @@
 	 */
 	add_route4	? network:ipv4net & nexthop:ipv4 & ifname:txt	\
 			& vifname:txt & metric:u32 & admin_distance:u32	\
-			& protocol_origin:txt & xorp_route:bool
+			& protocol_origin:txt & xorp_route:bool;
 	add_route6	? network:ipv6net & nexthop:ipv6 & ifname:txt	\
 			& vifname:txt & metric:u32 & admin_distance:u32	\
-			& protocol_origin:txt & xorp_route:bool
+			& protocol_origin:txt & xorp_route:bool;
 
 	/**
 	 * Notification of a route being replaced.
@@ -48,10 +48,10 @@
 	 */
 	replace_route4	? network:ipv4net & nexthop:ipv4 & ifname:txt	\
 			& vifname:txt & metric:u32 & admin_distance:u32	\
-			& protocol_origin:txt & xorp_route:bool
+			& protocol_origin:txt & xorp_route:bool;
 	replace_route6	? network:ipv6net & nexthop:ipv6 & ifname:txt	\
 			& vifname:txt & metric:u32 & admin_distance:u32	\
-			& protocol_origin:txt & xorp_route:bool
+			& protocol_origin:txt & xorp_route:bool;
 
 	/**
 	 * Notification of a route being deleted.
@@ -62,8 +62,8 @@
 	 * @param vifname the name of the virtual interface toward the
 	 * destination.
 	 */
-	delete_route4	? network:ipv4net & ifname:txt & vifname: txt
-	delete_route6	? network:ipv6net & ifname:txt & vifname: txt
+	delete_route4	? network:ipv4net & ifname:txt & vifname: txt;
+	delete_route6	? network:ipv6net & ifname:txt & vifname: txt;
 
 	/**
 	 * Notification of a route resolution request. This is issued
@@ -74,6 +74,6 @@
 	 * forwarding plane requires a route to be resolved by the
 	 * upper layer.
 	 */
-	resolve_route4	? network:ipv4net
-	resolve_route6	? network:ipv6net
+	resolve_route4	? network:ipv4net;
+	resolve_route6	? network:ipv6net;
 }

Modified: trunk/xorp/xrl/interfaces/fea_firewall.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_firewall.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_firewall.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -10,21 +10,21 @@
 	 *
 	 * @param tid the transaction ID returned by this operation.
 	 */
-	start_transaction -> tid:u32
+	start_transaction -> tid:u32;
 
 	/**
 	 * Commit firewall configuration transaction.
 	 *
 	 * @param tid the transaction ID for this operation.
 	 */
-	commit_transaction ? tid:u32
+	commit_transaction ? tid:u32;
 
 	/**
 	 * Abort firewall configuration transaction.
 	 *
 	 * @param tid the transaction ID for this operation.
 	 */
-	abort_transaction ? tid:u32
+	abort_transaction ? tid:u32;
 
 	/**
 	 * Add an IPv4 firewall entry.
@@ -58,7 +58,7 @@
 			& src_port_end:u32				\
 			& dst_port_begin:u32				\
 			& dst_port_end:u32				\
-			& action:txt
+			& action:txt;
 
 	/**
 	 * Replace an IPv4 firewall entry.
@@ -92,7 +92,7 @@
 			& src_port_end:u32				\
 			& dst_port_begin:u32				\
 			& dst_port_end:u32				\
-			& action:txt
+			& action:txt;
 
 	/**
 	 * Delete an IPv4 firewall entry.
@@ -122,14 +122,14 @@
 			& src_port_begin:u32				\
 			& src_port_end:u32				\
 			& dst_port_begin:u32				\
-			& dst_port_end:u32
+			& dst_port_end:u32;
 
 	/**
 	 * Delete all IPv4 firewall entries.
 	 *
 	 * @param tid the transaction ID for this operation.
 	 */
-	delete_all_entries4 ? tid:u32
+	delete_all_entries4 ? tid:u32;
 
 	/**
 	 * Get a token for a list of IPv4 firewall entries.
@@ -137,7 +137,7 @@
 	 * @param token to be provided when calling get_entry_list_next4.
 	 * @param more true if the list is not empty.
 	 */
-	get_entry_list_start4 -> token:u32 & more:bool
+	get_entry_list_start4 -> token:u32 & more:bool;
 
 	/**
 	 * Get the next item in a list of IPv4 firewall entries.
@@ -171,7 +171,7 @@
 				& dst_port_begin:u32			\
 				& dst_port_end:u32			\
 				& action:txt				\
-				& more:bool
+				& more:bool;
 
 	/**
 	 * Add an IPv6 firewall entry.
@@ -205,7 +205,7 @@
 			& src_port_end:u32				\
 			& dst_port_begin:u32				\
 			& dst_port_end:u32				\
-			& action:txt
+			& action:txt;
 
 	/**
 	 * Replace an IPv6 firewall entry.
@@ -239,7 +239,7 @@
 			& src_port_end:u32				\
 			& dst_port_begin:u32				\
 			& dst_port_end:u32				\
-			& action:txt
+			& action:txt;
 
 	/**
 	 * Delete an IPv6 firewall entry.
@@ -269,14 +269,14 @@
 			& src_port_begin:u32				\
 			& src_port_end:u32				\
 			& dst_port_begin:u32				\
-			& dst_port_end:u32
+			& dst_port_end:u32;
 
 	/**
 	 * Delete all IPv6 firewall entries.
 	 *
 	 * @param tid the transaction ID for this operation.
 	 */
-	delete_all_entries6 ? tid:u32
+	delete_all_entries6 ? tid:u32;
 
 	/**
 	 * Get a token for a list of IPv6 firewall entries.
@@ -284,7 +284,7 @@
 	 * @param token to be provided when calling get_entry_list_next6.
 	 * @param more true if the list is not empty.
 	 */
-	get_entry_list_start6 -> token:u32 & more:bool
+	get_entry_list_start6 -> token:u32 & more:bool;
 
 	/**
 	 * Get the next item in a list of IPv6 firewall entries.
@@ -318,5 +318,5 @@
 				& dst_port_begin:u32			\
 				& dst_port_end:u32			\
 				& action:txt				\
-				& more:bool
+				& more:bool;
 }

Modified: trunk/xorp/xrl/interfaces/fea_ifmgr.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_ifmgr.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_ifmgr.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -5,11 +5,11 @@
  */
 
 interface ifmgr/0.1 {
-	set_restore_original_config_on_shutdown ? enable:bool
+	set_restore_original_config_on_shutdown ? enable:bool;
 
-	get_configured_interface_names -> ifnames:list<txt>
+	get_configured_interface_names -> ifnames:list<txt>;
 
-	get_configured_vif_names ? ifname:txt -> vifs:list<txt>
+	get_configured_vif_names ? ifname:txt -> vifs:list<txt>;
 
 	get_configured_vif_flags ? ifname:txt				\
 				& vif:txt				\
@@ -17,17 +17,17 @@
 				& broadcast:bool			\
 				& loopback:bool				\
 				& point_to_point:bool			\
-				& multicast:bool
+				& multicast:bool;
 
 	get_configured_vif_pif_index	? ifname:txt			\
 					& vif:txt			\
-					-> pif_index:u32
+					-> pif_index:u32;
 
 	get_configured_vif_addresses4 ? ifname:txt & vif:txt \
-				      -> addresses:list<ipv4>
+				      -> addresses:list<ipv4>;
 
 	get_configured_vif_addresses6 ? ifname:txt & vif:txt \
-				      -> addresses:list<ipv4>
+				      -> addresses:list<ipv4>;
 
 	get_configured_address_flags4	? ifname:txt			\
 					& vif:txt			\
@@ -36,7 +36,7 @@
 					& broadcast:bool		\
 					& loopback:bool			\
 					& point_to_point:bool		\
-					& multicast:bool
+					& multicast:bool;
 
 	get_configured_address_flags6	? ifname:txt			\
 					& vif:txt			\
@@ -44,51 +44,51 @@
 					-> enabled:bool			\
 					& loopback:bool			\
 					& point_to_point:bool		\
-					& multicast:bool
+					& multicast:bool;
 
-	get_configured_interface_enabled ? ifname:txt -> enabled:bool
+	get_configured_interface_enabled ? ifname:txt -> enabled:bool;
 
-	get_configured_interface_discard ? ifname:txt -> discard:bool
+	get_configured_interface_discard ? ifname:txt -> discard:bool;
 
-	get_configured_interface_unreachable ? ifname:txt -> unreachable:bool
+	get_configured_interface_unreachable ? ifname:txt -> unreachable:bool;
 
-	get_configured_interface_management ? ifname:txt -> management:bool
+	get_configured_interface_management ? ifname:txt -> management:bool;
 
-	get_configured_mac ? ifname:txt -> mac:mac
+	get_configured_mac ? ifname:txt -> mac:mac;
 
-	get_configured_mtu ? ifname:txt -> mtu:u32
+	get_configured_mtu ? ifname:txt -> mtu:u32;
 
-	get_configured_no_carrier ? ifname:txt -> no_carrier:bool
+	get_configured_no_carrier ? ifname:txt -> no_carrier:bool;
 
-	get_configured_baudrate ? ifname:txt -> baudrate:u64
+	get_configured_baudrate ? ifname:txt -> baudrate:u64;
 
-	get_configured_vif_enabled ? ifname:txt & vif:txt -> enabled:bool
+	get_configured_vif_enabled ? ifname:txt & vif:txt -> enabled:bool;
 
 
 	get_configured_prefix4 ? ifname:txt & vif:txt & address:ipv4	\
-			-> prefix_len:u32
+			-> prefix_len:u32;
 
 	get_configured_broadcast4 ? ifname:txt & vif:txt & address:ipv4	\
-			-> broadcast:ipv4
+			-> broadcast:ipv4;
 
 	get_configured_endpoint4 ? ifname:txt & vif:txt & address:ipv4	\
-			-> endpoint:ipv4
+			-> endpoint:ipv4;
 
 	get_configured_prefix6 ? ifname:txt & vif:txt & address:ipv6	\
-			-> prefix_len:u32
+			-> prefix_len:u32;
 
 	get_configured_endpoint6 ? ifname:txt & vif:txt & address:ipv6	\
-			-> endpoint:ipv6
+			-> endpoint:ipv6;
 
-	start_transaction -> tid:u32
+	start_transaction -> tid:u32;
 
-	commit_transaction ? tid:u32
+	commit_transaction ? tid:u32;
 
-	abort_transaction ? tid:u32
+	abort_transaction ? tid:u32;
 
-	create_interface ? tid:u32 & ifname:txt
+	create_interface ? tid:u32 & ifname:txt;
 
-	delete_interface ? tid:u32 & ifname:txt
+	delete_interface ? tid:u32 & ifname:txt;
 
 	/**
 	 * Implicitly configure all interfaces within the FEA by using
@@ -98,7 +98,7 @@
 	 * @param enable if true, then enable the implicit configuration,
 	 * otherwise disable it.
 	 */
-	configure_all_interfaces_from_system ? tid:u32 & enable:bool
+	configure_all_interfaces_from_system ? tid:u32 & enable:bool;
 
 	/**
 	 * Implicitly configure an interface within the FEA by using
@@ -109,27 +109,27 @@
 	 * @param enable if true, then enable the implicit configuration,
 	 * otherwise disable it.
 	 */
-	configure_interface_from_system ? tid:u32 & ifname:txt & enable:bool
+	configure_interface_from_system ? tid:u32 & ifname:txt & enable:bool;
 
-	set_interface_enabled ? tid:u32 & ifname:txt & enabled:bool
+	set_interface_enabled ? tid:u32 & ifname:txt & enabled:bool;
 
-	set_interface_discard ? tid:u32 & ifname:txt & discard:bool
+	set_interface_discard ? tid:u32 & ifname:txt & discard:bool;
 
-	set_interface_unreachable ? tid:u32 & ifname:txt & unreachable:bool
+	set_interface_unreachable ? tid:u32 & ifname:txt & unreachable:bool;
 
-	set_interface_management ? tid:u32 & ifname:txt & management:bool
+	set_interface_management ? tid:u32 & ifname:txt & management:bool;
 
-	set_mac ? tid:u32 & ifname:txt & mac:mac
+	set_mac ? tid:u32 & ifname:txt & mac:mac;
 
-	create_mac ? ifname:txt & mac:mac
+	create_mac ? ifname:txt & mac:mac;
 
-	delete_mac ? ifname:txt & mac:mac
+	delete_mac ? ifname:txt & mac:mac;
 
-	restore_original_mac ? tid:u32 & ifname:txt
+	restore_original_mac ? tid:u32 & ifname:txt;
 
-	set_mtu ? tid:u32 & ifname:txt & mtu:u32
+	set_mtu ? tid:u32 & ifname:txt & mtu:u32;
 
-	restore_original_mtu ? tid:u32 & ifname:txt
+	restore_original_mtu ? tid:u32 & ifname:txt;
 
 	/**
 	 * Create a vif.
@@ -139,11 +139,11 @@
 	 * @param vif name for new vif, must be unique across all the
 	 *               vifs in the system.
 	 */
-	create_vif ? tid:u32 & ifname:txt & vif:txt
+	create_vif ? tid:u32 & ifname:txt & vif:txt;
 
-	delete_vif ? tid:u32 & ifname:txt & vif:txt
+	delete_vif ? tid:u32 & ifname:txt & vif:txt;
 
-	set_vif_enabled ? tid:u32 & ifname:txt & vif:txt & enabled:bool
+	set_vif_enabled ? tid:u32 & ifname:txt & vif:txt & enabled:bool;
 
 	/**
 	 * Set VLAN vif.
@@ -153,65 +153,65 @@
 	 * @param vif the name of the VLAN.
 	 * @param vlan_id the VLAN ID. It must be in the range 0 through 4095.
 	 */
-	set_vif_vlan ? tid:u32 & ifname:txt & vif:txt & vlan_id:u32
+	set_vif_vlan ? tid:u32 & ifname:txt & vif:txt & vlan_id:u32;
 
-	create_address4 ? tid:u32 & ifname:txt & vif:txt & address:ipv4
+	create_address4 ? tid:u32 & ifname:txt & vif:txt & address:ipv4;
 
-	delete_address4 ? tid:u32 & ifname:txt & vif:txt & address:ipv4
+	delete_address4 ? tid:u32 & ifname:txt & vif:txt & address:ipv4;
 
 	set_address_enabled4	? tid:u32				\
 				& ifname:txt				\
 				& vif:txt				\
 				& address:ipv4				\
-				& enabled:bool
+				& enabled:bool;
 
 	get_configured_address_enabled4	? ifname:txt			\
 					& vif:txt			\
 					& address:ipv4			\
-					-> enabled:bool
+					-> enabled:bool;
 
 	set_prefix4		? tid:u32				\
 				& ifname:txt				\
 				& vif:txt				\
 				& address:ipv4				\
-				& prefix_len:u32
+				& prefix_len:u32;
 
 	set_broadcast4		? tid:u32				\
 				& ifname:txt				\
 				& vif:txt				\
 				& address:ipv4				\
-				& broadcast:ipv4
+				& broadcast:ipv4;
 
 	set_endpoint4		? tid:u32				\
 				& ifname:txt				\
 				& vif:txt				\
 				& address:ipv4				\
-				& endpoint:ipv4
+				& endpoint:ipv4;
 
-	create_address6 ? tid:u32 & ifname:txt & vif:txt & address:ipv6
+	create_address6 ? tid:u32 & ifname:txt & vif:txt & address:ipv6;
 
-	delete_address6 ? tid:u32 & ifname:txt & vif:txt & address:ipv6
+	delete_address6 ? tid:u32 & ifname:txt & vif:txt & address:ipv6;
 
 	set_address_enabled6	? tid:u32				\
 				& ifname:txt				\
 				& vif:txt				\
 				& address:ipv6				\
-				& enabled:bool
+				& enabled:bool;
 
 	get_configured_address_enabled6	? ifname:txt			\
 					& vif:txt			\
 					& address:ipv6			\
-					-> enabled:bool
+					-> enabled:bool;
 
 	set_prefix6		? tid:u32				\
 				& ifname:txt				\
 				& vif:txt				\
 				& address:ipv6				\
-				& prefix_len:u32
+				& prefix_len:u32;
 
 	set_endpoint6		? tid:u32				\
 				& ifname:txt				\
 				& vif:txt				\
 				& address:ipv6				\
-				& endpoint:ipv6
+				& endpoint:ipv6;
 }

Modified: trunk/xorp/xrl/interfaces/fea_ifmgr_mirror.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_ifmgr_mirror.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_ifmgr_mirror.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -4,62 +4,62 @@
  */
 
 interface fea_ifmgr_mirror/0.1 {
-	interface_add ? ifname:txt
-	interface_remove ? ifname:txt
-	interface_set_enabled ? ifname:txt & enabled:bool
-	interface_set_discard ? ifname:txt & discard:bool
-	interface_set_unreachable ? ifname:txt & unreachable:bool
-	interface_set_management ? ifname:txt & management:bool
-	interface_set_mtu ? ifname:txt & mtu:u32
-	interface_set_mac ? ifname:txt & mac:mac
-	interface_set_pif_index ? ifname:txt & pif_index:u32
-	interface_set_no_carrier ? ifname:txt & no_carrier:bool
-	interface_set_baudrate ? ifname:txt & baudrate:u64
+	interface_add ? ifname:txt;
+	interface_remove ? ifname:txt;
+	interface_set_enabled ? ifname:txt & enabled:bool;
+	interface_set_discard ? ifname:txt & discard:bool;
+	interface_set_unreachable ? ifname:txt & unreachable:bool;
+	interface_set_management ? ifname:txt & management:bool;
+	interface_set_mtu ? ifname:txt & mtu:u32;
+	interface_set_mac ? ifname:txt & mac:mac;
+	interface_set_pif_index ? ifname:txt & pif_index:u32;
+	interface_set_no_carrier ? ifname:txt & no_carrier:bool;
+	interface_set_baudrate ? ifname:txt & baudrate:u64;
 
 
-	vif_add ? ifname:txt & vifname:txt
-	vif_remove ? ifname:txt & vifname:txt
-	vif_set_enabled ? ifname:txt & vifname:txt & enabled:bool
-	vif_set_multicast_capable ? ifname:txt & vifname:txt & capable:bool
-	vif_set_broadcast_capable ? ifname:txt & vifname:txt & capable:bool
-	vif_set_p2p_capable ? ifname:txt & vifname:txt & capable:bool
-	vif_set_loopback ? ifname:txt & vifname:txt & loopback:bool
-	vif_set_pim_register ? ifname:txt & vifname:txt & pim_register:bool
-	vif_set_pif_index ? ifname:txt & vifname:txt & pif_index:u32
-	vif_set_vif_index ? ifname:txt & vifname:txt & vif_index:u32
-	vif_set_vlan ? ifname:txt & vifname:txt & is_vlan:bool
-	vif_set_vlan_id ? ifname:txt & vifname:txt & vlan_id:u32
+	vif_add ? ifname:txt & vifname:txt;
+	vif_remove ? ifname:txt & vifname:txt;
+	vif_set_enabled ? ifname:txt & vifname:txt & enabled:bool;
+	vif_set_multicast_capable ? ifname:txt & vifname:txt & capable:bool;
+	vif_set_broadcast_capable ? ifname:txt & vifname:txt & capable:bool;
+	vif_set_p2p_capable ? ifname:txt & vifname:txt & capable:bool;
+	vif_set_loopback ? ifname:txt & vifname:txt & loopback:bool;
+	vif_set_pim_register ? ifname:txt & vifname:txt & pim_register:bool;
+	vif_set_pif_index ? ifname:txt & vifname:txt & pif_index:u32;
+	vif_set_vif_index ? ifname:txt & vifname:txt & vif_index:u32;
+	vif_set_vlan ? ifname:txt & vifname:txt & is_vlan:bool;
+	vif_set_vlan_id ? ifname:txt & vifname:txt & vlan_id:u32;
 
 
 
-	ipv4_add ? ifname:txt & vifname:txt & addr:ipv4
-	ipv4_remove ? ifname:txt & vifname:txt & addr:ipv4
-	ipv4_set_prefix ? ifname:txt & vifname:txt & addr:ipv4 & prefix_len:u32
-	ipv4_set_enabled ? ifname:txt & vifname:txt & addr:ipv4 & enabled:bool
+	ipv4_add ? ifname:txt & vifname:txt & addr:ipv4;
+	ipv4_remove ? ifname:txt & vifname:txt & addr:ipv4;
+	ipv4_set_prefix ? ifname:txt & vifname:txt & addr:ipv4 & prefix_len:u32;
+	ipv4_set_enabled ? ifname:txt & vifname:txt & addr:ipv4 & enabled:bool;
 	ipv4_set_multicast_capable ? ifname:txt & vifname:txt & addr:ipv4     \
-				   & capable:bool
+				   & capable:bool;
 	ipv4_set_loopback ? ifname:txt & vifname:txt & addr:ipv4	      \
-			  & loopback:bool
+			  & loopback:bool;
 	ipv4_set_broadcast ? ifname:txt & vifname:txt & addr:ipv4	\
-			   & broadcast_addr:ipv4
+			   & broadcast_addr:ipv4;
 	ipv4_set_endpoint ? ifname:txt & vifname:txt & addr:ipv4	\
-			  & endpoint_addr:ipv4
+			  & endpoint_addr:ipv4;
 
 
 
-	ipv6_add ? ifname:txt & vifname:txt & addr:ipv6
-	ipv6_remove ? ifname:txt & vifname:txt & addr:ipv6
-	ipv6_set_prefix ? ifname:txt & vifname:txt & addr:ipv6 & prefix_len:u32
-	ipv6_set_enabled ? ifname:txt & vifname:txt & addr:ipv6 & enabled:bool
+	ipv6_add ? ifname:txt & vifname:txt & addr:ipv6;
+	ipv6_remove ? ifname:txt & vifname:txt & addr:ipv6;
+	ipv6_set_prefix ? ifname:txt & vifname:txt & addr:ipv6 & prefix_len:u32;
+	ipv6_set_enabled ? ifname:txt & vifname:txt & addr:ipv6 & enabled:bool;
 	ipv6_set_loopback ? ifname:txt & vifname:txt & addr:ipv6	      \
-			  & loopback:bool
+			  & loopback:bool;
 	ipv6_set_multicast_capable ? ifname:txt & vifname:txt & addr:ipv6     \
-				   & capable:bool
+				   & capable:bool;
 	ipv6_set_endpoint ? ifname:txt & vifname:txt & addr:ipv6	\
-			  & endpoint_addr:ipv6
+			  & endpoint_addr:ipv6;
 
 
 
-	hint_tree_complete
-	hint_updates_made
+	hint_tree_complete;
+	hint_updates_made;
 }

Modified: trunk/xorp/xrl/interfaces/fea_ifmgr_replicator.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_ifmgr_replicator.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_ifmgr_replicator.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -12,10 +12,10 @@
 	/**
 	 * Register remote mirror of interface state.
 	 */
-	register_ifmgr_mirror ? clientname:txt
+	register_ifmgr_mirror ? clientname:txt;
 
 	/**
 	 * Register remote mirror of interface state.
 	 */
-	unregister_ifmgr_mirror ? clientname:txt
+	unregister_ifmgr_mirror ? clientname:txt;
 }

Modified: trunk/xorp/xrl/interfaces/fea_rawlink.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_rawlink.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_rawlink.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -24,7 +24,7 @@
 		& src_address:mac					\
 		& dst_address:mac  					\
 		& ether_type:u32  					\
-		& payload:binary
+		& payload:binary;
 
 	/**
 	 * Register to receive raw link-level packets. The receiver is
@@ -52,7 +52,7 @@
 				& vif_name:txt				\
 				& ether_type:u32			\
 				& filter_program:txt			\
-				& enable_multicast_loopback:bool
+				& enable_multicast_loopback:bool;
 
 	/**
 	 * Unregister to receive raw link-level packets.
@@ -76,7 +76,7 @@
 				& if_name:txt				\
 				& vif_name:txt				\
 				& ether_type:u32			\
-				& filter_program:txt
+				& filter_program:txt;
 
 	/**
 	 * Join a MAC multicast group.
@@ -101,7 +101,7 @@
 				& vif_name:txt				\
 				& ether_type:u32			\
 				& filter_program:txt			\
-				& group_address:mac
+				& group_address:mac;
 
 	/**
 	 * Leave a MAC multicast group.
@@ -127,5 +127,5 @@
 				& vif_name:txt				\
 				& ether_type:u32			\
 				& filter_program:txt			\
-				& group_address:mac
+				& group_address:mac;
 }

Modified: trunk/xorp/xrl/interfaces/fea_rawlink_client.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_rawlink_client.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_rawlink_client.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -24,5 +24,5 @@
 		& src_address:mac					\
 		& dst_address:mac					\
 		& ether_type:u32					\
-		& payload:binary
+		& payload:binary;
 }

Modified: trunk/xorp/xrl/interfaces/fea_rawpkt4.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_rawpkt4.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_rawpkt4.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -37,7 +37,7 @@
 		& ip_tos:i32 						\
 		& ip_router_alert:bool 					\
 		& ip_internet_control:bool				\
-		& payload:binary
+		& payload:binary;
 
 	/**
 	 * Register to receive IPv4 packets.  The receiver is expected to
@@ -59,7 +59,7 @@
 				& if_name:txt				\
 				& vif_name:txt				\
 				& ip_protocol:u32			\
-				& enable_multicast_loopback:bool
+				& enable_multicast_loopback:bool;
 
 	/**
 	 * Unregister to receive IPv4 packets.
@@ -77,7 +77,7 @@
 	unregister_receiver	? xrl_target_instance_name:txt		\
 				& if_name:txt				\
 				& vif_name:txt				\
-				& ip_protocol:u32
+				& ip_protocol:u32;
 
 	/**
 	 * Join an IPv4 multicast group.
@@ -96,7 +96,7 @@
 				& if_name:txt				\
 				& vif_name:txt				\
 				& ip_protocol:u32			\
-				& group_address:ipv4
+				& group_address:ipv4;
 
 	/**
 	 * Leave an IPv4 multicast group.
@@ -116,5 +116,5 @@
 				& if_name:txt				\
 				& vif_name:txt				\
 				& ip_protocol:u32			\
-				& group_address:ipv4
+				& group_address:ipv4;
 }

Modified: trunk/xorp/xrl/interfaces/fea_rawpkt4_client.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_rawpkt4_client.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_rawpkt4_client.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -33,5 +33,5 @@
 		& ip_tos:i32						\
 		& ip_router_alert:bool					\
 		& ip_internet_control:bool				\
-		& payload:binary
+		& payload:binary;
 }

Modified: trunk/xorp/xrl/interfaces/fea_rawpkt6.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_rawpkt6.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_rawpkt6.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -44,7 +44,7 @@
 		& ip_internet_control:bool				\
 		& ext_headers_type:list<u32>				\
 		& ext_headers_payload:list<binary>			\
-		& payload:binary
+		& payload:binary;
 
 	/**
 	 * Register to receive IPv6 packets.  The receiver is expected to
@@ -66,7 +66,7 @@
 				& if_name:txt				\
 				& vif_name:txt				\
 				& ip_protocol:u32			\
-				& enable_multicast_loopback:bool
+				& enable_multicast_loopback:bool;
 
 	/**
 	 * Unregister to receive IPv6 packets.
@@ -84,7 +84,7 @@
 	unregister_receiver	? xrl_target_instance_name:txt		\
 				& if_name:txt				\
 				& vif_name:txt				\
-				& ip_protocol:u32
+				& ip_protocol:u32;
 
 	/**
 	 * Join an IPv6 multicast group.
@@ -103,7 +103,7 @@
 				& if_name:txt				\
 				& vif_name:txt				\
 				& ip_protocol:u32			\
-				& group_address:ipv6
+				& group_address:ipv6;
 
 	/**
 	 * Leave an IPv6 multicast group.
@@ -123,5 +123,5 @@
 				& if_name:txt				\
 				& vif_name:txt				\
 				& ip_protocol:u32			\
-				& group_address:ipv6
+				& group_address:ipv6;
 }

Modified: trunk/xorp/xrl/interfaces/fea_rawpkt6_client.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fea_rawpkt6_client.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fea_rawpkt6_client.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -40,5 +40,5 @@
 		& ip_internet_control:bool				\
 		& ext_headers_type:list<u32>				\
 		& ext_headers_payload:list<binary>			\
-		& payload:binary
+		& payload:binary;
 }

Modified: trunk/xorp/xrl/interfaces/fib2mrib.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fib2mrib.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fib2mrib.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -13,9 +13,9 @@
 	 * @param enable if true, then enable Fib2mrib, otherwise
 	 * disable it.
 	 */
-	enable_fib2mrib		? enable:bool
-	start_fib2mrib
-	stop_fib2mrib
+	enable_fib2mrib		? enable:bool;
+	start_fib2mrib;
+	stop_fib2mrib;
 
 	/**
 	 * Enable/disable the Fib2mrib trace log for all operations.
@@ -23,5 +23,5 @@
 	 * @param enable if true, then enable the trace log, otherwise
 	 * disable it.
 	 */
-	enable_log_trace_all	? enable:bool
+	enable_log_trace_all	? enable:bool;
 }

Modified: trunk/xorp/xrl/interfaces/finder.xif
===================================================================
--- trunk/xorp/xrl/interfaces/finder.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/finder.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -15,9 +15,9 @@
 				 & class_name:txt			      \
 				 & singleton:bool			      \
 				 & in_cookie:txt			      \
-				 -> out_cookie:txt
+				 -> out_cookie:txt;
 
-	  unregister_finder_client ? instance_name:txt
+	  unregister_finder_client ? instance_name:txt;
 
 	  /**
 	   * Enable resolution of Xrls associated with target.  Disabling
@@ -28,12 +28,12 @@
 	   * Caller must be client that registered Xrl.
 	   */
 	  set_finder_client_enabled ? instance_name:txt			      \
-				    & enabled:bool
+				    & enabled:bool;
 
 	  /**
 	   * Get enabled state information associated with finder client.
 	   */
-	  finder_client_enabled ? instance_name:txt -> enabled:bool
+	  finder_client_enabled ? instance_name:txt -> enabled:bool;
 
 	  /** 
 	   * Add resolved Xrl into system, fails if xrl is already
@@ -42,49 +42,49 @@
 	  add_xrl ? xrl:txt			      			      \
 		  & protocol_name:txt					      \
 		  & protocol_args:txt					      \
-		  -> resolved_xrl_method_name:txt
+		  -> resolved_xrl_method_name:txt;
 
 	  /**
 	   * Remove xrl
 	   */
-	  remove_xrl ? xrl:txt
+	  remove_xrl ? xrl:txt;
 
 	  /**
 	   * Resolve Xrl
 	   */
-	   resolve_xrl ? xrl:txt -> resolutions:list<txt>
+	   resolve_xrl ? xrl:txt -> resolutions:list<txt>;
 
 	  /**
 	   * Get list of registered Xrl targets 
 	   */
-	  get_xrl_targets -> target_names:list<txt>
+	  get_xrl_targets -> target_names:list<txt>;
 
 	  /**
 	   * Get list of Xrls registered by target
 	   */
-	  get_xrls_registered_by ? target_name:txt -> xrls:list<txt>
+	  get_xrls_registered_by ? target_name:txt -> xrls:list<txt>;
 
 	  /**
 	   * Get list of IPv4 hosts that clients should accept IPC requests
 	   * from.
 	   */
-	   get_ipv4_permitted_hosts -> ipv4s:list<ipv4>
+	   get_ipv4_permitted_hosts -> ipv4s:list<ipv4>;
 
 	  /**
 	   * Get list of IPv4 nets that clients should accept IPC requests
 	   * from.
 	   */
-	   get_ipv4_permitted_nets -> ipv4nets:list<ipv4net>
+	   get_ipv4_permitted_nets -> ipv4nets:list<ipv4net>;
 
 	  /**
 	   * Get list of IPv6 hosts that clients should accept IPC requests
 	   * from.
 	   */
-	   get_ipv6_permitted_hosts -> ipv6s:list<ipv6>
+	   get_ipv6_permitted_hosts -> ipv6s:list<ipv6>;
 
 	  /**
 	   * Get list of IPv6 nets that clients should accept IPC requests
 	   * from.
 	   */
-	   get_ipv6_permitted_nets -> ipv6nets:list<ipv6net>
+	   get_ipv6_permitted_nets -> ipv6nets:list<ipv6net>;
 }

Modified: trunk/xorp/xrl/interfaces/finder_client.xif
===================================================================
--- trunk/xorp/xrl/interfaces/finder_client.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/finder_client.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -6,8 +6,9 @@
   */
 
 interface finder_client/0.2 {
+
 	/** No op method used by finder to poll for liveness. */
-	hello
+	hello;
 
 	/** 
 	 * Remove Xrl from cache.  The client should remove currently
@@ -16,16 +17,16 @@
 	 * information, though implementations may consult the Finder for
 	 * updated information before.
 	 */
-	remove_xrl_from_cache ? xrl:txt
+	remove_xrl_from_cache ? xrl:txt;
 
 	/** 
 	 * Remove all Xrls relating to target from cache. 
 	 */
-	remove_xrls_for_target_from_cache ? target_name:txt
+	remove_xrls_for_target_from_cache ? target_name:txt;
 
 	/**
 	 * Execute tunneled Xrl.  Permits finder to call methods on
 	 * clients through FinderClient.
 	 */
-	 dispatch_tunneled_xrl ? xrl:txt -> xrl_error:u32 & xrl_error_note:txt
+	 dispatch_tunneled_xrl ? xrl:txt -> xrl_error:u32 & xrl_error_note:txt;
 }

Modified: trunk/xorp/xrl/interfaces/finder_event_notifier.xif
===================================================================
--- trunk/xorp/xrl/interfaces/finder_event_notifier.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/finder_event_notifier.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -22,7 +22,7 @@
 	 *	notifications for.
 	 */
 	register_class_event_interest	 ? requester_instance:txt	\
-					 & class_name:txt
+					 & class_name:txt;
 
 	/**
 	 * Deregister interest in events relating to a particular class.
@@ -34,7 +34,7 @@
 	 *	notifications for.
 	 */
 	deregister_class_event_interest	 ? requester_instance:txt	\
-					 & class_name:txt
+					 & class_name:txt;
 
 	/**
 	 * Register interest in events relating to a particular instance.
@@ -53,7 +53,7 @@
 	 *	notifications for.
 	 */
 	register_instance_event_interest ? requester_instance:txt	\
-					 & instance_name:txt
+					 & instance_name:txt;
 	/**
 	 * Register interest in events relating to a particular instance.
 	 *
@@ -64,5 +64,5 @@
 	 *	notifications for.
 	 */
 	deregister_instance_event_interest ? requester_instance:txt	\
-					   & instance_name:txt
+					   & instance_name:txt;
 }

Modified: trunk/xorp/xrl/interfaces/finder_event_observer.xif
===================================================================
--- trunk/xorp/xrl/interfaces/finder_event_observer.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/finder_event_observer.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -11,7 +11,7 @@
 	 * @param target_class the target class name.
 	 * @param target_instance the target instance name.
 	 */	  
-	xrl_target_birth ? target_class:txt & target_instance:txt
+	xrl_target_birth ? target_class:txt & target_instance:txt;
 
 	/**
 	 * Announce target death to observer.
@@ -19,5 +19,5 @@
 	 * @param target_class the target class name.
 	 * @param target_instance the target instance name.
 	 */	  
-	xrl_target_death ? target_class:txt & target_instance:txt
+	xrl_target_death ? target_class:txt & target_instance:txt;
 }

Modified: trunk/xorp/xrl/interfaces/fti.xif
===================================================================
--- trunk/xorp/xrl/interfaces/fti.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/fti.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -25,7 +25,7 @@
 				    vifname:txt &			\
 				    metric:u32 &			\
 				    admin_distance:u32 &		\
-				    protocol_origin:txt
+				    protocol_origin:txt;
 
 	/**
 	 * Lookup a route for a destination host address.
@@ -46,7 +46,7 @@
 				    vifname:txt &			\
 				    metric:u32 &			\
 				    admin_distance:u32 &		\
-				    protocol_origin:txt
+				    protocol_origin:txt;
 
 	/**
 	 * Lookup a route for a destination subnet address.
@@ -67,7 +67,7 @@
 			 vifname:txt &					\
 			 metric:u32 &					\
 			 admin_distance:u32 &				\
-			 protocol_origin:txt
+			 protocol_origin:txt;
 
 	/**
 	 * Lookup a route for a destination subnet address.
@@ -88,7 +88,7 @@
 			 vifname:txt &					\
 			 metric:u32 &					\
 			 admin_distance:u32 &				\
-			 protocol_origin:txt
+			 protocol_origin:txt;
 
 	/*
 	 * TBD: start_reading and read_entry forwarding table dump methods.
@@ -102,7 +102,7 @@
 	 * @param result true if the underlying system supports IPv4,
 	 * otherwise false.
 	 */
-	have_ipv4 -> result:bool
+	have_ipv4 -> result:bool;
 
 	/**
 	 * Test if the underlying system supports IPv6.
@@ -110,7 +110,7 @@
 	 * @param result true if the underlying system supports IPv4,
 	 * otherwise false.
 	 */
-	have_ipv6 -> result:bool
+	have_ipv6 -> result:bool;
 
 	/**
 	 * Test whether the IPv4 unicast forwarding engine is enabled
@@ -119,7 +119,7 @@
 	 * @param enabled if true, then the IPv4 unicast forwarding
 	 * is enabled, otherwise is disabled.
 	 */
-	get_unicast_forwarding_enabled4 -> enabled:bool
+	get_unicast_forwarding_enabled4 -> enabled:bool;
 
 	/**
 	 * Test whether the IPv6 unicast forwarding engine is enabled
@@ -128,7 +128,7 @@
 	 * @param enabled if true, then the IPv6 unicast forwarding
 	 * is enabled, otherwise is disabled.
 	 */
-	get_unicast_forwarding_enabled6 -> enabled:bool
+	get_unicast_forwarding_enabled6 -> enabled:bool;
 
 	/**
 	 * Set the IPv4 unicast forwarding engine to enable or disable
@@ -137,7 +137,7 @@
 	 * @param enabled if true, then enable IPv4 unicast forwarding,
 	 * otherwise disable it.
 	 */
-	set_unicast_forwarding_enabled4 ? enabled:bool
+	set_unicast_forwarding_enabled4 ? enabled:bool;
 
 	/**
 	 * Set the IPv6 unicast forwarding engine to enable or disable
@@ -146,7 +146,7 @@
 	 * @param enabled if true, then enable IPv6 unicast forwarding,
 	 * otherwise disable it.
 	 */
-	set_unicast_forwarding_enabled6 ? enabled:bool
+	set_unicast_forwarding_enabled6 ? enabled:bool;
 
 	/**
 	 * Set the IPv4 unicast forwarding engine whether to retain existing
@@ -155,7 +155,7 @@
 	 * @param retain if true, then retain the XORP forwarding entries,
 	 * otherwise delete them.
 	 */
-	set_unicast_forwarding_entries_retain_on_startup4 ? retain:bool
+	set_unicast_forwarding_entries_retain_on_startup4 ? retain:bool;
 
 	/**
 	 * Set the IPv4 unicast forwarding engine whether to retain existing
@@ -164,7 +164,7 @@
 	 * @param retain if true, then retain the XORP forwarding entries,
 	 * otherwise delete them.
 	 */
-	set_unicast_forwarding_entries_retain_on_shutdown4 ? retain:bool
+	set_unicast_forwarding_entries_retain_on_shutdown4 ? retain:bool;
 
 	/**
 	 * Set the IPv6 unicast forwarding engine whether to retain existing
@@ -173,7 +173,7 @@
 	 * @param retain if true, then retain the XORP forwarding entries,
 	 * otherwise delete them.
 	 */
-	set_unicast_forwarding_entries_retain_on_startup6 ? retain:bool
+	set_unicast_forwarding_entries_retain_on_startup6 ? retain:bool;
 
 	/**
 	 * Set the IPv6 unicast forwarding engine whether to retain existing
@@ -182,7 +182,7 @@
 	 * @param retain if true, then retain the XORP forwarding entries,
 	 * otherwise delete them.
 	 */
-	set_unicast_forwarding_entries_retain_on_shutdown6 ? retain:bool
+	set_unicast_forwarding_entries_retain_on_shutdown6 ? retain:bool;
 
 	/**
 	 * Set the IPv4 unicast forwarding table ID to be used.
@@ -191,7 +191,7 @@
 	 * otherwise the default table should be used.
 	 * @param table_id the IPv4 unicast forwarding table ID to be used.
 	 */
-	set_unicast_forwarding_table_id4 ? is_configured:bool & table_id:u32
+	set_unicast_forwarding_table_id4 ? is_configured:bool & table_id:u32;
 
 	/**
 	 * Set the IPv6 unicast forwarding table ID to be used.
@@ -200,5 +200,5 @@
 	 * otherwise the default table should be used.
 	 * @param table_id the IPv6 unicast forwarding table ID to be used.
 	 */
-	set_unicast_forwarding_table_id6 ? is_configured:bool & table_id:u32
+	set_unicast_forwarding_table_id6 ? is_configured:bool & table_id:u32;
 }

Modified: trunk/xorp/xrl/interfaces/isis.xif
===================================================================
--- trunk/xorp/xrl/interfaces/isis.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/isis.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -11,26 +11,26 @@
 	 * @param id our IS-IS ID. Typically a router interface address.
          *
 	 */
-	set_system_id ? id:ipv4
+	set_system_id ? id:ipv4;
 
 	/**
          * Get the system ID
 	 */
-	get_system_id -> id:ipv4
+	get_system_id -> id:ipv4;
 
 	/**
 	 * Add an area address.
 	 *
 	 * @param addr area address.
 	 */
-	add_area_address ? addr:u32
+	add_area_address ? addr:u32;
 
 	/**
          * Delete an area address
 	 *
 	 * @param addr area address.
 	 */
-	delete_area_address ? addr:u32
+	delete_area_address ? addr:u32;
 
 	/**
 	 * Configure an interface for IS-IS
@@ -57,7 +57,7 @@
 		              metric:u32 \
 			      hello_interval:u32 \
 			      hold_time_multiplier:u32 \
-	                      prioriy:u32      
+	                      prioriy:u32;
 
 	/**
 	 * Add interface address
@@ -72,7 +72,7 @@
 	 */
 	add_interface_address_v4 ? ifname:txt \
 			      vif:txt \
-		              address:ipv4 
+		              address:ipv4;
 
 	/**
 	 * Delete interface address
@@ -86,7 +86,7 @@
 	 */
 	delete_interface_address_v4 ? ifname:txt \
 			      vif:txt \
-		              address:ipv4 
+		              address:ipv4; 
 
 	/**
 	 * Add interface address
@@ -101,7 +101,7 @@
 	 */
 	add_interface_address_v6 ? ifname:txt \
 			      vif:txt \
-		              address:ipv6
+		              address:ipv6;
 
 	/**
 	 * Delete interface address
@@ -115,47 +115,47 @@
 	 */
 	 delete_interface_address_v6 ? ifname:txt \
 			      vif:txt \
-		              address:ipv6
+		              address:ipv6;
 
 	/*
 	 * Add reachability information.
 	 *
 	 * @param network
 	 */
-         add_nlri_v4 ? address:ipv4net
+         add_nlri_v4 ? address:ipv4net;
 		
 	/*
 	 * Delete reachability information.
 	 *
 	 * @param network
 	 */
-         add_nlri_v4 ? address:ipv4net
+         add_nlri_v4 ? address:ipv4net;
 
 	/*
 	 * Add reachability information.
 	 *
 	 * @param network
 	 */
-        add_nlri_v6 ? address:ipv6net
+        add_nlri_v6 ? address:ipv6net;
 		
 	/*
 	 * Delete reachability information.
 	 *
 	 * @param network
 	 */
-         add_nlri_v6 ? address:ipv6net
+         add_nlri_v6 ? address:ipv6net;
 
 	/**
          * Interpacket Gap.
 	 *
 	 * @param gap Minimal time between packets in milliseconds.
 	 */
-   	interpacket_gap ? gap:u32
+   	interpacket_gap ? gap:u32;
 
 	/**
          * Set the overload bit in the transmitted LSP.
 	 *
 	 * @param enable 
 	 */
-	configure_overload ? enable:bool
+	configure_overload ? enable:bool;
 }

Modified: trunk/xorp/xrl/interfaces/mfea.xif
===================================================================
--- trunk/xorp/xrl/interfaces/mfea.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/mfea.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -13,7 +13,7 @@
 	 * @param result true if the underlying system supports IPv4
 	 * multicast routing, otherwise false.
 	 */
-	have_multicast_routing4 -> result:bool
+	have_multicast_routing4 -> result:bool;
 
 	/**
 	 * Test if the underlying system supports IPv6 multicast routing.
@@ -21,7 +21,7 @@
 	 * @param result true if the underlying system supports IPv6
 	 * multicast routing, otherwise false.
 	 */
-	have_multicast_routing6 -> result:bool
+	have_multicast_routing6 -> result:bool;
 
 	/**
 	 * Register a protocol on an interface in the Multicast FEA.
@@ -38,10 +38,10 @@
 	 */
 	register_protocol4 ? xrl_sender_name:txt			\
 			& if_name:txt & vif_name:txt			\
-			& ip_protocol:u32
+			& ip_protocol:u32;
 	register_protocol6 ? xrl_sender_name:txt			\
 			& if_name:txt & vif_name:txt			\
-			& ip_protocol:u32
+			& ip_protocol:u32;
 
 	/**
 	 * Unregister a protocol on an interface in the Multicast FEA.
@@ -55,9 +55,9 @@
 	 * particular protocol.
 	 */
 	unregister_protocol4 ? xrl_sender_name:txt			\
-			& if_name:txt & vif_name:txt
+			& if_name:txt & vif_name:txt;
 	unregister_protocol6 ? xrl_sender_name:txt			\
-			& if_name:txt & vif_name:txt
+			& if_name:txt & vif_name:txt;
 
 	/**
 	 * Add/delete a Multicast Forwarding Cache with the kernel.
@@ -80,18 +80,18 @@
 			& oiflist:binary				\
 			& oiflist_disable_wrongvif:binary		\
 			& max_vifs_oiflist:u32				\
-			& rp_address:ipv4
+			& rp_address:ipv4;
 	add_mfc6	? xrl_sender_name:txt				\
 			& source_address:ipv6 & group_address:ipv6	\
 			& iif_vif_index:u32				\
 			& oiflist:binary				\
 			& oiflist_disable_wrongvif:binary		\
 			& max_vifs_oiflist:u32				\
-			& rp_address:ipv6
+			& rp_address:ipv6;
 	delete_mfc4	? xrl_sender_name:txt				\
-			& source_address:ipv4 & group_address:ipv4
+			& source_address:ipv4 & group_address:ipv4;
 	delete_mfc6	? xrl_sender_name:txt				\
-			& source_address:ipv6 & group_address:ipv6
+			& source_address:ipv6 & group_address:ipv6;
 	
 	/**
 	 * Add/delete a dataflow monitor with the MFEA.
@@ -126,7 +126,7 @@
 				& is_threshold_in_packets:bool		\
 				& is_threshold_in_bytes:bool		\
 				& is_geq_upcall:bool			\
-				& is_leq_upcall:bool
+				& is_leq_upcall:bool;
 	add_dataflow_monitor6	? xrl_sender_name:txt			\
 				& source_address:ipv6			\
 				& group_address:ipv6			\
@@ -137,7 +137,7 @@
 				& is_threshold_in_packets:bool		\
 				& is_threshold_in_bytes:bool		\
 				& is_geq_upcall:bool			\
-				& is_leq_upcall:bool
+				& is_leq_upcall:bool;
 	delete_dataflow_monitor4? xrl_sender_name:txt			\
 				& source_address:ipv4			\
 				& group_address:ipv4			\
@@ -148,7 +148,7 @@
 				& is_threshold_in_packets:bool		\
 				& is_threshold_in_bytes:bool		\
 				& is_geq_upcall:bool			\
-				& is_leq_upcall:bool
+				& is_leq_upcall:bool;
 	delete_dataflow_monitor6? xrl_sender_name:txt			\
 				& source_address:ipv6			\
 				& group_address:ipv6			\
@@ -159,13 +159,13 @@
 				& is_threshold_in_packets:bool		\
 				& is_threshold_in_bytes:bool		\
 				& is_geq_upcall:bool			\
-				& is_leq_upcall:bool
+				& is_leq_upcall:bool;
 	delete_all_dataflow_monitor4? xrl_sender_name:txt		\
 				& source_address:ipv4			\
-				& group_address:ipv4
+				& group_address:ipv4;
 	delete_all_dataflow_monitor6? xrl_sender_name:txt		\
 				& source_address:ipv6			\
-				& group_address:ipv6
+				& group_address:ipv6;
 
 	/**
 	 * Enable/disable/start/stop a MFEA vif interface.
@@ -174,9 +174,9 @@
 	 * @param enable if true, then enable the vif, otherwise
 	 * disable it.
 	 */
-	enable_vif	? vif_name:txt & enable:bool
-	start_vif	? vif_name:txt
-	stop_vif	? vif_name:txt
+	enable_vif	? vif_name:txt & enable:bool;
+	start_vif	? vif_name:txt;
+	stop_vif	? vif_name:txt;
 
 	/**
 	 * Enable/disable/start/stop all MFEA vif interfaces.
@@ -184,9 +184,9 @@
 	 * @param enable if true, then enable the vifs, otherwise
 	 * disable them.
 	 */
-	enable_all_vifs	? enable:bool
-	start_all_vifs
-	stop_all_vifs
+	enable_all_vifs	? enable:bool;
+	start_all_vifs;
+	stop_all_vifs;
 
 	/**
 	 * Enable/disable/start/stop the MFEA.
@@ -194,9 +194,9 @@
 	 * @param enable if true, then enable the MFEA, otherwise
 	 * disable it.
 	 */
-	enable_mfea	? enable:bool
-	start_mfea
-	stop_mfea
+	enable_mfea	? enable:bool;
+	start_mfea;
+	stop_mfea;
 
 	/**
 	 * Enable/disable/start/stop the MFEA CLI access.
@@ -204,9 +204,9 @@
 	 * @param enable if true, then enable the MFEA CLI access, otherwise
 	 * disable it.
 	 */
-	enable_cli	? enable:bool
-	start_cli
-	stop_cli
+	enable_cli	? enable:bool;
+	start_cli;
+	stop_cli;
 
 	/**
 	 * Enable/disable the MFEA trace log for all operations.
@@ -214,5 +214,5 @@
 	 * @param enable if true, then enable the trace log, otherwise
 	 * disable it.
 	 */
-	log_trace_all	? enable:bool
+	log_trace_all	? enable:bool;
 }

Modified: trunk/xorp/xrl/interfaces/mfea_client.xif
===================================================================
--- trunk/xorp/xrl/interfaces/mfea_client.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/mfea_client.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -24,13 +24,13 @@
 					& vif_name:txt & vif_index:u32	\
 					& source_address:ipv4		\
 					& dest_address:ipv4		\
-					& protocol_message:binary
+					& protocol_message:binary;
 	recv_kernel_signal_message6	? xrl_sender_name:txt		\
 					& message_type:u32		\
 					& vif_name:txt & vif_index:u32	\
 					& source_address:ipv6		\
 					& dest_address:ipv6		\
-					& protocol_message:binary
+					& protocol_message:binary;
 	
 	/**
 	 * A signal that a dataflow-related pre-condition is true.
@@ -75,7 +75,7 @@
 				& is_threshold_in_packets: bool		\
 				& is_threshold_in_bytes: bool		\
 				& is_geq_upcall:bool			\
-				& is_leq_upcall: bool
+				& is_leq_upcall: bool;
 	recv_dataflow_signal6	? xrl_sender_name:txt			\
 				& source_address:ipv6			\
 				& group_address:ipv6			\
@@ -90,5 +90,5 @@
 				& is_threshold_in_packets: bool		\
 				& is_threshold_in_bytes: bool		\
 				& is_geq_upcall:bool			\
-				& is_leq_upcall:bool
+				& is_leq_upcall:bool;
 }

Modified: trunk/xorp/xrl/interfaces/mld6igmp.xif
===================================================================
--- trunk/xorp/xrl/interfaces/mld6igmp.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/mld6igmp.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -15,9 +15,9 @@
 	 * @param enable if true, then enable the vif, otherwise
 	 * disable it.
 	 */
-	enable_vif	? vif_name:txt & enable:bool
-	start_vif	? vif_name:txt
-	stop_vif	? vif_name:txt
+	enable_vif	? vif_name:txt & enable:bool;
+	start_vif	? vif_name:txt;
+	stop_vif	? vif_name:txt;
 
 	/**
 	 * Enable/disable/start/stop all MLD6IGMP vif interfaces.
@@ -25,9 +25,9 @@
 	 * @param enable if true, then enable the vifs, otherwise
 	 * disable them.
 	 */
-	enable_all_vifs	? enable:bool
-	start_all_vifs
-	stop_all_vifs
+	enable_all_vifs	? enable:bool;
+	start_all_vifs;
+	stop_all_vifs;
 	
 	/**
 	 * Enable/disable/start/stop the MLD6IGMP protocol.
@@ -35,9 +35,9 @@
 	 * @param enable if true, then enable the MLD6IGMP protocol, otherwise
 	 * disable it.
 	 */
-	enable_mld6igmp	? enable:bool
-	start_mld6igmp
-	stop_mld6igmp
+	enable_mld6igmp	? enable:bool;
+	start_mld6igmp;
+	stop_mld6igmp;
 
 	/**
 	 * Enable/disable/start/stop the MLD6IGMP CLI access.
@@ -45,9 +45,9 @@
 	 * @param enable if true, then enable the MLD6IGMP CLI access,
 	 * otherwise disable it.
 	 */
-	enable_cli	? enable:bool
-	start_cli
-	stop_cli
+	enable_cli	? enable:bool;
+	start_cli;
+	stop_cli;
 
 	/**
 	 * Get the configured protocol version per interface.
@@ -55,7 +55,7 @@
 	 * @param vif_name the name of the vif to apply to.
 	 * @param proto_version the protocol version.
 	 */
-	get_vif_proto_version		? vif_name:txt -> proto_version:u32
+	get_vif_proto_version		? vif_name:txt -> proto_version:u32;
 
 	/**
 	 * Set the protocol version per interface.
@@ -63,14 +63,14 @@
 	 * @param vif_name the name of the vif to apply to.
 	 * @param proto_version the protocol version.
 	 */
-	set_vif_proto_version		? vif_name:txt & proto_version:u32
+	set_vif_proto_version		? vif_name:txt & proto_version:u32;
 
 	/**
 	 * Reset the protocol version per interface to its default value.
 	 * 
 	 * @param vif_name the name of the vif to apply to.
 	 */
-	reset_vif_proto_version		? vif_name:txt
+	reset_vif_proto_version		? vif_name:txt;
 
 	/**
 	 * Get the IP Router Alert option check per interface for received
@@ -80,7 +80,7 @@
 	 * @param enabled if true, then the IP Router Alert option check was
 	 * enabled, otherwise it was disabled.
 	 */
-	get_vif_ip_router_alert_option_check	? vif_name:txt -> enabled:bool
+	get_vif_ip_router_alert_option_check	? vif_name:txt -> enabled:bool;
 
 	/**
 	 * Set the IP Router Alert option check per interface for received
@@ -90,7 +90,7 @@
 	 * @param enable if true, then enable the IP Router Alert option check,
 	 * otherwise disable it.
 	 */
-	set_vif_ip_router_alert_option_check	? vif_name:txt & enable:bool
+	set_vif_ip_router_alert_option_check	? vif_name:txt & enable:bool;
 
 	/**
 	 * Reset the IP Router Alert option check for received packets per
@@ -98,7 +98,7 @@
 	 *
 	 * @param vif_name the name of the vif to apply to.
 	 */
-	reset_vif_ip_router_alert_option_check	? vif_name:txt
+	reset_vif_ip_router_alert_option_check	? vif_name:txt;
 
 	/**
 	 * Get the Query Interval per interface.
@@ -110,7 +110,7 @@
 	 */
 	get_vif_query_interval			? vif_name:txt		\
 						-> interval_sec:u32	\
-						& interval_usec:u32
+						& interval_usec:u32;
 
 	/**
 	 * Set the Query Interval per interface.
@@ -122,14 +122,14 @@
 	 */
 	set_vif_query_interval			? vif_name:txt		\
 						& interval_sec:u32	\
-						& interval_usec:u32
+						& interval_usec:u32;
 
 	/**
 	 * Reset the Query Interval per interface to its default value.
 	 *
 	 * @param vif_name the name of the vif to apply to.
 	 */
-	reset_vif_query_interval		? vif_name:txt
+	reset_vif_query_interval		? vif_name:txt;
 
 	/**
 	 * Get the Last Member Query Interval per interface.
@@ -141,7 +141,7 @@
 	 */
 	get_vif_query_last_member_interval	? vif_name:txt		\
 						-> interval_sec:u32	\
-						& interval_usec:u32
+						& interval_usec:u32;
 
 	/**
 	 * Set the Last Member Query Interval per interface.
@@ -153,7 +153,7 @@
 	 */
 	set_vif_query_last_member_interval	? vif_name:txt		\
 						& interval_sec:u32	\
-						& interval_usec:u32
+						& interval_usec:u32;
 
 	/**
 	 * Reset the Last Member Query Interval per interface to its
@@ -161,7 +161,7 @@
 	 *
 	 * @param vif_name the name of the vif to apply to.
 	 */
-	reset_vif_query_last_member_interval	? vif_name:txt
+	reset_vif_query_last_member_interval	? vif_name:txt;
 
 	/**
 	 * Get the Query Response Interval per interface.
@@ -173,7 +173,7 @@
 	 */
 	get_vif_query_response_interval		? vif_name:txt		\
 						-> interval_sec:u32	\
-						& interval_usec:u32
+						& interval_usec:u32;
 
 	/**
 	 * Set the Query Response Interval per interface.
@@ -185,7 +185,7 @@
 	 */
 	set_vif_query_response_interval		? vif_name:txt		\
 						& interval_sec:u32	\
-						& interval_usec:u32
+						& interval_usec:u32;
 
 	/**
 	 * Reset the Query Response Interval per interface to its
@@ -193,7 +193,7 @@
 	 *
 	 * @param vif_name the name of the vif to apply to.
 	 */
-	reset_vif_query_response_interval	? vif_name:txt
+	reset_vif_query_response_interval	? vif_name:txt;
 
 	/**
 	 * Get the Robustness Variable count per interface.
@@ -202,7 +202,7 @@
 	 * @param robust_count the count value.
 	 */
 	get_vif_robust_count			? vif_name:txt		\
-						-> robust_count:u32
+						-> robust_count:u32;
 
 	/**
 	 * Set the Robustness Variable count per interface.
@@ -211,7 +211,7 @@
 	 * @param robust_count the count value.
 	 */
 	set_vif_robust_count			? vif_name:txt		\
-						& robust_count:u32
+						& robust_count:u32;
 
 	/**
 	 * Reset the Robustness Variable count per interface to its
@@ -219,7 +219,7 @@
 	 *
 	 * @param vif_name the name of the vif to apply to.
 	 */
-	reset_vif_robust_count			? vif_name:txt
+	reset_vif_robust_count			? vif_name:txt;
 
 	/**
 	 * Enable/disable the MLD6IGMP trace log for all operations.
@@ -227,7 +227,7 @@
 	 * @param enable if true, then enable the trace log, otherwise
 	 * disable it.
 	 */
-	log_trace_all	? enable:bool
+	log_trace_all	? enable:bool;
 
 	/**
 	 * Add/delete a client protocol in the MLD/IGMP protocol.
@@ -247,15 +247,15 @@
 	/* TODO: the protocol names have to be globally defined */
 	add_protocol4	? xrl_sender_name:txt				\
 			& protocol_name:txt & protocol_id:u32		\
-			& vif_name:txt & vif_index:u32
+			& vif_name:txt & vif_index:u32;
 	add_protocol6	? xrl_sender_name:txt				\
 			& protocol_name:txt & protocol_id:u32		\
-			& vif_name:txt & vif_index:u32
+			& vif_name:txt & vif_index:u32;
 	
 	delete_protocol4 ? xrl_sender_name:txt				\
 			& protocol_name:txt & protocol_id:u32		\
-			& vif_name:txt & vif_index:u32
+			& vif_name:txt & vif_index:u32;
 	delete_protocol6 ? xrl_sender_name:txt				\
 			& protocol_name:txt & protocol_id:u32		\
-			& vif_name:txt & vif_index:u32
+			& vif_name:txt & vif_index:u32;
 }

Modified: trunk/xorp/xrl/interfaces/mld6igmp_client.xif
===================================================================
--- trunk/xorp/xrl/interfaces/mld6igmp_client.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/mld6igmp_client.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -18,14 +18,14 @@
 	 */
 	add_membership4		? xrl_sender_name:txt			\
 				& vif_name:txt & vif_index:u32		\
-				& source:ipv4 & group:ipv4
+				& source:ipv4 & group:ipv4;
 	add_membership6		? xrl_sender_name:txt			\
 				& vif_name:txt & vif_index:u32		\
-				& source:ipv6 & group:ipv6
+				& source:ipv6 & group:ipv6;
 	delete_membership4	? xrl_sender_name:txt			\
 				& vif_name:txt & vif_index:u32		\
-				& source:ipv4 & group:ipv4
+				& source:ipv4 & group:ipv4;
 	delete_membership6	? xrl_sender_name:txt			\
 				& vif_name:txt & vif_index:u32		\
-				& source:ipv6 & group:ipv6
+				& source:ipv6 & group:ipv6;
 }

Modified: trunk/xorp/xrl/interfaces/olsr4.xif
===================================================================
--- trunk/xorp/xrl/interfaces/olsr4.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/olsr4.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -18,7 +18,7 @@
      * @param enable set to true to enable, false to disable.
      */
     trace ? tvar:txt \
-	    & enable:bool
+	    & enable:bool;
 
 
     /*
@@ -28,7 +28,7 @@
     /**
      * Clear all OLSR protocol databases.
      */
-    clear_database
+    clear_database;
 
 
     /*
@@ -40,24 +40,24 @@
      *
      * @param willingness the new willingness-to-forward.
      */
-    set_willingness ? willingness:u32
+    set_willingness ? willingness:u32;
 
     /**
      * Get the willingness-to-forward.
      */
-    get_willingness -> willingness:u32
+    get_willingness -> willingness:u32;
 
     /**
      * Set the MPR_COVERAGE.
      *
      * @param coverage the new MPR_COVERAGE value.
      */
-    set_mpr_coverage ? coverage:u32
+    set_mpr_coverage ? coverage:u32;
 
     /**
      * Get the MPR_COVERAGE.
      */
-    get_mpr_coverage -> coverage:u32
+    get_mpr_coverage -> coverage:u32;
 
     /**
      * Set the TC_REDUNDANCY.
@@ -65,34 +65,34 @@
      * @param coverage the new TC_REDUNDANCY value as follows:
      *  "mprs" "mprs-and-selectors" "all"
      */
-    set_tc_redundancy ? redundancy:txt
+    set_tc_redundancy ? redundancy:txt;
 
     /**
      * Get the TC_REDUNDANCY.
      */
-    get_tc_redundancy -> redundancy:txt
+    get_tc_redundancy -> redundancy:txt;
 
     /**
      * Enable/disable TC fisheye mode.
      *
      * @param enabled true to enable fisheye, false to disable it.
      */
-    set_tc_fisheye ? enabled:bool
+    set_tc_fisheye ? enabled:bool;
 
     /**
      * Get the current TC fisheye mode.
      */
-    get_tc_fisheye -> enabled:bool
+    get_tc_fisheye -> enabled:bool;
 
     /**
      * Set the current HNA base cost metric.
      */
-    set_hna_base_cost ? metric:u32
+    set_hna_base_cost ? metric:u32;
 
     /**
      * Get the current HNA base cost metric.
      */
-    get_hna_base_cost -> metric:u32
+    get_hna_base_cost -> metric:u32;
 
 
     /*
@@ -104,84 +104,84 @@
      *
      * @param interval the new HELLO_INTERVAL.
      */
-    set_hello_interval ? interval:u32
+    set_hello_interval ? interval:u32;
 
     /**
      * Get the HELLO_INTERVAL.
      */
-    get_hello_interval -> interval:u32
+    get_hello_interval -> interval:u32;
 
     /**
      * Set the REFRESH_INTERVAL.
      *
      * @param interval the new REFRESH_INTERVAL.
      */
-    set_refresh_interval ? interval:u32
+    set_refresh_interval ? interval:u32;
 
     /**
      * Get the REFRESH_INTERVAL.
      */
-    get_refresh_interval -> interval:u32
+    get_refresh_interval -> interval:u32;
 
     /**
      * Set the TC_INTERVAL.
      *
      * @param interval the new TC_INTERVAL.
      */
-    set_tc_interval ? interval:u32
+    set_tc_interval ? interval:u32;
 
     /**
      * Get the TC_INTERVAL.
      */
-    get_tc_interval -> interval:u32
+    get_tc_interval -> interval:u32;
 
     /**
      * Set the MID_INTERVAL.
      *
      * @param interval the new MID_INTERVAL.
      */
-    set_mid_interval ? interval:u32
+    set_mid_interval ? interval:u32;
 
     /**
      * Get the MID_INTERVAL.
      */
-    get_mid_interval -> interval:u32
+    get_mid_interval -> interval:u32;
 
     /**
      * Set the HNA_INTERVAL.
      *
      * @param interval the new HNA_INTERVAL.
      */
-    set_hna_interval ? interval:u32
+    set_hna_interval ? interval:u32;
 
     /**
      * Get the HNA_INTERVAL.
      */
-    get_hna_interval -> interval:u32
+    get_hna_interval -> interval:u32;
 
     /**
      * Set the DUP_HOLD_TIME.
      *
      * @param dup_hold_time the new DUP_HOLD_TIME.
      */
-    set_dup_hold_time ? dup_hold_time:u32
+    set_dup_hold_time ? dup_hold_time:u32;
 
     /**
      * Get the DUP_HOLD_TIME.
      */
-    get_dup_hold_time -> dup_hold_time:u32
+    get_dup_hold_time -> dup_hold_time:u32;
 
     /**
      * Set the main address.
      *
      * @param addr Our main IPv4 address which OLSR uses as a router ID.
      */
-    set_main_address ? addr:ipv4
+    set_main_address ? addr:ipv4;
 
     /**
      * Get the main address.
      */
-    get_main_address -> addr:ipv4
+    get_main_address -> addr:ipv4;
 
 
     /*
@@ -217,7 +217,7 @@
 		 & local_addr:ipv4		\
 		 & local_port:u32		\
 		 & all_nodes_addr:ipv4		\
-		 & all_nodes_port:u32
+		 & all_nodes_port:u32;
 
     /**
      * Destroy an IPv4 address binding for OLSR.
@@ -226,7 +226,7 @@
      * @param vifname the vif to unbind.
      */
     unbind_address ? ifname:txt			\
-		   & vifname:txt
+		   & vifname:txt;
 
     /**
      * Set the enabled state of an IPv4 address binding for OLSR.
@@ -239,7 +239,7 @@
      */
     set_binding_enabled ? ifname:txt		\
 		        & vifname:txt		\
-		        & enabled:bool
+		        & enabled:bool;
 
     /**
      * Get the state of an IPv4 address binding for OLSR.
@@ -251,7 +251,7 @@
      */
     get_binding_enabled ? ifname:txt		\
 		        & vifname:txt		\
-		        -> enabled:bool
+		        -> enabled:bool;
 
     /**
      * Change the UDP address and port where OLSR listens for
@@ -268,7 +268,7 @@
     change_local_addr_port ? ifname:txt		\
 			   & vifname:txt	\
 			   & local_addr:ipv4	\
-			   & local_port:u32
+			   & local_port:u32;
 
     /**
      * Change the address where OLSR sends control traffic
@@ -286,7 +286,7 @@
     change_all_nodes_addr_port ? ifname:txt		\
 			       & vifname:txt		\
 			       & all_nodes_addr:ipv4	\
-			       & all_nodes_port:u32
+			       & all_nodes_port:u32;
 
     /*
      * Interface properties.
@@ -298,7 +298,7 @@
      * Return a list of u32 type values. Each value is an internal
      * ID that can be used with the get_interface_info XRL.
      */
-    get_interface_list -> interfaces:list<u32>
+    get_interface_list -> interfaces:list<u32>;
 
     /**
      * Get the per-interface information for the given interface.
@@ -318,7 +318,7 @@
 	& local_addr:ipv4			\
 	& local_port:u32			\
 	& all_nodes_addr:ipv4			\
-	& all_nodes_port:u32
+	& all_nodes_port:u32;
 
     /**
      * Set the edge cost of an interface/vif.
@@ -329,7 +329,7 @@
      */
     set_interface_cost ? ifname:txt		\
 		       & vifname:txt		\
-		       & cost:u32
+		       & cost:u32;
 
     /**
      * Get the per-interface statistics for the given interface.
@@ -356,7 +356,7 @@
 			& messages_from_self:u32 \
 			& unknown_messages:u32	\
 			& duplicates:u32	\
-			& forwarded:u32
+			& forwarded:u32;
 
 
     /*
@@ -369,7 +369,7 @@
      * Return a list of u32 type values. Each value is an internal
      * ID that can be used with the get_link_info XRL.
      */
-    get_link_list -> links:list<u32>
+    get_link_list -> links:list<u32>;
 
     /**
      * Get the information for a one-hop link.
@@ -397,7 +397,7 @@
 	& link_type:u32					\
 	& sym_time:u32					\
 	& asym_time:u32					\
-	& hold_time:u32
+	& hold_time:u32;
 
     /**
      * Get the list of one-hop neighbors.
@@ -405,7 +405,7 @@
      * Return a list of u32 type values. Each value is an internal
      * ID that can be used with the get_neighbor_info XRL.
      */
-    get_neighbor_list -> neighbors:list<u32>
+    get_neighbor_list -> neighbors:list<u32>;
 
     /**
      * Get the information for a one-hop neighbor.
@@ -436,7 +436,7 @@
 	& is_advertised:bool				\
 	& is_sym:bool					\
 	& is_mpr:bool					\
-	& is_mpr_selector:bool
+	& is_mpr_selector:bool;
 
     /**
      * Get the list of two-hop links.
@@ -444,7 +444,7 @@
      * Return a list of u32 type values. Each value is an internal
      * ID that can be used with the get_twohop_link_info XRL.
      */
-    get_twohop_link_list -> twohop_links:list<u32>
+    get_twohop_link_list -> twohop_links:list<u32>;
 
     /**
      * Get the information for a two-hop link.
@@ -464,7 +464,7 @@
 	last_face_id:u32				\
 	& nexthop_addr:ipv4				\
 	& dest_addr:ipv4				\
-	& hold_time:u32
+	& hold_time:u32;
 
     /**
      * Get the list of two-hop neighbors.
@@ -472,7 +472,7 @@
      * Return a list of u32 type values. Each value is an internal
      * ID that can be used with the get_twohop_neighbor_info XRL.
      */
-    get_twohop_neighbor_list -> twohop_neighbors:list<u32>
+    get_twohop_neighbor_list -> twohop_neighbors:list<u32>;
 
     /**
      * Get the information for a two-hop neighbor.
@@ -494,7 +494,7 @@
 	& is_strict:bool				\
 	& link_count:u32				\
 	& reachability:u32				\
-	& coverage:u32
+	& coverage:u32;
 
     /**
      * Get the list of learned Multiple Interface Declaration (MID)
@@ -503,7 +503,7 @@
      * Return a list of u32 type values. Each value is an internal
      * ID that can be used with the get_mid_entry XRL.
      */
-    get_mid_entry_list -> mid_entries:list<u32>
+    get_mid_entry_list -> mid_entries:list<u32>;
 
     /**
      * Get the information contained in a MID entry.
@@ -520,7 +520,7 @@
 	main_addr:ipv4					\
 	& iface_addr:ipv4				\
 	& distance:u32					\
-	& hold_time:u32
+	& hold_time:u32;
 
     /**
      * Get the list of learned Topology Control (TC) entries.
@@ -528,7 +528,7 @@
      * Return a list of u32 type values. Each value is an internal
      * ID that can be used with the get_tc_entry XRL.
      */
-    get_tc_entry_list -> tc_entries:list<u32>
+    get_tc_entry_list -> tc_entries:list<u32>;
 
     /**
      * Get the information contained in a TC entry.
@@ -547,7 +547,7 @@
 	& lasthop:ipv4					\
 	& distance:u32					\
 	& seqno:u32					\
-	& hold_time:u32
+	& hold_time:u32;
 
     /**
      * Get the list of learned external route (HNA) entries.
@@ -555,7 +555,7 @@
      * Return a list of u32 type values. Each value is an internal
      * ID that can be used with the get_hna_entry XRL.
      */
-    get_hna_entry_list -> hna_entries:list<u32>
+    get_hna_entry_list -> hna_entries:list<u32>;
 
     /**
      * Get the information contained in a HNA entry.
@@ -572,5 +572,5 @@
 	destination:ipv4net				\
 	& lasthop:ipv4					\
 	& distance:u32					\
-	& hold_time:u32
+	& hold_time:u32;
 }

Modified: trunk/xorp/xrl/interfaces/ospfv2.xif
===================================================================
--- trunk/xorp/xrl/interfaces/ospfv2.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/ospfv2.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -9,17 +9,17 @@
     /**
      * Set router id 
      */
-    set_router_id ? id:ipv4
+    set_router_id ? id:ipv4;
 
     /**
      * Set RFC 1583 compatibility.
      */
-    set_rfc1583_compatibility ? compatibility:bool
+    set_rfc1583_compatibility ? compatibility:bool;
 
     /**
      * Set the router alert in the IP options.
      */
-    set_ip_router_alert ? ip_router_alert:bool
+    set_ip_router_alert ? ip_router_alert:bool;
 
     /**
      * Create an area.
@@ -28,7 +28,7 @@
      * @param type of area "border", "stub", "nssa"
      */
     create_area_router ? area:ipv4 \
-		       & type:txt
+		       & type:txt;
 
     /**
      * Change area type.
@@ -37,14 +37,14 @@
      * @param type of area "border", "stub", "nssa"
      */
     change_area_router_type ?  area:ipv4 \
-		       & type:txt
+		       & type:txt;
 
     /**
      * Destroy area.
      *
      * @param area id of the area
      */
-    destroy_area_router ? area:ipv4
+    destroy_area_router ? area:ipv4;
 
     /**
      * Create a binding to an interface.
@@ -58,21 +58,21 @@
 		& vifname:txt \
 		& addr:ipv4 \
 		& type:txt \
-		& area:ipv4  
+		& area:ipv4;
 
     /**
      * Delete peer.
      *
      */
     delete_peer ? ifname:txt \
-		& vifname:txt
+		& vifname:txt;
 
     /**
      * Set the peer state up or down.
      */
     set_peer_state ? ifname:txt \
 		   & vifname:txt \
-		   & enable:bool
+		   & enable:bool;
 
     /**
      * Add a neighbour to the peer.
@@ -81,7 +81,7 @@
 		  & vifname:txt \
 		  & area:ipv4 \
 		  & neighbour_address:ipv4 \
-		  & neighbour_id:ipv4
+		  & neighbour_id:ipv4;
 
     /**
      * Remove a neighbour from the peer.
@@ -90,7 +90,7 @@
 		  & vifname:txt \
 		  & area:ipv4 \
 		  & neighbour_address:ipv4 \
-		  & neighbour_id:ipv4
+		  & neighbour_id:ipv4;
 
     /**
      * Create a virtual link.
@@ -101,14 +101,14 @@
      * be checked by the protocol.
      */
     create_virtual_link ? neighbour_id:ipv4 \
-			& area:ipv4
+			& area:ipv4;
 
     /**
      * Delete virtual link
      *
      * @param neighbour_id the router ID of the other end of the link.
      */
-    delete_virtual_link ? neighbour_id:ipv4
+    delete_virtual_link ? neighbour_id:ipv4;
      
     /**
      * The area through which the virtual link transits.
@@ -117,7 +117,7 @@
      * @param transit_area that the virtual link transits.
      */
     transit_area_virtual_link ? neighbour_id:ipv4 \
-			& transit_area:ipv4
+			& transit_area:ipv4;
 
     /**
      * The edge cost of this interface.
@@ -125,7 +125,7 @@
     set_interface_cost ? ifname:txt \
 		       & vifname:txt \
 		       & area:ipv4 \
-		       & cost:u32
+		       & cost:u32;
 
     /**
      * 	RxmtInterval
@@ -142,7 +142,7 @@
     set_retransmit_interval ? ifname:txt \
 		       & vifname:txt \
 		       & area:ipv4 \
-		       & interval:u32
+		       & interval:u32;
 
     /**
      * The estimated number of seconds it takes to transmit a Link
@@ -155,14 +155,14 @@
     set_inftransdelay ? ifname:txt \
 		       & vifname:txt \
 		       & area:ipv4 \
-		       & delay:u32
+		       & delay:u32;
     /**
      * Used in the designated router election.
      */
     set_router_priority ? ifname:txt \
 		       & vifname:txt \
 		       & area:ipv4 \
-		       & priority:u32
+		       & priority:u32;
 
     /**
      * The interval between hello messages.
@@ -170,7 +170,7 @@
     set_hello_interval ? ifname:txt \
 		       & vifname:txt \
 		       & area:ipv4 \
-		       & interval:u32
+		       & interval:u32;
 
     /**
      * The period to wait before considering a router dead.
@@ -178,7 +178,7 @@
     set_router_dead_interval ? ifname:txt \
 		       & vifname:txt \
 		       & area:ipv4 \
-		       & interval:u32
+		       & interval:u32;
 
     /**
      * Set simple password authentication key.
@@ -191,7 +191,7 @@
     set_simple_authentication_key	? ifname:txt			\
 					& vifname:txt			\
 					& area:ipv4			\
-					& password:txt
+					& password:txt;
 
     /**
      * Delete simple password authentication key.
@@ -202,7 +202,7 @@
      */
     delete_simple_authentication_key	? ifname:txt			\
 					& vifname:txt			\
-					& area:ipv4
+					& area:ipv4;
 
     /**
      * Set MD5 authentication key.
@@ -225,7 +225,7 @@
 					& password:txt			\
 					& start_time:txt		\
 					& end_time:txt			\
-					& max_time_drift:u32
+					& max_time_drift:u32;
 
     /**
      * Delete MD5 authentication key.
@@ -238,7 +238,7 @@
     delete_md5_authentication_key	? ifname:txt			\
 					& vifname:txt			\
 					& area:ipv4			\
-					& key_id:u32
+					& key_id:u32;
 
 
     /**
@@ -248,47 +248,47 @@
 		& vifname:txt \
 		& area:ipv4 \
 		& passive:bool \
-		& host:bool
+		& host:bool;
 	
     /**
      * If this is a "stub" or "nssa" area toggle the sending of a
      *	default route.
      */
     originate_default_route ? area:ipv4 \
-		& enable:bool
+		& enable:bool;
 
     /**
      * Set the StubDefaultCost, the default cost sent in a default route in
      * a "stub" or "nssa" area.
      */
     stub_default_cost ? area:ipv4 \
-		& cost:u32
+		& cost:u32;
 
     /**
      * Toggle the sending of summaries into "stub" or "nssa" areas.
      */
     summaries ? area:ipv4 \
-		& enable:bool
+		& enable:bool;
 
     /**
      * Add area range.
      */
     area_range_add ? area:ipv4 \
 		   & net:ipv4net \
-		   & advertise:bool	
+		   & advertise:bool;
 
     /**
      * Delete area range.
      */
     area_range_delete ? area:ipv4 \
-		      & net:ipv4net \
+		      & net:ipv4net;
 
     /**
      *  Change the advertised state of this area.
      */
     area_range_change_state ? area:ipv4 \
 			    & net:ipv4net \
-			    & advertise:bool	
+			    & advertise:bool;
 
 
      /**
@@ -298,7 +298,7 @@
       * @param enable set to true to enable false to disable.
       */
      trace ? tvar:txt \
-	& enable:bool
+	& enable:bool;
 
     /**
      * Get a single lsa from an area.
@@ -321,14 +321,14 @@
 	    valid:bool \
 	    & toohigh:bool \
 	    & self:bool \
-	    & lsa:binary
+	    & lsa:binary;
 
     /**
      * Get a list of all the configured areas.
      *
      * Return a list of u32 type values. Each value is an area ID.
      */
-    get_area_list -> areas:list<u32>
+    get_area_list -> areas:list<u32>;
 
     /**
      * Get the list of neighbours.
@@ -336,7 +336,7 @@
      * Return a list of u32 type values. Each value is an internal
      * identifier that can be used with the get_neighbour_info XRL.
      */
-    get_neighbour_list -> areas:list<u32>
+    get_neighbour_list -> areas:list<u32>;
 
     /**
      * Get information on a neighbour.
@@ -369,10 +369,10 @@
 	& dr:ipv4 \
 	& bdr:ipv4 \
 	& up:u32 \
-	& adjacent:u32
+	& adjacent:u32;
 
     /**
      * Clear the OSPF database.
      */
-    clear_database
+    clear_database;
 }

Modified: trunk/xorp/xrl/interfaces/ospfv3.xif
===================================================================
--- trunk/xorp/xrl/interfaces/ospfv3.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/ospfv3.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -9,17 +9,17 @@
     /**
      * Set instance id 
      */
-    set_instance_id ? id:u32
+    set_instance_id ? id:u32;
 
     /**
      * Set router id 
      */
-    set_router_id ? id:ipv4
+    set_router_id ? id:ipv4;
 
     /**
      * Set the router alert in the IP options.
      */
-    set_ip_router_alert ? ip_router_alert:bool
+    set_ip_router_alert ? ip_router_alert:bool;
 
     /**
      * Create an area.
@@ -28,7 +28,7 @@
      * @param type of area "border", "stub", "nssa"
      */
     create_area_router ? area:ipv4 \
-		       & type:txt
+		       & type:txt;
 
     /**
      * Change area type.
@@ -37,14 +37,14 @@
      * @param type of area "border", "stub", "nssa"
      */
     change_area_router_type ?  area:ipv4 \
-		       & type:txt
+		       & type:txt;
 
     /**
      * Destroy area.
      *
      * @param area id of the area
      */
-    destroy_area_router ? area:ipv4
+    destroy_area_router ? area:ipv4;
 
     /**
      * Create a binding to an interface.
@@ -57,20 +57,20 @@
     create_peer ? ifname:txt \
 		& vifname:txt \
 		& type:txt \
-		& area:ipv4  
+		& area:ipv4;
 
     /**
      * Delete peer.
      */
     delete_peer ? ifname:txt \
-		& vifname:txt
+		& vifname:txt;
 
     /**
      * Set the peer state up or down.
      */
     set_peer_state ? ifname:txt \
 		   & vifname:txt \
-		   & enable:bool
+		   & enable:bool;
 
     /**
      * Add an address to the peer.
@@ -78,7 +78,7 @@
     add_address_peer ? ifname:txt \
 		     & vifname:txt \
 	             & area:ipv4 \
-	             & addr:ipv6
+	             & addr:ipv6;
 
     /**
      * Remove an address from the peer.
@@ -86,7 +86,7 @@
     remove_address_peer ? ifname:txt \
 		        & vifname:txt \
 	                & area:ipv4 \
-	                & addr:ipv6
+	                & addr:ipv6;
 
     /**
      * Set the address state up or down.
@@ -95,7 +95,7 @@
 		           & vifname:txt \
 	                   & area:ipv4 \
                            & addr:ipv6 \
-		           & enable:bool
+		           & enable:bool;
 
     /**
      * Activate peer.
@@ -103,7 +103,7 @@
      */
     activate_peer ? ifname:txt \
 	          & vifname:txt \
-                  & area:ipv4
+                  & area:ipv4;
 
     /**
      * Update peer.
@@ -111,7 +111,7 @@
      */
     update_peer ? ifname:txt \
 		& vifname:txt \
-                & area:ipv4
+                & area:ipv4;
 
     /**
      * Add a neighbour to the peer.
@@ -120,7 +120,7 @@
 		  & vifname:txt \
 		  & area:ipv4 \
 		  & neighbour_address:ipv6 \
-		  & neighbour_id:ipv4
+		  & neighbour_id:ipv4;
 
     /**
      * Remove a neighbour from the peer.
@@ -129,7 +129,7 @@
 		  & vifname:txt \
 		  & area:ipv4 \
 		  & neighbour_address:ipv6 \
-		  & neighbour_id:ipv4
+		  & neighbour_id:ipv4;
 
     /**
      * Create a virtual link.
@@ -140,14 +140,14 @@
      * be checked by the protocol.
      */
     create_virtual_link ? neighbour_id:ipv4 \
-			& area:ipv4
+			& area:ipv4;
 
     /**
      * Delete virtual link
      *
      * @param neighbour_id the router ID of the other end of the link.
      */
-    delete_virtual_link ? neighbour_id:ipv4
+    delete_virtual_link ? neighbour_id:ipv4;
 
     /**
      * The area through which the virtual link transits.
@@ -156,7 +156,7 @@
      * @param transit_area that the virtual link transits.
      */
     transit_area_virtual_link ? neighbour_id:ipv4 \
-			& transit_area:ipv4
+			& transit_area:ipv4;
 
     /**
      * The edge cost of this interface.
@@ -164,7 +164,7 @@
     set_interface_cost ? ifname:txt \
 		       & vifname:txt \
 		       & area:ipv4 \
-		       & cost:u32
+		       & cost:u32;
 
     /**
      * 	RxmtInterval
@@ -181,7 +181,7 @@
     set_retransmit_interval ? ifname:txt \
 		       & vifname:txt \
 		       & area:ipv4 \
-		       & interval:u32
+		       & interval:u32;
 
     /**
      * The estimated number of seconds it takes to transmit a Link
@@ -194,7 +194,7 @@
     set_inftransdelay ? ifname:txt \
 		       & vifname:txt \
 		       & area:ipv4 \
-		       & delay:u32
+		       & delay:u32;
 
     /**
      * Used in the designated router election.
@@ -202,7 +202,7 @@
     set_router_priority ? ifname:txt \
 		       & vifname:txt \
 		       & area:ipv4 \
-		       & priority:u32
+		       & priority:u32;
 
     /**
      * The interval between hello messages.
@@ -210,7 +210,7 @@
     set_hello_interval ? ifname:txt \
 		       & vifname:txt \
 		       & area:ipv4 \
-		       & interval:u32
+		       & interval:u32;
 
     /**
      * The period to wait before considering a router dead.
@@ -218,54 +218,54 @@
     set_router_dead_interval ? ifname:txt \
 		       & vifname:txt \
 		       & area:ipv4 \
-		       & interval:u32
+		       & interval:u32;
     /**
      * Toggle the passive status of an interface.
      */
     set_passive ? ifname:txt \
 		& vifname:txt \
 		& area:ipv4 \
-		& passive:bool
+		& passive:bool;
 	
     /**
      * If this is a "stub" or "nssa" area toggle the sending of a
      *	default route.
      */
     originate_default_route ? area:ipv4 \
-		& enable:bool
+		& enable:bool;
 
     /**
      * Set the StubDefaultCost, the default cost sent in a default route in
      * a "stub" or "nssa" area.
      */
     stub_default_cost ? area:ipv4 \
-		& cost:u32
+		& cost:u32;
 
     /**
      * Toggle the sending of summaries into "stub" or "nssa" areas.
      */
     summaries ? area:ipv4 \
-		& enable:bool
+		& enable:bool;
 
     /**
      * Add area range.
      */
     area_range_add ? area:ipv4 \
 		   & net:ipv6net \
-		   & advertise:bool	
+		   & advertise:bool;
 
     /**
      * Delete area range.
      */
     area_range_delete ? area:ipv4 \
-		      & net:ipv6net \
+		      & net:ipv6net;
 
     /**
      *  Change the advertised state of this area.
      */
     area_range_change_state ? area:ipv4 \
 			    & net:ipv6net \
-			    & advertise:bool	
+			    & advertise:bool;
 
 
      /**
@@ -275,7 +275,7 @@
       * @param enable set to true to enable false to disable.
       */
      trace ? tvar:txt \
-	& enable:bool
+	& enable:bool;
 
     /**
      * Get a single lsa from an area.
@@ -298,14 +298,14 @@
 	    valid:bool \
 	    & toohigh:bool \
 	    & self:bool \
-	    & lsa:binary
+	    & lsa:binary;
 
     /**
      * Get a list of all the configured areas.
      *
      * Return a list of u32 type values. Each value is an area ID.
      */
-    get_area_list -> areas:list<u32>
+    get_area_list -> areas:list<u32>;
 
     /**
      * Get the list of neighbours.
@@ -313,7 +313,7 @@
      * Return a list of u32 type values. Each value is an internal
      * identifier that can be used with the get_neighbour_info XRL.
      */
-    get_neighbour_list -> areas:list<u32>
+    get_neighbour_list -> areas:list<u32>;
 
     /**
      * Get information on a neighbour.
@@ -346,10 +346,10 @@
 	& dr:ipv4 \
 	& bdr:ipv4 \
 	& up:u32 \
-	& adjacent:u32
+	& adjacent:u32;
 
     /**
      * Clear the OSPF database.
      */
-    clear_database
+    clear_database;
 }

Modified: trunk/xorp/xrl/interfaces/pim.xif
===================================================================
--- trunk/xorp/xrl/interfaces/pim.xif	2010-04-16 23:36:01 UTC (rev 11694)
+++ trunk/xorp/xrl/interfaces/pim.xif	2010-04-23 16:13:30 UTC (rev 11695)
@@ -14,9 +14,9 @@
 	 * @param enable if true, then enable the vif, otherwise
 	 * disable it.
 	 */
-	enable_vif	? vif_name:txt & enable:bool
-	start_vif	? vif_name:txt
-	stop_vif	? vif_name:txt
+	enable_vif	? vif_name:txt & enable:bool;
+	start_vif	? vif_name:txt;
+	stop_vif	? vif_name:txt;
 
 	/**
 	 * Enable/disable/start/stop all PIM vif interfaces.
@@ -24,9 +24,9 @@
 	 * @param enable if true, then enable the vifs, otherwise
 	 * disable them.
 	 */
-	enable_all_vifs	? enable:bool
-	start_all_vifs
-	stop_all_vifs
+	enable_all_vifs	? enable:bool;
+	start_all_vifs;
+	stop_all_vifs;
 	
 	/**
 	 * Enable/disable/start/stop the PIM protocol.
@@ -34,9 +34,9 @@
 	 * @param enable if true, then enable the PIM protocol, otherwise
 	 * disable it.
 	 */
-	enable_pim	? enable:bool
-	start_pim
-	stop_pim
+	enable_pim	? enable:bool;
+	start_pim;
+	stop_pim;
 
 	/**
 	 * Enable/disable/start/stop the PIM CLI access.
@@ -44,9 +44,9 @@
 	 * @param enable if true, then enable the PIM CLI access,
 	 * otherwise disable it.
 	 */
-	enable_cli	? enable:bool
-	start_cli
-	stop_cli
+	enable_cli	? enable:bool;
+	start_cli;
+	stop_cli;
 
 	/**
 	 * Enable/disable/start/stop BSR.
@@ -54,14 +54,14 @@
 	 * @param enable if true, then enable the BSR, otherwise
 	 * disable it.
 	 */
-	enable_bsr	? enable:bool
-	start_bsr
-	stop_bsr
+	enable_bsr	? enable:bool;
+	start_bsr;
+	stop_bsr;
 
 	/**
 	 * Apply BSR configuration changes.
 	 */
-	 apply_bsr_changes
+	 apply_bsr_changes;
 
 	/**
 	 * Add/delete scope zone.
@@ -73,21 +73,21 @@
 	 * scope zone.
 	 */
 	add_config_scope_zone_by_vif_name4?	scope_zone_id:ipv4net	\
-						& vif_name:txt
+						& vif_name:txt;
 	add_config_scope_zone_by_vif_name6?	scope_zone_id:ipv6net	\
-						& vif_name:txt
+						& vif_name:txt;
 	add_config_scope_zone_by_vif_addr4?	scope_zone_id:ipv4net	\
-						& vif_addr:ipv4
+						& vif_addr:ipv4;
 	add_config_scope_zone_by_vif_addr6?	scope_zone_id:ipv6net	\
-						& vif_addr:ipv6
+						& vif_addr:ipv6;
 	delete_config_scope_zone_by_vif_name4?	scope_zone_id:ipv4net	\
-						& vif_name:txt
+						& vif_name:txt;
 	delete_config_scope_zone_by_vif_name6?	scope_zone_id:ipv6net	\
-						& vif_name:txt
+						& vif_name:txt;
 	delete_config_scope_zone_by_vif_addr4?	scope_zone_id:ipv4net	\
-						& vif_addr:ipv4
+						& vif_addr:ipv4;
 	delete_config_scope_zone_by_vif_addr6?	scope_zone_id:ipv6net	\
-						& vif_addr:ipv6
+						& vif_addr:ipv6;
 
 	/**
 	 * Add/delete candidate-BSR configuration.
@@ -106,17 +106,17 @@
 					& vif_name:txt			\
 					& vif_addr:ipv4			\
 					& bsr_priority:u32		\
-					& hash_mask_len:u32
+					& hash_mask_len:u32;
 	add_config_cand_bsr6?		scope_zone_id:ipv6net		\
 					& is_scope_zone:bool		\
 					& vif_name:txt			\
 					& vif_addr:ipv6			\
 					& bsr_priority:u32		\
-					& hash_mask_len:u32
+					& hash_mask_len:u32;
 	delete_config_cand_bsr4		? scope_zone_id:ipv4net		\
-					& is_scope_zone:bool
+					& is_scope_zone:bool;
 	delete_config_cand_bsr6		? scope_zone_id:ipv6net		\
-					& is_scope_zone:bool
+					& is_scope_zone:bool;
 
 	/**
 	 * Add/delete Candidate-RP configuration.
@@ -135,21 +135,21 @@
 					& vif_name:txt			\
 					& vif_addr:ipv4			\
 					& rp_priority:u32		\
-					& rp_holdtime:u32
+					& rp_holdtime:u32;
 	add_config_cand_rp6		? group_prefix:ipv6net		\
 					& is_scope_zone:bool		\
 					& vif_name:txt			\
 					& vif_addr:ipv6			\
 					& rp_priority:u32		\
-					& rp_holdtime:u32
+					& rp_holdtime:u32;
 	delete_config_cand_rp4?		group_prefix:ipv4net		\
 					& is_scope_zone:bool		\
 					& vif_name:txt			\
-					& vif_addr:ipv4
+					& vif_addr:ipv4;
 	delete_config_cand_rp6?		group_prefix:ipv6net		\
 					& is_scope_zone:bool		\
 					& vif_name:txt			\
-					& vif_addr:ipv6
+					& vif_addr:ipv6;
 
 	/**
 	 * Add/delete/complete static RP configuration.
@@ -164,19 +164,19 @@
 	add_config_static_rp4		? group_prefix:ipv4net		\
 					& rp_addr:ipv4			\
 					& rp_priority:u32		\
-					& hash_mask_len:u32
+					& hash_mask_len:u32;
 	add_config_static_rp6		? group_prefix:ipv6net		\
 					& rp_addr:ipv6			\
 					& rp_priority:u32		\
-					& hash_mask_len:u32
+					& hash_mask_len:u32;
 	delete_config_static_rp4	? group_prefix:ipv4net		\
-					& rp_addr:ipv4
+					& rp_addr:ipv4;
 	delete_config_static_rp6	? group_prefix:ipv6net		\
-					& rp_addr:ipv6
-	delete_config_all_static_group_prefixes_rp4	? rp_addr:ipv4
-	delete_config_all_static_group_prefixes_rp6	? rp_addr:ipv6
-	delete_config_all_static_rps
-	config_static_rp_done
+					& rp_addr:ipv6;
+	delete_config_all_static_group_prefixes_rp4	? rp_addr:ipv4;
+	delete_config_all_static_group_prefixes_rp6	? rp_addr:ipv6;
+	delete_config_all_static_rps;
+	config_static_rp_done;
 
 	/**
 	 * Get the configured protocol version per interface.
@@ -184,7 +184,7 @@
 	 * @param vif_name the name of the vif to apply to.
 	 * @param proto_version the protocol version.
 	 */
-	get_vif_proto_version		? vif_name:txt -> proto_version:u32
+	get_vif_proto_version		? vif_name:txt -> proto_version:u32;
 
 	/**
 	 * Set the protocol version per interface.
@@ -192,14 +192,14 @@
 	 * @param vif_name the name of the vif to apply to.
 	 * @param proto_version the protocol version.
 	 */
-	set_vif_proto_version		? vif_name:txt & proto_version:u32
+	set_vif_proto_version		? vif_name:txt & proto_version:u32;
 
 	/**
 	 * Reset the protocol version per interface to its default value.
 	 * 
 	 * @param vif_name the name of the vif to apply to.
 	 */
-	reset_vif_proto_version		? vif_name:txt
+	reset_vif_proto_version		? vif_name:txt;
 
 	/**
 	 * Configure PIM Hello-related metrics.
@@ -224,34 +224,34 @@
 	 * @param accept_nohello_neighbors if true, accept neighbors that
 	 * didn't send a Hello message first.
 	 */
-	get_vif_hello_triggered_delay	? vif_name:txt -> hello_triggered_delay:u32

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From greear at users.sourceforge.net  Fri Apr 23 11:33:43 2010
From: greear at users.sourceforge.net (greear at users.sourceforge.net)
Date: Fri, 23 Apr 2010 18:33:43 +0000
Subject: [Xorp-cvs] SF.net SVN: xorp:[11696] trunk/xorp/SConstruct
Message-ID: <E1O5Nh9-0007PV-IE@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 11696
          http://xorp.svn.sourceforge.net/xorp/?rev=11696&view=rev
Author:   greear
Date:     2010-04-23 18:33:43 +0000 (Fri, 23 Apr 2010)

Log Message:
-----------
sparc:  Fix compile on systems with alignment warnings.

Disable -Werror for platforms other than x86.

Signed-off-by: Ben Greear <greearb at candelatech.com>

Modified Paths:
--------------
    trunk/xorp/SConstruct

Modified: trunk/xorp/SConstruct
===================================================================
--- trunk/xorp/SConstruct	2010-04-23 16:13:30 UTC (rev 11695)
+++ trunk/xorp/SConstruct	2010-04-23 18:33:43 UTC (rev 11696)
@@ -535,9 +535,22 @@
     ( 'BOOST_DISABLE_THREADS' ),
     ])
 
+# Some platforms have alignment warnings that cannot easily be
+# fixed, so we can't enable Werror for them.
+if (host_cpu == "i686" or
+    host_cpu == "x86_64"):
+        env.AppendUnique(CFLAGS = [
+	        '-Werror',
+		])
+	env.AppendUnique(CXXFLAGS = [
+		'-Werror',
+		])
+else:
+	print "WARNING:  Detected non x86 platform, will not enable -Werror compile option: ", host_cpu
+	
+
 # NOTE: gcc specific flags.
 env.AppendUnique(CFLAGS = [
-    '-Werror',
     '-W',
     '-Wall',
     '-Wwrite-strings',
@@ -553,7 +566,6 @@
     ])
 
 env.AppendUnique(CXXFLAGS = [
-    '-Werror',
     '-W',
     '-Wall',
     '-Wwrite-strings',


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From greear at users.sourceforge.net  Sun Apr 25 20:12:29 2010
From: greear at users.sourceforge.net (greear at users.sourceforge.net)
Date: Mon, 26 Apr 2010 03:12:29 +0000
Subject: [Xorp-cvs] SF.net SVN: xorp:[11697] trunk/xorp/LICENSE
Message-ID: <E1O6EkH-0006uJ-JU@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11697
          http://xorp.svn.sourceforge.net/xorp/?rev=11697&view=rev
Author:   greear
Date:     2010-04-26 03:12:29 +0000 (Mon, 26 Apr 2010)

Log Message:
-----------
license:  Submitters explicitly own copyright on submitted code.

I propose to update the LICENSE file to explicitly note that contributions
on or after today are copyright by the submitter unless otherwise specified
in the commit message and/or committed code.

This ensures that no single entity can re-license XORP or otherwise
take changes in the public svn tree and use or relicense them in ways not compatible
with the current license scheme (GPL, LGPL, other) without consent
of all committers from today on.  I believe this will help make
xorp stronger and it will certainly make me happier about committing
my changes to the public svn tree.

Signed-off-by: Ben Greear <greearb at candelatech.com>

Modified Paths:
--------------
    trunk/xorp/LICENSE

Modified: trunk/xorp/LICENSE
===================================================================
--- trunk/xorp/LICENSE	2010-04-23 18:33:43 UTC (rev 11696)
+++ trunk/xorp/LICENSE	2010-04-26 03:12:29 UTC (rev 11697)
@@ -1,11 +1,11 @@
-#
-# $XORP: xorp/LICENSE,v 1.11 2008/10/02 21:56:13 bms Exp $
-#
 
 With the exception of code derived from other sources, all XORP software
-is copyrighted by XORP, Inc. [Copyright (c) 2001-2009 XORP, Inc.].
-Files containing derived software are listed in the "LICENSE.other" file
-together with their corresponding copyrights and original licenses.
+committed prior to April 23, 2010 is copyrighted by
+XORP, Inc. [Copyright (c) 2001-2009 XORP, Inc.].  Changes committed
+on or after April 23, 2010 are copyrighted by the author unless
+otherwise specified in the commit message. Files containing derived
+software are listed in the "LICENSE.other" file together with their
+corresponding copyrights and original licenses.
 
 All XORP software is licensed under the GNU General Public License,
 Version 2, June 1991 contained in the "LICENSE.gpl" file unless


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From greear at users.sourceforge.net  Thu Apr 29 08:10:57 2010
From: greear at users.sourceforge.net (greear at users.sourceforge.net)
Date: Thu, 29 Apr 2010 15:10:57 +0000
Subject: [Xorp-cvs] SF.net SVN: xorp:[11698] trunk/xorp
Message-ID: <E1O7VOD-0002nm-0r@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 11698
          http://xorp.svn.sourceforge.net/xorp/?rev=11698&view=rev
Author:   greear
Date:     2010-04-29 15:10:56 +0000 (Thu, 29 Apr 2010)

Log Message:
-----------
libboost:  Remove use of boost-regex.

The rest of boost usage is not changed, but I think this will
make boost only a compile-time requirement, not run-time, which
in turn should help users installing binary packages.

Signed-off-by: Ben Greear <greearb at candelatech.com>

Modified Paths:
--------------
    trunk/xorp/SConstruct
    trunk/xorp/cli/SConscript
    trunk/xorp/cli/cli_command_pipe.hh
    trunk/xorp/policy/backend/instruction.hh
    trunk/xorp/policy/common/SConscript
    trunk/xorp/policy/common/policy_utils.cc
    trunk/xorp/site_scons/config/allconfig.py

Modified: trunk/xorp/SConstruct
===================================================================
--- trunk/xorp/SConstruct	2010-04-26 03:12:29 UTC (rev 11697)
+++ trunk/xorp/SConstruct	2010-04-29 15:10:56 UTC (rev 11698)
@@ -379,7 +379,7 @@
     # Additional Boost libraries
     #conf.CheckBoostLibrary('filesystem')
     #conf.CheckBoostLibrary('program_options')
-    conf.CheckBoostLibrary('regex')
+    #conf.CheckBoostLibrary('regex')
     #conf.CheckBoostLibrary('signals')
     #conf.CheckBoostLibrary('thread')
 

Modified: trunk/xorp/cli/SConscript
===================================================================
--- trunk/xorp/cli/SConscript	2010-04-26 03:12:29 UTC (rev 11697)
+++ trunk/xorp/cli/SConscript	2010-04-29 15:10:56 UTC (rev 11698)
@@ -58,9 +58,9 @@
     ])
 
 # External libraries.
-env.AppendUnique(LIBS = [
-    'boost_regex'
-])
+#env.AppendUnique(LIBS = [
+#    'boost_regex'
+#])
 
 env.Replace(RPATH = [
     env.Literal(env['xorp_tool_rpath'])

Modified: trunk/xorp/cli/cli_command_pipe.hh
===================================================================
--- trunk/xorp/cli/cli_command_pipe.hh	2010-04-26 03:12:29 UTC (rev 11697)
+++ trunk/xorp/cli/cli_command_pipe.hh	2010-04-29 15:10:56 UTC (rev 11698)
@@ -34,7 +34,16 @@
 #include <string>
 #include <list>
 
-#include <boost/regex.h>
+#ifdef HAVE_REGEX_H
+#  include <regex.h>
+#else // ! HAVE_REGEX_H
+#  ifdef HAVE_PCRE_H
+#    include <pcre.h>
+#  endif
+#  ifdef HAVE_PCREPOSIX_H
+#    include <pcreposix.h>
+#  endif
+#endif // ! HAVE_REGEX_H
 
 #include "cli_command.hh"
 

Modified: trunk/xorp/policy/backend/instruction.hh
===================================================================
--- trunk/xorp/policy/backend/instruction.hh	2010-04-26 03:12:29 UTC (rev 11697)
+++ trunk/xorp/policy/backend/instruction.hh	2010-04-29 15:10:56 UTC (rev 11698)
@@ -25,7 +25,16 @@
 
 #include "libxorp/xorp.h"
 
-#include <boost/cregex.hpp>
+#ifdef HAVE_REGEX_H
+#  include <regex.h>
+#else // ! HAVE_REGEX_H
+#  ifdef HAVE_PCRE_H
+#    include <pcre.h>
+#  endif
+#  ifdef HAVE_PCREPOSIX_H
+#    include <pcreposix.h>
+#  endif
+#endif // ! HAVE_REGEX_H
 
 #include "policy/common/element_base.hh"
 #include "policy/common/operator_base.hh"

Modified: trunk/xorp/policy/common/SConscript
===================================================================
--- trunk/xorp/policy/common/SConscript	2010-04-26 03:12:29 UTC (rev 11697)
+++ trunk/xorp/policy/common/SConscript	2010-04-29 15:10:56 UTC (rev 11698)
@@ -39,9 +39,9 @@
     ]
 
 # External libraries
-env.AppendUnique(LIBS = [
-    'boost_regex'
-])
+#env.AppendUnique(LIBS = [
+#    'boost_regex'
+#])
 
 is_shared = env.has_key('SHAREDLIBS')
 

Modified: trunk/xorp/policy/common/policy_utils.cc
===================================================================
--- trunk/xorp/policy/common/policy_utils.cc	2010-04-26 03:12:29 UTC (rev 11697)
+++ trunk/xorp/policy/common/policy_utils.cc	2010-04-29 15:10:56 UTC (rev 11698)
@@ -22,7 +22,16 @@
 
 #include "libxorp/xorp.h"
 
-#include <boost/regex.h>
+#ifdef HAVE_REGEX_H
+#  include <regex.h>
+#else // ! HAVE_REGEX_H
+#  ifdef HAVE_PCRE_H
+#    include <pcre.h>
+#  endif
+#  ifdef HAVE_PCREPOSIX_H
+#    include <pcreposix.h>
+#  endif
+#endif // ! HAVE_REGEX_H
 
 #include "policy_utils.hh"
 

Modified: trunk/xorp/site_scons/config/allconfig.py
===================================================================
--- trunk/xorp/site_scons/config/allconfig.py	2010-04-26 03:12:29 UTC (rev 11697)
+++ trunk/xorp/site_scons/config/allconfig.py	2010-04-29 15:10:56 UTC (rev 11698)
@@ -83,10 +83,10 @@
     has_pwd_h = conf.CheckHeader('pwd.h')
     has_mqueue_h = conf.CheckHeader('mqueue.h')
 
-    #prereq_regex_h = []
-    #if has_sys_types_h:
-    #	prereq_regex_h.append('sys/types.h')
-    #has_regex_h = conf.CheckHeader(prereq_regex_h + ['regex.h'])
+    prereq_regex_h = []
+    if has_sys_types_h:
+    	prereq_regex_h.append('sys/types.h')
+    has_regex_h = conf.CheckHeader(prereq_regex_h + ['regex.h'])
 
     has_syslog_h = conf.CheckHeader('syslog.h')
     has_termios_h = conf.CheckHeader('termios.h')
@@ -660,10 +660,10 @@
     ##########
     # pcre posix regexp emulation
     # used by policy for regexps.
-    #has_pcre_h = conf.CheckHeader('pcre.h')
-    #has_pcreposix_h = conf.CheckHeader('pcreposix.h')
-    #has_libpcre = conf.CheckLib('pcre')
-    #has_libpcreposix = conf.CheckLib('pcreposix')
+    has_pcre_h = conf.CheckHeader('pcre.h')
+    has_pcreposix_h = conf.CheckHeader('pcreposix.h')
+    has_libpcre = conf.CheckLib('pcre')
+    has_libpcreposix = conf.CheckLib('pcreposix')
     
     ##########
     # openssl for md5


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From greear at users.sourceforge.net  Thu Apr 29 22:45:15 2010
From: greear at users.sourceforge.net (greear at users.sourceforge.net)
Date: Fri, 30 Apr 2010 05:45:15 +0000
Subject: [Xorp-cvs] SF.net SVN: xorp:[11699] trunk/xorp
Message-ID: <E1O7j2J-0002I4-76@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11699
          http://xorp.svn.sourceforge.net/xorp/?rev=11699&view=rev
Author:   greear
Date:     2010-04-30 05:45:14 +0000 (Fri, 30 Apr 2010)

Log Message:
-----------
release:  Update release notes and similar, version to 1.7

Signed-off-by: Ben Greear <greearb at candelatech.com>

Modified Paths:
--------------
    trunk/xorp/BUGS
    trunk/xorp/BUILD_NOTES
    trunk/xorp/ERRATA
    trunk/xorp/README
    trunk/xorp/RELEASE_NOTES
    trunk/xorp/TODO
    trunk/xorp/VERSION
    trunk/xorp/etc/templates/xorpsh.cmds
    trunk/xorp/rtrmgr/master_conf_tree.cc

Modified: trunk/xorp/BUGS
===================================================================
--- trunk/xorp/BUGS	2010-04-29 15:10:56 UTC (rev 11698)
+++ trunk/xorp/BUGS	2010-04-30 05:45:14 UTC (rev 11699)
@@ -1,6 +1,3 @@
-#
-# $XORP$
-#
 
 * Please report bugs using Trac: http://sourceforge.net/apps/trac/xorp/
 

Modified: trunk/xorp/BUILD_NOTES
===================================================================
--- trunk/xorp/BUILD_NOTES	2010-04-29 15:10:56 UTC (rev 11698)
+++ trunk/xorp/BUILD_NOTES	2010-04-30 05:45:14 UTC (rev 11699)
@@ -1,6 +1,3 @@
-#
-# $XORP: xorp/BUILD_NOTES,v 1.116 2009/01/08 01:22:02 syedk Exp $
-#
 
 	Build Notes for XORP (eXtensible Open Router Platform)
 
@@ -8,10 +5,9 @@
 0. Preface
 ==========
 
-As of September 2009, much of the information in this file may be outdated,
-and should probably be moved to a Wiki. Some instructions refer to the
-old GNU Autotools based build system, which is now deprecated. SNMP support
-is currently deprecated and requires a rewrite.
+XORP builds on Linux and BSD variants that support the 'scons' build
+system and GNU g++ compiler toolset.  Please ask on the xorp-hackers
+mailing list if your preferred system is not currently supported.
 
 1. Compilation
 ==============
@@ -22,7 +18,8 @@
 To compile XORP, you must have SCons installed. Then just
 run the following commands in the top-level directory:
 
-scons
+scons -j4
+scons install
 
 To change the default C and C++ compilers, then assign the binary
 names to the CC and CXX user environmental variables respectively.
@@ -36,6 +33,9 @@
 those flags to the CFLAGS and CXXFLAGS environmental variables (for the
 C and C++ compiler respectively) before running "scons".
 
+For various compile options use:  scons --help
+
+
 1.2 Generating documentation
 ============================
 
@@ -303,44 +303,18 @@
 3.5. Linux
 ==========
 
-  * Linux Red Hat-7.2 (kernel 2.4.18):
-    - The code compiles, but some of the internal tests fail dumping core.
-      The problem is attributable to exception handler failures caused by
-      the default compiler/binutils combination.  More information is
-      available at:
-	http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=54724
-    - IGMP and PIM-SM appear to work.
+  * It is difficult to get distributions older than Fedora Core 5
+    to compile XORP 1.7, primarily due to scons and python dependencies.
 
-  * Linux Red Hat-7.3 (kernel 2.4-20):
-    - No known issues.
-    - The code should compile with the following versions of the
-      gcc/g++ compiler: 2.96 (default).
-
-  * Linux Red Hat-9.2 (kernel 2.4.20-8smp):
-    - You must install the following RPMs (and all other RPMs they depend on):
-      - openssl-devel (e.g., openssl-devel-0.9.7a-5.i386.rpm)
-      - ncurses (e.g., ncurses-5.3-4.i386.rpm)
-    - The code compiles, and the internal tests appear to succeed.
-
   * Linux Red Hat Enterprise Linux Server release 5 (Tikanga)
     (kernel 2.6.18-8.el5)
     - Optionally install the following packages:
       - libpcap-devel (e.g., libpcap-devel.x86_64)
         This package is needed for sending/receiving link layer data frames.
-      - net-snmp, net-snmp-utils, net-snmp-devel, net-snmp-perl
-        Those packages are needed for SNMP support.
     - The code compiles, and the internal tests appear to succeed.
     - gcc (GCC) 4.1.1 20070105 (Red Hat 4.1.1-52)
     - Tested on the following architectures: x86_64 (amd64)
 
-  * Linux Fedora Core2 (kernel 2.6.5-1.358):
-    - The code compiles, but some of the internal tests may fail.
-
-  * Linux Fedora Core4 (kernel 2.6.11-1.1369_FC4smp):
-    - The code compiles, and the internal tests appear to succeed
-      with the following compilers: gcc-4.0.0 (default), gcc-4.0.1,
-      gcc-4.0.2.
-
   * Linux Fedora Core5 (2.6.16-1.2080_FC5smp):
     - The code compiles, and the internal tests appear to succeed.
     - gcc (GCC) 4.1.0 20060304 (Red Hat 4.1.0-3)
@@ -364,8 +338,6 @@
     - Optionally install the following packages:
       - libpcap-devel
         This package is needed for sending/receiving link layer data frames.
-    - The code compiles, and the internal tests appear to succeed
-      except test33 in "bgp/harness/test_peering1.sh"
     - gcc (GCC) 4.3.0 20080428 (Red Hat 4.3.0-8)
 
   * Linux Fedora 10 (2.6.27.5-117.fc10.i686):
@@ -397,12 +369,6 @@
       Either create a link from gcc to gcc-3.3 and from g++ to g++-3.3,
       or set the CC and CXX environments to point to the binary names.
       E.g., in csh/tcsh: setenv CC gcc-3.3; setenv CXX g++-3.3
-    - If you see an error like the following when compiling with make/gmake:
-        python ../../xrl/scripts/tgt-gen -I../../xrl/interfaces finder.tgt
-        sh: line 1: cpp: command not found
-      then you would need to create a link from cpp to the C preprocessor.
-      E.g., if the C preprocessor is /usr/bin/cpp-3.3, then execute as root:
-        cd /usr/bin; ln -s cpp-3.3 cpp
     - The code compiles, and the internal tests appear to succeed.
     - gcc-3.3 (GCC) 3.3.5 (Debian 1:3.3.5-13)
 
@@ -448,11 +414,6 @@
 
   * Linux Ubuntu-7.04 (Server Edition, kernel 2.6.20-15-server):
     - You must install the following packages:
-      - make
-        Note that the installed binary name is "make" so you need
-        to run "make" instead of "gmake" to compile the source code.
-        Alternatively, add "gmake" as a symbolic link to "make":
-        cd /usr/bin; ln -s make gmake
       - libssl-dev (e.g., version 0.9.8c-4build1)
       - gcc (e.g., gcc-4.1)
       - g++ (e.g., g++-4.1)
@@ -467,19 +428,12 @@
 
   * Linux Ubuntu-7.10 (Server Edition, kernel 2.6.22-14-server):
     - You must install the following packages:
-      - make
-        Note that the installed binary name is "make" so you need
-        to run "make" instead of "gmake" to compile the source code.
-        Alternatively, add "gmake" as a symbolic link to "make":
-        cd /usr/bin; ln -s make gmake
       - libssl-dev (e.g., version 0.9.8e-5ubuntu3.1)
       - gcc (e.g., gcc-4.1)
       - g++ (e.g., g++-4.1)
     - Optionally install the following packages:
       - libpcap0.8-dev
         This package is needed for sending/receiving link layer data frames.
-      - snmpd and libsnmp-dev
-        Those packages are needed for SNMP support.
       - iptables-dev
         This package is needed for configuring firewall rules using XORP.
     - The code compiles, and the internal tests appear to succeed.
@@ -488,19 +442,12 @@
 
   * Linux Ubuntu-8.04.1 (Server Edition, kernel 2.6.24-19-server):
     - You must install the following packages:
-      - make
-        Note that the installed binary name is "make" so you need
-        to run "make" instead of "gmake" to compile the source code.
-        Alternatively, add "gmake" as a symbolic link to "make":
-        cd /usr/bin; ln -s make gmake
       - libssl-dev (e.g., version 0.9.8g-4ubuntu3.3)
       - gcc (e.g., gcc-4.2)
       - g++ (e.g., g++-4.2)
     - Optionally install the following packages:
       - libpcap0.8-dev
         This package is needed for sending/receiving link layer data frames.
-      - snmpd and libsnmp-dev
-        Those packages are needed for SNMP support.
       - iptables-dev
         This package is needed for configuring firewall rules using XORP.
     - The code compiles, and the internal tests appear to succeed.
@@ -509,19 +456,12 @@
 
   * Linux Ubuntu-8.10 (Server Edition, kernel 2.6.27-7-server):
     - You must install the following packages:
-      - make
-        Note that the installed binary name is "make" so you need
-        to run "make" instead of "gmake" to compile the source code.
-        Alternatively, add "gmake" as a symbolic link to "make":
-        cd /usr/bin; ln -s make gmake
       - libssl-dev (e.g., 0.9.8g-10.1ubuntu2)
       - gcc (e.g., gcc-4.3)
       - g++ (e.g., g++-4.3)
     - Optionally install the following packages:
       - libpcap0.8-dev
         This package is needed for sending/receiving link layer data frames.
-      - snmpd and libsnmp-dev
-        Those packages are needed for SNMP support.
       - iptables-dev
         This package is needed for configuring firewall rules using XORP.
     - The code compiles, and the internal tests appear to succeed.
@@ -558,6 +498,7 @@
 
 3.6. Mac OS X
 =============
+  * NOTE:  I have no idea if XORP 1.7 on Mac OS X compiles at all. --Ben
 
   * All:
     - Unicast routing appears to work.
@@ -583,495 +524,26 @@
 
 3.7 Microsoft Windows
 =====================
+  * Not supported any longer.
 
-  * All:
-    - We encourage users to try XORP on newer, unsupported versions of
-      Windows and report their results to the development team.
-
-    - 64-bit versions of Windows are known not to support MinGW, and are
-      therefore not currently supported by XORP.
-
-    - For instructions how to build the XORP Installer for Windows
-      see xorp/contrib/win32/installer/README.
-
-    - NOTE WELL: If you are trying to build XORP with MinGW-current as of
-      31st July 2006, you will need to manually remove the
-      -Wmissing-declarations and -Wmissing-prototypes warning flags from
-      the CPARANOIDFLAGS variable in XORP's configure script in order
-      to build XORP without interruption.
-      This is due to the new way that MSVCRT inline functions are dealt
-      with in the mingw-runtime system headers. No other workaround
-      is known at this time.
-
-  * Windows Server 2003 (Service Pack 1) (32-bit, x86):
-    - XORP is only supported on Windows Server 2003, and is targeted for
-      32-bit x86 systems.
-
-    - If a Win32 support patch is shipped for your release, please apply
-      it before filing bug reports with the core team.
-
-    - Unicast routing appears to work.
-    - All regression tests pass as of XORP 1.2.
-    - IPv6 is not supported.
-    - RTMv2 is not supported.
-    - Multicast is not supported.
-
-    - The code compiles using the MinGW port of gcc 3.4.2, using the
-      MSYS shell environment.
-
-    - Instructions for building XORP on Windows Server are identical
-      to those for building XORP on a UNIX platform. However, the
-      following caveats apply.
-
-      * If you specify the --with-openssl option to configure, it may be
-        propagated to the libtecla build, causing the top-level make to break.
-
-      * Any paths passed to the configure script must be in MinGW UNIX-style
-        format. Example: 'C:\XORP' becomes '/c/xorp'.
-
-      A patch must be manually applied to the MinGW toolchain before
-      attempting to build XORP, as we use API functions which are present in
-      the Windows SDK but which are not yet present in the system headers
-      which ship with MinGW as of May 2006.
-
-      You MAY need to bracket references to off_t in MinGW's <unistd.h>
-      header with '#if 0'.
-
-      The patch may be found in the xorp/contrib/win32 directory.
-
-      * Download the source for w32api-3.7 from mingw.org and untar it
-        into a writable location.
-      * Change into this directory.
-      * Apply the w32api-3.7-xorp.patch to this tree with 'patch -p1'.
-      * From within the w32api-3.7 directory, run ./configure --prefix=/usr
-        to ensure that the existing w32api binary installation will be
-        overwritten.
-        (The paths under the MinGW / are aliased under /usr too, but the
-        w32api makefiles are confused by a single slash in their PREFIX.)
-      * make && make install
-
-      If you encounter any problems, please send the output of the command
-      "msysinfo all" and contact the XORP development team with this
-      information.
-
-    - We recommend that you install MinGW, MSYS, and the required GNU/Win32
-      ports under the path C:\MinGW\, in that order.
-
-    - We recommend that you initially use the Nullsoft Installer which
-      is now shipping on MinGW.org to install the 'current' version of
-      the base MinGW tools.
-
-    - Once the base MinGW installation is complete, you should then
-      manually update the toolchain which this program installs by
-      downloading and untarring the following packages in the root of
-      your MinGW installation.
-
-       * MSYS-1.0.11-2004
-       * binutils-2.15.91
-       * gcc-g++
-       * gcc-core
-       * gdb-6.3-1
-       * mingw-runtime
-       * mingw-utils
-       * mingw32-make
-       * msysDTK-1.0.0
-       * w32api-3.7
-
-    - Make sure that symbolic links or copies of mingw32-make.exe as
-      make.exe and gmake.exe respectively in your MinGW path.
-
-    - You must install the following GNU/Win32 ports:-
-
-       * openssl-bin (Binaries)
-       * openssl-lib (Developer files)
-       * pcre-bin (Binaries)
-       * pcre-lib (Developer files)
-
-      They may be found at: http://gnuwin32.sourceforge.net/packages.html
-
-    - You must install Python for Windows if you intend to run the
-      regression tests. This may be found at: http://www.python.org/download/
-
-      The path to the python.exe binary must either be present in PATH after
-      installation, or a symlink created in the MinGW environment.
-
-    - In certain cases the compilation might try to use Python to
-      auto-generate some files. In that case, one possible work-around
-      solution would be install Python. However, if the compilation
-      fails with an error like:
-
-/c/python24/python ../../xrl/scripts/tgt-gen -I../../xrl/interfaces bgp.tgt
-process_begin: CreateProcess((null), /c/python24/python ../../xrl/scripts/tgt-gen -I../../xrl/interfaces bgp.tgt, ...) failed.
-make (e=3): The system cannot find the path specified.
-
-      then try using the following command in the top-level XORP directory:
-
-      env PYTHON=C:/dos/style/path/to/python.exe ./configure
-
-    - The RunShellCommand class has a hard-coded path to the MSYS shell.
-      This is currently a no-op because the router manager no longer uses
-      this class for running XORP modules.
-
-    - To take a full BGP route feed, a registry key must be updated:
-      HKLM\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters
-      must be set to 0xFFFFFFFF. Be warned that this removes the upper
-      limit on use of nonpageable system memory for kernel FIB entries;
-      if the kernel FIB memory requirements ever exceed physical memory,
-      the NT kernel will panic.
-
-      The XORP installer has a property page which allows this to be set
-      by the administrator, but it does not roll back these settings when
-      XORP is uninstalled.
-
-    - If the Windows Routing and Remote Access (RRAS) service is running,
-      the XORP FEA process may not be able to update the Windows IPv4
-      routing tables. The FEA will detect when this service is running
-      and print a warning message to the XORP process log.
-
-    - The XORP Shell (xorpsh.exe) should be run from within a native
-      Win32 command prompt. If run from within any other kind of shell,
-      it may not work.
-
-  * Windows 'Longhorn' Server (Build 5384) (32-bit, x86):
-    - XORP is known to compile on this operating system, but is currently
-      unsupported, with the following caveats as they apply to the
-      instructions given for building under Windows Server 2003:
-
-      * MinGW and MSYS must be installed in separate directories in order
-        to work.
-      * As such, MSYSROOT must be set to point to the MSYS root directory,
-        and links/copies of sh.exe and bash.exe made in the MinGW tree.
-      * The GnuWin32 utilities should be installed in the MinGW tree.
-      * The latest bleeding-edge MinGW toolchain is in use (g++ 3.4.5).
-      * ActiveState Python is known to install correctly; the open source
-        Python will not.
-
-      The following points only apply to the use of the XORP tinderbox:
-      * A copy or link of sh.exe as bash.exe must be made for the BGP
-        regression tests to run.
-      * CopSSH does not install under Vista or Longhorn.
-      * SSH for Windows does not install under Vista or Longhorn.
-      * Subsystem for UNIX Applications (SUA), as an alternative means of
-        running sshd, is not ready as of this writing for Vista or Longhorn.
-
-  * Windows Vista Ultimate Beta (Build 5384) (32-bit, x86):
-    - The binary snapshots for Windows Server 2003 are known to run on
-      this operating system, but are not officially supported.
-
 3.8. Cross-compilation
 ======================
+  * Not supported at this time, but may not be difficult to enable.
 
-  * All:
-    - Running the "gmake check" internal tests within the
-      cross-compilation environment will not work, unless the build
-      machine is capable of running the cross-compiled binaries for the
-      target architecture.
- 
-  * IA-64
-    - The code is known to cross-compile on Linux, but it is unknown
-      whether the internal tests succeed.
-      XORP itself hasn't been tested on IA-64 machine, so it is unknown
-      whether it will run properly.
-
-  * MIPS (Broadcom for Linksys WRT54G)
-    - The code is known to cross-compile on Linux, but it is unknown
-      whether the internal tests succeed.
-      XORP itself hasn't been tested on Linksys WRT54, so it is unknown
-      whether it will run properly.
-
-  * PowerPC-603
-    - The code is known to cross-compile on Linux, but it is unknown
-      whether the internal tests succeed.
-      XORP itself hasn't been tested on PowerPC-603 machine, so it is
-      unknown whether it will run properly.
-
-  * Sparc64
-    - The code is known to cross-compile on Linux, but it is unknown
-      whether the internal tests succeed.
-      XORP itself hasn't been tested on Sparc64 machine, so it is unknown
-      whether it will run properly.
-
-  * XScale
-    - The code is known to cross-compile on Linux, but it is unknown
-      whether the internal tests succeed.
-      XORP appears to run on Linux MontaVista-3.1, but it hasn't been
-      tested thoughtfully.
-
-  * Instructions for installing crosstool-based cross-compilation tools.
-
-    Use the following instructions to install cross-compilation tools
-    and use those tools to compile XORP:
-
-    a) Download crosstool from http://kegel.com/crosstool/ and untar it:
-
-       wget http://kegel.com/crosstool/crosstool-0.42.tar.gz
-       tar zxvf crosstool-0.42.tar.gz
-       cd crosstool-0.42
-
-    b) Apply one of the following patches:
-
-       - IA-64
-         patch < demo-ia64.sh.patch
-
-----------------------------------------------------------------------
---- demo-ia64.sh.org	2005-03-09 13:49:19.000000000 -0800
-+++ demo-ia64.sh	2006-10-18 17:37:25.000000000 -0700
-@@ -18,6 +18,7 @@
- #eval `cat ia64.dat gcc-3.4.0-glibc-2.3.2.dat`        sh all.sh --notest
- #eval `cat ia64.dat gcc-3.4.1-glibc-2.3.2.dat`        sh all.sh --notest
- #eval `cat ia64.dat gcc-3.4.1-glibc-2.3.3.dat`        sh all.sh --notest
-- eval `cat ia64.dat gcc-3.4.2-glibc-2.3.3.dat`        sh all.sh --notest
-+# eval `cat ia64.dat gcc-3.4.2-glibc-2.3.3.dat`        sh all.sh --notest
-+ eval `cat ia64.dat gcc-3.4.5-glibc-2.3.6.dat`        sh all.sh --notest
- 
- echo Done.
-----------------------------------------------------------------------
-
-       - MIPS (Broadcom for Linksys WRT54G)
-         patch < demo-mipsel.sh.patch
-
-----------------------------------------------------------------------
---- demo-mipsel.sh.org	2005-03-07 16:34:34.000000000 -0800
-+++ demo-mipsel.sh	2006-10-25 16:25:59.000000000 -0700
-@@ -33,8 +33,9 @@
- #eval `cat mipsel.dat gcc-3.4.0-glibc-2.3.2.dat`        sh all.sh --notest
- #eval `cat mipsel.dat gcc-3.4.1-glibc-2.2.5.dat`        sh all.sh --notest
- #eval `cat mipsel.dat gcc-3.4.1-glibc-2.3.2.dat`        sh all.sh --notest
-- eval `cat mipsel.dat gcc-3.4.2-glibc-2.2.5.dat`        sh all.sh --notest
-+# eval `cat mipsel.dat gcc-3.4.2-glibc-2.2.5.dat`        sh all.sh --notest
- #eval `cat mipsel.dat gcc-3.4.2-glibc-2.3.3.dat`        sh all.sh --notest
- #eval `cat mipsel.dat gcc-3.4.2-glibc-20040827.dat`        sh all.sh --notest
-+eval `cat mipsel.dat gcc-3.4.5-glibc-2.3.6.dat`        sh all.sh --notest
- 
- echo Done.
-----------------------------------------------------------------------
-
-       - PowerPC-603
-         cp -p demo-ppc604.sh demo-ppc603.sh
-         patch < demo-ppc603.sh.patch
-
-----------------------------------------------------------------------
---- demo-ppc603.sh.org	2005-03-07 16:34:34.000000000 -0800
-+++ demo-ppc603.sh	2006-12-14 17:13:18.000000000 -0800
-@@ -11,8 +11,9 @@
- mkdir -p $RESULT_TOP
- 
- # Build the toolchain.  Takes a couple hours and a couple gigabytes.
--#eval `cat powerpc-604.dat gcc-3.4.0-glibc-2.3.2.dat` sh all.sh --builduserland --notest
-- eval `cat powerpc-604.dat gcc-3.4.1-glibc-2.3.3.dat`  sh all.sh --notest
--#eval `cat powerpc-604.dat gcc-3.4.1-glibc-20040827.dat` sh all.sh --notest
-+#eval `cat powerpc-603.dat gcc-3.4.0-glibc-2.3.2.dat` sh all.sh --builduserland --notest
-+# eval `cat powerpc-603.dat gcc-3.4.1-glibc-2.3.3.dat`  sh all.sh --notest
-+#eval `cat powerpc-603.dat gcc-3.4.1-glibc-20040827.dat` sh all.sh --notest
-+eval `cat powerpc-603.dat gcc-4.1.0-glibc-2.3.6.dat`  sh all.sh --notest
- 
- echo Done.
-----------------------------------------------------------------------
-
-       - Sparc64
-         patch < demo-sparc64.sh.patch
-
-----------------------------------------------------------------------
---- demo-sparc64.sh.org	2005-03-07 16:34:34.000000000 -0800
-+++ demo-sparc64.sh	2006-11-06 19:31:57.000000000 -0800
-@@ -15,7 +15,8 @@
- #eval `cat sparc64.dat gcc-3.3.2-glibc-2.3.2.dat` sh all.sh --notest
- #eval `cat sparc64.dat gcc-3.3.3-glibc-2.3.2.dat` sh all.sh --notest
- #eval `cat sparc64.dat gcc-3.4.0-glibc-2.3.2.dat` sh all.sh --notest
-- eval `cat sparc64.dat gcc-3.4.2-glibc-2.3.3.dat` sh all.sh --notest --testlinux
-+# eval `cat sparc64.dat gcc-3.4.2-glibc-2.3.3.dat` sh all.sh --notest --testlinux
- #eval `cat sparc64.dat gcc-3.4.2-glibc-20040827.dat` sh all.sh --notest
-+eval `cat sparc64.dat gcc-3.4.5-glibc-2.3.6.dat` sh all.sh --notest
- 
- echo Done.
-----------------------------------------------------------------------
-
-       - XScale
-         patch < demo-armv5b-softfloat.sh.patch
-
-----------------------------------------------------------------------
---- demo-armv5b-softfloat.sh.org	2005-03-07 16:34:34.000000000 -0800
-+++ demo-armv5b-softfloat.sh	2006-10-18 15:24:05.000000000 -0700
-@@ -13,7 +13,8 @@
- # Build the toolchain.  Takes a couple hours and a couple gigabytes.
- 
- #eval `cat armv5b-softfloat.dat gcc-3.4.0-glibc-2.3.2.dat` sh all.sh --notest
-- eval `cat armv5b-softfloat.dat gcc-3.4.1-glibc-2.3.3.dat` sh all.sh --notest
-+# eval `cat armv5b-softfloat.dat gcc-3.4.1-glibc-2.3.3.dat` sh all.sh --notest
- #eval `cat armv5b-softfloat.dat gcc-3.4.1-glibc-20040827.dat` sh all.sh --notest
-+ eval `cat armv5b-softfloat.dat gcc-3.4.5-glibc-2.3.6.dat` sh all.sh --notest
- 
- echo Done.
-----------------------------------------------------------------------
-
-    c) Compile the toolchain and install it:
-
-       sudo mkdir /opt/crosstool
-       sudo chown $USER /opt/crosstool
-
-       # Unset the LD_LIBRARY_PATH environmetal variable
-       setenv _SAVE_LD_LIBRARY_PATH $LD_LIBRARY_PATH
-       unsetenv LD_LIBRARY_PATH
-
-       # Perform the compilation (it tay take a while)
-
-       - IA-64
-         sh demo-ia64.sh
-
-       - MIPS (Broadcom for Linksys WRT54G)
-         sh demo-mipsel.sh
-
-       - PowerPC-603
-         sh demo-ppc603.sh
-
-       - Sparc64
-         sh demo-sparc64.sh
-
-       - XScale
-         sh demo-armv5b-softfloat.sh
-
-       # Restore the original LD_LIBRARY_PATH environmetal variable
-       cd ..
-       setenv LD_LIBRARY_PATH $_SAVE_LD_LIBRARY_PATH
-       unsetenv _SAVE_LD_LIBRARY_PATH
-
-    d) Set some environmetal variables that will be used later.
-       The values need to be modified appropriately if the tools
-       are installed in different directory.
-
-       - IA-64
-         setenv CROSS_ARCH ia64-unknown-linux-gnu
-         setenv CROSS_ROOT /opt/crosstool/gcc-3.4.5-glibc-2.3.6/${CROSS_ARCH}
-         setenv CROSS_ROOT_ARCH ${CROSS_ROOT}/${CROSS_ARCH}
-
-       - MIPS (Broadcom for Linksys WRT54G)
-         setenv CROSS_ARCH mipsel-unknown-linux-gnu
-         setenv CROSS_ROOT /opt/crosstool/gcc-3.4.5-glibc-2.3.6/${CROSS_ARCH}
-         setenv CROSS_ROOT_ARCH ${CROSS_ROOT}/${CROSS_ARCH}
-
-       - PowerPC-603
-         setenv CROSS_ARCH powerpc-603-linux-gnu
-         setenv CROSS_ROOT /opt/crosstool/gcc-4.1.0-glibc-2.3.6/${CROSS_ARCH}
-         setenv CROSS_ROOT_ARCH ${CROSS_ROOT}/${CROSS_ARCH}
-
-       - Sparc64
-         setenv CROSS_ARCH sparc64-unknown-linux-gnu
-         setenv CROSS_ROOT /opt/crosstool/gcc-3.4.5-glibc-2.3.6/${CROSS_ARCH}
-         setenv CROSS_ROOT_ARCH ${CROSS_ROOT}/${CROSS_ARCH}
-
-       - XScale
-         setenv CROSS_ARCH armv5b-softfloat-linux
-         setenv CROSS_ROOT /opt/crosstool/gcc-3.4.5-glibc-2.3.6/${CROSS_ARCH}
-         setenv CROSS_ROOT_ARCH ${CROSS_ROOT}/${CROSS_ARCH}
-
-    e) Download openssl from http://www.openssl.org/ and untar it:
-
-       wget http://www.openssl.org/source/openssl-0.9.8d.tar.gz
-       tar zxvf openssl-0.9.8d.tar.gz
-       cd openssl-0.9.8d
-
-    f) Add a line like the following to file "Configure" in the section
-       with other Linux targets. Note that the second field might need
-       to be modified to match the exact path name of the installed
-       cross-compiler.
-
-       - IA-64
-"ia64-unknown-linux-gnu",	"/opt/crosstool/gcc-3.4.5-glibc-2.3.6/ia64-unknown-linux-gnu/bin/ia64-unknown-linux-gnu-gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-
-       - MIPS (Broadcom for Linksys WRT54G)
-"mipsel-unknown-linux-gnu",	"/opt/crosstool/gcc-3.4.5-glibc-2.3.6/mipsel-unknown-linux-gnu/bin/mipsel-unknown-linux-gnu-gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-
-       - PowerPC-603
-"powerpc-603-linux-gnu",	"/opt/crosstool/gcc-4.1.0-glibc-2.3.6/powerpc-603-linux-gnu/bin/powerpc-603-linux-gnu-gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::${no_asm}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-
-       - Sparc64
-"sparc64-unknown-linux-gnu",    "/opt/crosstool/gcc-3.4.5-glibc-2.3.6/sparc64-unknown-linux-gnu/bin/sparc64-unknown-linux-gnu-gcc:-DB_ENDIAN -DTERMIOS -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-
-       - XScale
-"armv5b-softfloat-linux",	"/opt/crosstool/gcc-3.4.5-glibc-2.3.6/armv5b-softfloat-linux/bin/armv5b-softfloat-linux-gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-
-    g) Cross-compile openssl and install it:
-
-       ./Configure $CROSS_ARCH
-       make INSTALL_PREFIX=$CROSS_ROOT_ARCH install
-
-    h) Prepare the XORP cross-compilation environment.
-       The first three commands can be skipped if they were done in
-       step (d):
-
-       - IA-64
-         setenv CROSS_ARCH ia64-unknown-linux-gnu
-         setenv CROSS_ROOT /opt/crosstool/gcc-3.4.5-glibc-2.3.6/${CROSS_ARCH}
-
-       - MIPS (Broadcom for Linksys WRT54G)
-         setenv CROSS_ARCH mipsel-unknown-linux-gnu
-         setenv CROSS_ROOT /opt/crosstool/gcc-3.4.5-glibc-2.3.6/${CROSS_ARCH}
-
-       - PowerPC-603
-         setenv CROSS_ARCH powerpc-603-linux-gnu
-         setenv CROSS_ROOT /opt/crosstool/gcc-4.1.0-glibc-2.3.6/${CROSS_ARCH}
-
-       - Sparc64
-         setenv CROSS_ARCH sparc64-unknown-linux-gnu
-         setenv CROSS_ROOT /opt/crosstool/gcc-3.4.5-glibc-2.3.6/${CROSS_ARCH}
-
-       - XScale
-         setenv CROSS_ARCH armv5b-softfloat-linux
-         setenv CROSS_ROOT /opt/crosstool/gcc-3.4.5-glibc-2.3.6/${CROSS_ARCH}
-
-       setenv CROSS_ROOT_ARCH ${CROSS_ROOT}/${CROSS_ARCH}
-       setenv CC ${CROSS_ROOT}/bin/${CROSS_ARCH}-gcc
-       setenv CXX ${CROSS_ROOT}/bin/${CROSS_ARCH}-g++
-       setenv LD ${CROSS_ROOT}/bin/${CROSS_ARCH}-ld
-       setenv RANLIB ${CROSS_ROOT}/bin/${CROSS_ARCH}-ranlib
-       setenv NM ${CROSS_ROOT}/bin/${CROSS_ARCH}-nm
-
-       [Optional]
-       setenv PATH ${PATH}:${CROSS_ROOT}/bin
-       rehash
-
-    i) Cross-compile XORP:
-
-       cd /path/to/xorp/source/code
-       ./configure --host=${CROSS_ARCH} --with-openssl=${CROSS_ROOT_ARCH}/usr/local/ssl
-       gmake
-
-
 4. Performance optimization
 ===========================
 
-[Note: this section is incomplete]
-
 By default, XORP is compiled with compiler debug information enabled
-and no optimization.
+and moderate optimization.
 
-Use the following command to disable the compiler debug information and
-to enable optimization:
+See 'scons --help' for more options.
 
-./configure --enable-optimize --disable-debug
 
-Remember that if XORP was compiled previously with different options,
-it must be recompiled from scratch:
-
-gmake clean
-gmake
-
-Additional compiler-related optimizations flags can be specified on
-the command line by setting CFLAGS (the C compiler flags) and CXXFLAGS
-(the C++ compiler flags). E.g., the following options can be used for
-Intel PentiumPro CPU optimizations:
-
-./configure --enable-optimize --disable-debug \
-    "CFLAGS=-march=pentiumpro -O3 -fomit-frame-pointer" \
-    "CXXFLAGS=-march=pentiumpro -O3 -fomit-frame-pointer"
-
-Other flags that can be set on the command line are CPPFLAGS (the C/C++
-pre-processor flags), and LDFLAGS (the linker flags).
-
-
 5. Setting-up Ubuntu for XORP Installation
 ==========================================
 
+[ This section is at least partially out-dated. ]
+
 1)Install Ubuntu from Live CD - all default values hold good.
 2)Add your login name to the sudoers file
 3)Edit interfaces file

Modified: trunk/xorp/ERRATA
===================================================================
--- trunk/xorp/ERRATA	2010-04-29 15:10:56 UTC (rev 11698)
+++ trunk/xorp/ERRATA	2010-04-30 05:45:14 UTC (rev 11699)
@@ -1,14 +1,10 @@
-#
-# $XORP: xorp/ERRATA,v 1.49 2008/12/19 00:35:26 abittau Exp $
-#
 
 		XORP ERRATA
 
-  ALL:
-    - Parallel building (e.g., "gmake -j 4") may fail on multi-CPU
-      machines. The simplest work-around is to rerun gmake or not to use
-      the -j flag.
+  See:  https://sourceforge.net/apps/trac/xorp/report for current
+     bug list.
 
+  ALL:
     - The following compiler is known to be buggy, and should not be
       used to compile XORP:
         gcc34 (GCC) 3.4.0 20040310 (prerelease) [FreeBSD]
@@ -33,10 +29,8 @@
 
   RTRMGR:
     - There are several known issues, but none of them is considered
-      critical. The list of known issues is available from:
+      critical.
 
-        http://www.xorp.org/bugzilla/query.cgi
-
     - Using the rtrmgr "-r" command-line option to restart processes
       that have failed does not work if a process fails while being
       reconfigured via xorpsh. If that happens, the rtrmgr itself may
@@ -50,10 +44,8 @@
 
   XORPSH:
     - There are several known issues, but none of them is considered
-      critical. The list of known issues is available from:
+      critical.
 
-        http://www.xorp.org/bugzilla/query.cgi
-
   FEA/MFEA:
     - On Linux with kernels prior to 2.6.24 and IPv6 support, interfaces
       fail to be reconfigured properly if brought down and up again.
@@ -134,9 +126,7 @@
       may not work for the following OS-es because the kernel for those
       systems does not provide a mechanism for asynchronous notification
       of userland programs when the link status changes: FreeBSD-5.2 and
-      earlier and MacOS X (note: if the Windows kernel supports this
-      feature, it is not used yet in XORP). Though, for those systems
-      the link status should be read properly on startup.
+      earlier and MacOS X.
 
     - On Linux with kernel version linux-2.6.17 and older there is a
       kernel bug which prevents adding an IPv6 address to an interface
@@ -195,10 +185,8 @@
       Eventually this limitation would be fixed in Linux kernel 2.6.28.
 
   RIB:
-    - In some rare cases, the RIB may fail to delete an existing route:
+    - In some rare cases, the RIB may fail to delete an existing route.
 
-        http://www.xorp.org/bugzilla/show_bug.cgi?id=62
-
       We are aware of the issue and will attempt to fix it in the
       future.
 
@@ -223,8 +211,6 @@
     - There are several other known issues, but none of them is
       considered critical. The list of known issues is available from:
 
-        http://www.xorp.org/bugzilla/query.cgi
-
   BGP:
     - The BGP configuration mandates that an IPv4 nexthop must be
       supplied. Unfortunately it is necessary to provide an IPv4 nexthop
@@ -360,55 +346,3 @@
 
   CLI:
     - No known issues.
-
-  SNMP:
-    - On some versions of Linux, there are some bugs in net-snmp
-      versions 5.0.8 and 5.0.9, which prevent dynamic loading from
-      working. See the following URL for links to the net-snmp
-      patches that solve the problems:
-
-        http://www.xorp.org/snmp.html
-
-    - Version 5.1 of net-snmp requires a simple modification, otherwise
-      XORP will fail to compile.
-      See the following URL for a link to the net-snmp patch that solves
-      the problems:
-
-         http://www.xorp.org/snmp.html 
-
-    - There might be a compilation error in the mibs directory on some
-      systems running on 64-bit machines (e.g., FreeBSD or Linux on amd64):
-
-g++ -shared   xorpevents.lo -Wl,--whole-archive ../libxipc/.libs/libxipc.a ../libxorp/.libs/libxorp.a ../libcomm/.libs/libcomm.a -Wl,--no-whole-archive  ../libxipc/.libs/libxipc.a ../libxorp/.libs/libxorp.a ../libcomm/.libs/libcomm.a -lcrypto  -Wl,-soname -Wl,libnetsnmpxorp.so -o .libs/libnetsnmpxorp.so
-/usr/bin/ld: ../libxipc/.libs/libxipc.a(hmac_md5.o): relocation R_X86_64_32S can not be used when making a shared object; recompile with -fPIC
-../libxipc/.libs/libxipc.a(hmac_md5.o): could not read symbols: Bad value
-gmake[1]: *** [libnetsnmpxorp.la] Error 1
-
-     In that case use the "--enable-shared" flag to "./configure", and
-     remove the previous compilation:
-
-       ./configure --with-snmp --enable-shared
-       gmake clean
-       gmake
-
-    - There might be a compilation error when running "gmake check"
-      in the mibs directory on some systems (e.g., Ubuntu Linux):
-
-g++ -DNETSNMP_NO_INLINE -g -Werror -W -Wall -Wwrite-strings -Wcast-qual
--Wpointer-arith -Wcast-align -Woverloaded-virtual -ftemplate-depth-25 -pipe -o
-.libs/test_xorpevents test_xorpevents.o -Wl,-Bsymbolic-functions -Wl,-E 
-../libxipc/.libs/libfinder.a ./.libs/libnetsnmpxorp.so -lpcap -lrt -L/usr/lib
--L/usr/local/lib -L/usr/lib/perl/5.8/CORE /usr/lib/libnetsnmpmibs.so -lsensors
-/usr/lib/libnetsnmphelpers.so /usr/lib/libnetsnmpagent.so -lwrap -lperl -ldl
--lm -lpthread -lc -lcrypt /usr/lib/libnetsnmp.so -lcrypto -Wl,--rpath
--Wl,/home/nithya/bug765/xorp/mibs/.libs -Wl,--rpath -Wl,/usr/local/xorp/mibs/.
-/usr/local/bin/ld: cannot find -lperl
-collect2: ld returned 1 exit status
-make[2]: *** [test_xorpevents] Error 1
-
-      A possible work around is to link /usr/lib/libperl to
-      /usr/lib/libperl.so.5.10 :
-
-        su
-        cd /usr/lib
-        ln -s libperl.so.5.10 libperl.so

Modified: trunk/xorp/README
===================================================================
--- trunk/xorp/README	2010-04-29 15:10:56 UTC (rev 11698)
+++ trunk/xorp/README	2010-04-30 05:45:14 UTC (rev 11699)
@@ -1,6 +1,3 @@
-#
-# $XORP: xorp/README,v 1.65 2009/01/09 19:20:58 jtc Exp $
-#
 
 		XORP: eXtensible Open Router Platform
 
@@ -13,7 +10,9 @@
 developers from XORP, Inc., and members of the XORP.org community.
 It started life as a project at the ICSI Center for Open Networking (ICON)
 at the International Computer Science Institute in Berkeley, California,
-USA, and is now owned and shepherded by the team at XORP, Inc.
+USA, and spent some time with the team at XORP, Inc.  It is now maintained
+and improved on a volunteer basis by a core of long-term XORP developers
+and some newer contributors.
 
 XORP's primary goal is to be an open platform for networking protocol
 implementations and an alternative to proprietary and closed networking
@@ -55,7 +54,7 @@
 2. Status
 =========
 
-This is XORP Release 1.7-WIP
+This is XORP Release 1.7
 It is reasonably stable and can be used for routing, but there are known
 issues.
 
@@ -65,29 +64,18 @@
   * FreeBSD
   * NetBSD
   * OpenBSD
-  * Linux
-  * Mac OS X
-  * Microsoft Windows
+  * Linux (x86-32, x86-64, Sparc)
 
 See ${XORP}/BUILD_NOTES for OS-specific details, compilation
 information, etc.
 
 Development platform:
 
-  * FreeBSD-7.0-RELEASE
-    - gcc/g++ version 4.2.1 (default)
-    - gmake (GNU make) version 3.81
-    - autoconf version 2.61
-    - automake version 1.10
-    - libtool version 1.5.24
-    - flex version 2.5.4
-    - yacc version default one that comes with the above OS
+  * Linux and FreeBSD
 
-Other platforms can also be used for development, but the installed
-version of autotools (autoconf/automake/libtool) should match the
-information listed above.
-For Microsoft Windows-based development see the corresponding
-entry in ${XORP}/BUILD_NOTES.
+Other platforms can also be used for development, perhaps with a bit
+of effort.  Ask on the xorp-hackers mailing list if your preferred
+platform is not currently supported.
 
 See ${XORP}/ERRATA for the list of known problems.
 
@@ -140,11 +128,10 @@
 3. Compilation, configuration and startup
 =========================================
 
-To compile XORP, you must have GNU make (gmake) installed. Then just
-run the following commands in the top-level directory:
+To compile XORP, you must have a recent version of scons and g++
+compiler toolset installed.
 
-./configure
-gmake
+scons
 
 See ${XORP}/BUILD_NOTES for additional information of building XORP.
 
@@ -258,7 +245,8 @@
   * contrib : various contributed code.
 
     * olsr : RFC 3626 Optimized Link State Routing implementation.
-      Generously funded by CenGen, Inc.
+      Generously funded by CenGen, Inc.  (Does not compile in 1.7,
+      but will work in 1.8)
 
     * mld6igmp_lite : Implementation of the Lightweight IGMPv3/MLDv2
       protocols:
@@ -267,8 +255,6 @@
 The directories listed below contain various information that are of
 limited interest, or are not relevant to the current release:
 
-  * config : autoconf/automake related files.
-
   * devnotes : various notes for the XORP core members.
 
   * utils : Various XORP-related utilities.
@@ -278,9 +264,10 @@
 ===============
 
 In the short-term we plan to add:
-  * IS-IS
-  * Security
-  * Bi-directional PIM-SM
+  * Integrate changes found in 'xorp.ct' repository.
+  * Get regression tests working again.
+  * Implement batching and other performance improvements for BGP
+    and other protocols.
 
 In the long-term, we plan to add:
   * BGMP
@@ -295,6 +282,7 @@
   * Andrea Bittau
   * Javier Cardona
   * Atanu Ghosh
+  * Ben Greear
   * Adam Greenhalgh
   * Mark Handley
   * Orion Hodson
@@ -321,6 +309,7 @@
     - Microsoft
     - Vyatta
     - CenGen
+    - Candela Technologies (Sponsors Ben Greear)
 
   * Martin C. Shepherd for the libtecla library (used by the CLI).
 

Modified: trunk/xorp/RELEASE_NOTES
===================================================================
--- trunk/xorp/RELEASE_NOTES	2010-04-29 15:10:56 UTC (rev 11698)
+++ trunk/xorp/RELEASE_NOTES	2010-04-30 05:45:14 UTC (rev 11699)
@@ -1,78 +1,24 @@
-#
-# $XORP: xorp/RELEASE_NOTES,v 1.235 2009/01/09 19:20:58 jtc Exp $
-#
 
 		XORP RELEASE NOTES
 
 This file contains XORP release notes (most recent releases first).
 
-Release 2.0 (2010/??/??)
+Release 1.7  May 1, 2010
 ============================
   ALL:
-    - 
+    - Compiles on Linux (x86-32, x86-64, Sparc, at least) and BSD variants.
+    - Replaced 'make' build system with 'scons'
+    - New installation layout.
+    - Footprint reduction.
+    - Bug fixes here an there, more queued for release 1.8.
+    - Support shared libraries.
 
-  CONFIGURATION:
-    - 
-
-  LIBXORP:
-    - 
-
-  LIBXIPC:
-    - 
-
-  LIBFEACLIENT:
-    - 
-
-  XRL:
-    - 
-
-  RTRMGR:
-    - 
-
-  XORPSH:
-    - 
-
-  POLICY:
-    - 
-
-  FEA/MFEA:
-    - 
-
-  RIB:
-    - 
-
-  RIP/RIPng:
-    - 
-
   OLSR:
-    - 
+    - Currently broken in 1.7
 
-  OSPF:
-    - 
-	
-  BGP:
-    - 
-
-  STATIC_ROUTES:
-    - 
-
-  MLD/IGMP:
-    - 
-
-  MLD/IGMP-Lite:
-    - 
-
-  PIM-SM:
-    - 
-
-  FIB2MRIB:
-    - 
-
   SNMP:
-    - 
+    - Removed
 
-  VRRP:
-    - 
 
 Release 1.6 (2009/01/07)
 ============================

Modified: trunk/xorp/TODO
===================================================================
--- trunk/xorp/TODO	2010-04-29 15:10:56 UTC (rev 11698)
+++ trunk/xorp/TODO	2010-04-30 05:45:14 UTC (rev 11699)
@@ -1,6 +1,3 @@
-#
-# $XORP: xorp/TODO,v 1.22 2008/01/13 06:01:45 pavlin Exp $
-#
 
 * Add a list with acknowledgments for all people who have contributed:
   bug reports/fixes/etc. This list will go with the source code,

Modified: trunk/xorp/VERSION
===================================================================
--- trunk/xorp/VERSION	2010-04-29 15:10:56 UTC (rev 11698)
+++ trunk/xorp/VERSION	2010-04-30 05:45:14 UTC (rev 11699)
@@ -1 +1 @@
-1.7-WIP
+1.7

Modified: trunk/xorp/etc/templates/xorpsh.cmds
===================================================================
--- trunk/xorp/etc/templates/xorpsh.cmds	2010-04-29 15:10:56 UTC (rev 11698)
+++ trunk/xorp/etc/templates/xorpsh.cmds	2010-04-30 05:45:14 UTC (rev 11699)
@@ -6,6 +6,6 @@
 }
 
 show version {
-    %command: "echo Version 1.7-WIP" %help: HELP;
+    %command: "echo Version 1.7" %help: HELP;
     %tag: HELP "Display system version";
 }

Modified: trunk/xorp/rtrmgr/master_conf_tree.cc
===================================================================
--- trunk/xorp/rtrmgr/master_conf_tree.cc	2010-04-29 15:10:56 UTC (rev 11698)
+++ trunk/xorp/rtrmgr/master_conf_tree.cc	2010-04-30 05:45:14 UTC (rev 11699)
@@ -46,7 +46,7 @@
 #include "util.hh"
 
 #define XORP_CONFIG_FORMAT_VERSION		"1.1"
-#define XORP_CONFIG_XORP_VERSION		"1.7-WIP"
+#define XORP_CONFIG_XORP_VERSION		"1.7"
 
 //
 // The strings that are used to add and delete a load or save file, to


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From greear at users.sourceforge.net  Thu Apr 29 22:45:56 2010
From: greear at users.sourceforge.net (greear at users.sourceforge.net)
Date: Fri, 30 Apr 2010 05:45:56 +0000
Subject: [Xorp-cvs] SF.net SVN: xorp:[11700] trunk/docs
Message-ID: <E1O7j2y-0002If-Rv@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 11700
          http://xorp.svn.sourceforge.net/xorp/?rev=11700&view=rev
Author:   greear
Date:     2010-04-30 05:45:56 +0000 (Fri, 30 Apr 2010)

Log Message:
-----------
docs:  Update latex doc files to version 1.7

Remove 'WIP', update date, add 'and individual contributors'
to the author tag.

Signed-off-by: Ben Greear <greearb at candelatech.com>

Modified Paths:
--------------
    trunk/docs/bgp/bgp.tex
    trunk/docs/design_arch/design_arch.tex
    trunk/docs/design_arch/error_handling.tex
    trunk/docs/fea/fea.tex
    trunk/docs/libxipc/libxipc_overview.tex
    trunk/docs/libxipc/xrl_interfaces.tex
    trunk/docs/libxorp/libxorp_overview.tex
    trunk/docs/mfea/mfea_arch.tex
    trunk/docs/mld6igmp/mld6igmp_arch.tex
    trunk/docs/multicast/multicast_arch.tex
    trunk/docs/olsr/olsr_manual.tex
    trunk/docs/pim/pim_arch.tex
    trunk/docs/pim_testsuite/pim_testsuite.tex
    trunk/docs/rib/rib.tex
    trunk/docs/rtrmgr/rtrmgr.tex
    trunk/docs/snmp/snmp_overview.tex
    trunk/docs/test_harness/test_harness.tex
    trunk/docs/user_manual/user_manual.tex
    trunk/docs/windows_port/windows_port.tex
    trunk/docs/xorpdev_101/xorpdev_101.tex

Modified: trunk/docs/bgp/bgp.tex
===================================================================
--- trunk/docs/bgp/bgp.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/bgp/bgp.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -43,12 +43,12 @@
 
 \title{XORP BGP Routing Daemon \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 

Modified: trunk/docs/design_arch/design_arch.tex
===================================================================
--- trunk/docs/design_arch/design_arch.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/design_arch/design_arch.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -43,12 +43,12 @@
 
 \title{XORP Design Overview \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 

Modified: trunk/docs/design_arch/error_handling.tex
===================================================================
--- trunk/docs/design_arch/error_handling.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/design_arch/error_handling.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -54,12 +54,12 @@
 
 \title{XORP Error Handling \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 

Modified: trunk/docs/fea/fea.tex
===================================================================
--- trunk/docs/fea/fea.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/fea/fea.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -43,15 +43,15 @@
 
 \title{XORP Forwarding Engine Abstraction\footnote{This document describes the
     FEA in XORP-1.4. Since then there have been major re-design/changes in the
-    FEA internals. Those changes will continue until XORP-1.6 or XORP-1.7.
+    FEA internals. Those changes will continue until in XORP-1.8.
     This document will be updated once the new design is finalized.} \\ 
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 

Modified: trunk/docs/libxipc/libxipc_overview.tex
===================================================================
--- trunk/docs/libxipc/libxipc_overview.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/libxipc/libxipc_overview.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -43,12 +43,12 @@
 
 \title{XORP Inter-Process Communication Library Overview \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 

Modified: trunk/docs/libxipc/xrl_interfaces.tex
===================================================================
--- trunk/docs/libxipc/xrl_interfaces.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/libxipc/xrl_interfaces.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -43,12 +43,12 @@
 
 \title{XRL Interfaces: Specifications and Tools \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 

Modified: trunk/docs/libxorp/libxorp_overview.tex
===================================================================
--- trunk/docs/libxorp/libxorp_overview.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/libxorp/libxorp_overview.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -43,12 +43,12 @@
 
 \title{XORP Libxorp Library Overview \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 

Modified: trunk/docs/mfea/mfea_arch.tex
===================================================================
--- trunk/docs/mfea/mfea_arch.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/mfea/mfea_arch.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -43,12 +43,12 @@
 
 \title{XORP Multicast Forwarding Engine Abstraction \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 
@@ -77,7 +77,7 @@
 PIM and MLD/IGMP in a simulation-like environment, it will be sufficient
 to add the simulation environment support only to the MFEA.
 
-Currently (July 2008), the MFEA supports abstraction for
+Currently (April, 2010), the MFEA supports abstraction for
 the following systems:
 
 \begin{itemize}

Modified: trunk/docs/mld6igmp/mld6igmp_arch.tex
===================================================================
--- trunk/docs/mld6igmp/mld6igmp_arch.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/mld6igmp/mld6igmp_arch.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -43,12 +43,12 @@
 
 \title{XORP MLD/IGMP Daemon \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 

Modified: trunk/docs/multicast/multicast_arch.tex
===================================================================
--- trunk/docs/multicast/multicast_arch.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/multicast/multicast_arch.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -43,12 +43,12 @@
 
 \title{XORP Multicast Routing Design Architecture \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 

Modified: trunk/docs/olsr/olsr_manual.tex
===================================================================
--- trunk/docs/olsr/olsr_manual.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/olsr/olsr_manual.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -69,12 +69,12 @@
 
 \title{{\Huge XORP/OLSR User Manual}\\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 

Modified: trunk/docs/pim/pim_arch.tex
===================================================================
--- trunk/docs/pim/pim_arch.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/pim/pim_arch.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -43,12 +43,12 @@
 
 \title{XORP PIM-SM Routing Daemon \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 

Modified: trunk/docs/pim_testsuite/pim_testsuite.tex
===================================================================
--- trunk/docs/pim_testsuite/pim_testsuite.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/pim_testsuite/pim_testsuite.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -43,12 +43,12 @@
 
 \title{XORP PIM-SM Test Suite \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 

Modified: trunk/docs/rib/rib.tex
===================================================================
--- trunk/docs/rib/rib.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/rib/rib.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -43,12 +43,12 @@
 
 \title{XORP Routing Information Base (RIB) Process \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 

Modified: trunk/docs/rtrmgr/rtrmgr.tex
===================================================================
--- trunk/docs/rtrmgr/rtrmgr.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/rtrmgr/rtrmgr.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -43,12 +43,12 @@
 
 \title{XORP Router Manager Process (rtrmgr) \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 

Modified: trunk/docs/snmp/snmp_overview.tex
===================================================================
--- trunk/docs/snmp/snmp_overview.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/snmp/snmp_overview.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -43,12 +43,12 @@
 
 \title{XORP SNMP Agent \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 
@@ -56,6 +56,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Introduction}
 
+As of XORP 1.7, SNMP is no longer supported within XORP.
+
 The SNMP standards \cite{STD0062} define the protocol used to communicate
 between SNMP managers and agents, as well as the structure of the management
 information being accessed (MIB).  This document describes how XORP runtime data

Modified: trunk/docs/test_harness/test_harness.tex
===================================================================
--- trunk/docs/test_harness/test_harness.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/test_harness/test_harness.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -43,12 +43,12 @@
 
 \title{XORP BGP Test Harness \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 

Modified: trunk/docs/user_manual/user_manual.tex
===================================================================
--- trunk/docs/user_manual/user_manual.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/user_manual/user_manual.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -69,12 +69,12 @@
 
 \title{{\Huge XORP User Manual}\\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 

Modified: trunk/docs/windows_port/windows_port.tex
===================================================================
--- trunk/docs/windows_port/windows_port.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/windows_port/windows_port.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -56,12 +56,12 @@
 
 \title{XORP Windows Support Overview \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 
@@ -69,6 +69,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Introduction}
 
+As of XORP 1.7, Microsoft Windows is no longer supported.  This
+document is kept for posterity's sake.
+
 This document provides an overview of XORP's support for Microsoft Windows.
 Much of XORP's internal library implementation is specifically targeted
 at UNIX-like operating environments. Here, we summarize the steps involved

Modified: trunk/docs/xorpdev_101/xorpdev_101.tex
===================================================================
--- trunk/docs/xorpdev_101/xorpdev_101.tex	2010-04-30 05:45:14 UTC (rev 11699)
+++ trunk/docs/xorpdev_101/xorpdev_101.tex	2010-04-30 05:45:56 UTC (rev 11700)
@@ -43,12 +43,12 @@
 
 \title{An Introduction to Writing a XORP Process \\
 \vspace{1ex}
-Version 1.7-WIP}
-\author{ XORP, Inc.					\\
+Version 1.7}
+\author{ XORP, Inc. and individual contributors		\\
          {\it http://www.xorp.org/}			\\
-	 {\it feedback at xorp.org}
+	 {\it xorp-users at xorp.org}
 }
-\date{January 7, 2009}
+\date{April 29, 2010}
 
 \maketitle
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From greearb at candelatech.com  Fri Apr 30 08:14:56 2010
From: greearb at candelatech.com (Ben Greear)
Date: Fri, 30 Apr 2010 08:14:56 -0700
Subject: [Xorp-cvs] SF.net SVN: xorp:[11699] trunk/xorp
In-Reply-To: <u2y4769af411004300259sfbbfa73fm36d9407b60a45a4e@mail.gmail.com>
References: <E1O7j2J-0002I4-76@sfp-svn-1.v30.ch3.sourceforge.com>
	<u2y4769af411004300259sfbbfa73fm36d9407b60a45a4e@mail.gmail.com>
Message-ID: <4BDAF3F0.5070408@candelatech.com>

On 04/30/2010 02:59 AM, Adam Greenhalgh wrote:
> I think this bit of the patch needs rolling back or changing something
> that mentions a decreased compile time at the slight risk of
> additional errors during the build process. Its rare I know, but I
> have seen it, and those that have done any significant development
> work will know about the -j flag anyway.
>
> -scons
> +scons -j4
>
> adam

That's fine with me, but I compile with -j4 on a quad-core system
all the time and have found no errors.  scons seems to do the right
thing with dependencies, at least.

Thanks,
Ben

-- 
Ben Greear <greearb at candelatech.com>
Candela Technologies Inc  http://www.candelatech.com


From greear at users.sourceforge.net  Fri Apr 30 20:51:10 2010
From: greear at users.sourceforge.net (greear at users.sourceforge.net)
Date: Sat, 01 May 2010 03:51:10 +0000
Subject: [Xorp-cvs] SF.net SVN: xorp:[11701] trunk/xorp/BUILD_NOTES
Message-ID: <E1O83jS-0007PR-GJ@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 11701
          http://xorp.svn.sourceforge.net/xorp/?rev=11701&view=rev
Author:   greear
Date:     2010-05-01 03:51:10 +0000 (Sat, 01 May 2010)

Log Message:
-----------
build-notes:  Remove -j4 option

It was feared that the parallel build option might cause problems
in some cases.

Signed-off-by: Ben Greear <greearb at candelatech.com>

Modified Paths:
--------------
    trunk/xorp/BUILD_NOTES

Modified: trunk/xorp/BUILD_NOTES
===================================================================
--- trunk/xorp/BUILD_NOTES	2010-04-30 05:45:56 UTC (rev 11700)
+++ trunk/xorp/BUILD_NOTES	2010-05-01 03:51:10 UTC (rev 11701)
@@ -18,7 +18,7 @@
 To compile XORP, you must have SCons installed. Then just
 run the following commands in the top-level directory:
 
-scons -j4
+scons
 scons install
 
 To change the default C and C++ compilers, then assign the binary


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.