From noreply at github.com  Thu Feb  7 11:13:56 2013
From: noreply at github.com (GitHub)
Date: Thu, 07 Feb 2013 11:13:56 -0800
Subject: [Xorp-hackers] [greearb/xorp.ct] ec9845: Admin distance set from
	config file
Message-ID: <5113fcf465ac1_640314afaf0170bf@sh4.rs.github.com.mail>

  Branch: refs/heads/master
  Home:   https://github.com/greearb/xorp.ct
  Commit: ec98454af04729b668decb7f03e2dc3addc26477
      https://github.com/greearb/xorp.ct/commit/ec98454af04729b668decb7f03e2dc3addc26477
  Author: Jean Michel MacKay <jnmackay at rockwellcollins.com>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    M xorp/etc/templates/bgp.tp
    M xorp/etc/templates/fib2mrib.tp
    M xorp/etc/templates/ospfv2.tp
    M xorp/etc/templates/ospfv3.tp
    M xorp/etc/templates/rip.tp
    M xorp/etc/templates/static_routes.tp
    M xorp/rib/rib.cc
    M xorp/rib/rt_tab_origin.hh

  Log Message:
  -----------
  Admin distance set from config file




From greearb at candelatech.com  Thu Feb  7 11:14:55 2013
From: greearb at candelatech.com (Ben Greear)
Date: Thu, 07 Feb 2013 11:14:55 -0800
Subject: [Xorp-hackers] [PATCH] Admin distance set from config file
In-Reply-To: <1358158040-8179-2-git-send-email-mackay.jm@gmail.com>
References: <1358158040-8179-1-git-send-email-mackay.jm@gmail.com>
	<1358158040-8179-2-git-send-email-mackay.jm@gmail.com>
Message-ID: <5113FD2F.1090406@candelatech.com>

On 01/14/2013 02:07 AM, Jean Michel MacKay wrote:
> From: Jean Michel MacKay <jnmackay at rockwellcollins.com>
>
> ---
>   xorp/etc/templates/bgp.tp           |   14 ++++++++++++++
>   xorp/etc/templates/fib2mrib.tp      |    7 +++++++
>   xorp/etc/templates/ospfv2.tp        |    7 +++++++
>   xorp/etc/templates/ospfv3.tp        |    7 +++++++
>   xorp/etc/templates/rip.tp           |    7 +++++++
>   xorp/etc/templates/static_routes.tp |    7 +++++++
>   xorp/rib/rib.cc                     |    8 +++++---
>   xorp/rib/rt_tab_origin.hh           |    5 +++++
>   8 files changed, 59 insertions(+), 3 deletions(-)

I applied this with some white-space fixups.

For future patches, please make sure there is a better
git commit message.

Thanks,
Ben


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


From noreply at github.com  Thu Feb  7 11:51:29 2013
From: noreply at github.com (GitHub)
Date: Thu, 07 Feb 2013 11:51:29 -0800
Subject: [Xorp-hackers] [greearb/xorp.ct] bd5e5f: wrapper: Wrapper
 API/protocol for external routin...
Message-ID: <511405c1d943a_6153f5eaec771b8@sh3.rs.github.com.mail>

  Branch: refs/heads/master
  Home:   https://github.com/greearb/xorp.ct
  Commit: bd5e5fb43b3106727c9c1f3e49b94fddc1bf66a4
      https://github.com/greearb/xorp.ct/commit/bd5e5fb43b3106727c9c1f3e49b94fddc1bf66a4
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    A xorp/contrib/wrapper/SConscript
    A xorp/contrib/wrapper/io.hh
    A xorp/contrib/wrapper/wrapper.cc
    A xorp/contrib/wrapper/wrapper.hh
    A xorp/contrib/wrapper/wrapper_module.h
    A xorp/contrib/wrapper/wrapper_types.hh
    A xorp/contrib/wrapper/wrappermain.cc
    A xorp/contrib/wrapper/wrapperpolicy.cc
    A xorp/contrib/wrapper/wrapperpolicy.hh
    A xorp/contrib/wrapper/xorp_io.cc
    A xorp/contrib/wrapper/xorp_io.hh
    A xorp/contrib/wrapper/xorp_wrapper4.cc
    A xorp/contrib/wrapper/xorp_wrapper4.hh
    A xorp/contrib/wrapper/xorp_wrapper_launch
    A xorp/contrib/wrapper/xorp_wrapper_shutdown
    A xorp/etc/templates/wrapper4.cmds
    A xorp/etc/templates/wrapper4.tp
    A xorp/xrl/interfaces/wrapper4.xif
    A xorp/xrl/targets/wrapper4.tgt

  Log Message:
  -----------
  wrapper:  Wrapper API/protocol for external routing protocols.

The protocol allows wrapper a standalone version routing
protocol to work with XORP without developing a special version for XORP. No
need to learn how to use XRL, sometimes, no protocol source code required.

Signed-off-by: Jiangxin Hu <jiangxin.hu at crc.gc.ca>
Signed-off-by: Ben Greear <greearb at candelatech.com>


  Commit: e944387ff71222450545259edf8335512ea80c7a
      https://github.com/greearb/xorp.ct/commit/e944387ff71222450545259edf8335512ea80c7a
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    A xorp/contrib/ldwrapper/Makefile.am
    A xorp/contrib/ldwrapper/Makefile.in
    A xorp/contrib/ldwrapper/README
    A xorp/contrib/ldwrapper/README.in
    A xorp/contrib/ldwrapper/aclocal.m4
    A xorp/contrib/ldwrapper/build-aux/config.guess
    A xorp/contrib/ldwrapper/build-aux/config.sub
    A xorp/contrib/ldwrapper/build-aux/depcomp
    A xorp/contrib/ldwrapper/build-aux/install-sh
    A xorp/contrib/ldwrapper/build-aux/ltmain.sh
    A xorp/contrib/ldwrapper/build-aux/missing
    A xorp/contrib/ldwrapper/config.h.in
    A xorp/contrib/ldwrapper/configure
    A xorp/contrib/ldwrapper/configure.ac
    A xorp/contrib/ldwrapper/m4/libtool.m4
    A xorp/contrib/ldwrapper/m4/ltoptions.m4
    A xorp/contrib/ldwrapper/m4/ltsugar.m4
    A xorp/contrib/ldwrapper/m4/ltversion.m4
    A xorp/contrib/ldwrapper/m4/lt~obsolete.m4
    A xorp/contrib/ldwrapper/src/Makefile.am
    A xorp/contrib/ldwrapper/src/Makefile.in
    A xorp/contrib/ldwrapper/src/ldwrapper.cpp
    A xorp/contrib/ldwrapper/src/ldwrapper.h
    A xorp/contrib/ldwrapper/src/toXorp.cpp
    A xorp/contrib/ldwrapper/src/toXorp.h
    A xorp/contrib/ldwrapper/src/wrapper_types.h

  Log Message:
  -----------
  ldwrapper:  Stand-alone wrapper for external routing protocols.

The protocol allows wrapper a standalone version routing
protocol to work with XORP without developing a special version for XORP. No
need to learn how to use XRL, sometimes, no protocol source code required.

Signed-off-by: Jiangxin Hu <jiangxin.hu at crc.gc.ca>
Signed-off-by: Ben Greear <greearb at candelatech.com>


  Commit: c83eaccafc7f55b9533f85661e38532922416929
      https://github.com/greearb/xorp.ct/commit/c83eaccafc7f55b9533f85661e38532922416929
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    M xorp/contrib/wrapper/wrapper.cc
    M xorp/contrib/wrapper/xorp_io.cc

  Log Message:
  -----------
  wrapper:  Fix some compile warnings.

There were lots of un-neccessary casts, some that caused const
warnings that broke the build.  These are now fixed..hopefully
it still works as originally designed.

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


  Commit: 1febd62310a6d0a55bc937e17f09763e862a1f1e
      https://github.com/greearb/xorp.ct/commit/1febd62310a6d0a55bc937e17f09763e862a1f1e
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    M xorp/SConscript
    M xorp/SConstruct
    M xorp/etc/templates/policy.tp
    M xorp/xrl/interfaces/SConscript
    M xorp/xrl/targets/SConscript

  Log Message:
  -----------
  wrapper:  Add wrapper feature to xorp.

This integrates the wrapper api into xorp.  It is enabled by
default, but may be disabled with command-line arguments to
'scons' when building.

Signed-off-by: Jiangxin Hu <jiangxin.hu at crc.gc.ca>
Signed-off-by: Ben Greear <greearb at candelatech.com>


  Commit: 0f30e974afd093028991ed6d02ec11edcbcb4b2f
      https://github.com/greearb/xorp.ct/commit/0f30e974afd093028991ed6d02ec11edcbcb4b2f
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    A xorp/contrib/wrapper/OLSRd-example.jpg

  Log Message:
  -----------
  wrapper:  Add image of diagram for wrapper with olsrd.

Signed-off-by: Jiangxin Hu <jiangxin.hu at crc.gc.ca>
Signed-off-by: Ben Greear <greearb at candelatech.com>


Compare: https://github.com/greearb/xorp.ct/compare/ec98454af047...0f30e974afd0

From greearb at candelatech.com  Thu Feb  7 11:55:15 2013
From: greearb at candelatech.com (Ben Greear)
Date: Thu, 07 Feb 2013 11:55:15 -0800
Subject: [Xorp-hackers] A standalone routing protocol wrapper for XORP
In-Reply-To: <20120813174606.EFAD9EC8025@mailhub.crc.ca>
References: <20120813174606.EFAD9EC8025@mailhub.crc.ca>
Message-ID: <511406A3.7090508@candelatech.com>

On 08/13/2012 10:45 AM, Jiangxin Hu wrote:
> Signed-off-by:  [Jiangxin Hu] <jiangxin.hu at crc.gc.ca>

I've applied these patches, including some fixes for compile bugs
on my Fedora-17 system.

I did not review the stand-alone code, but I noticed a few things
when fixing the compile bugs:

You are using pthreads and mutexes.  Is this really required?  I'd
love to not use pthreads at all if possible.

Also, updates to the xorp documentation wiki for the wrapper
feature would be welcome:

http://xorp.run.montefiore.ulg.ac.be/start

Thanks,
Ben

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


From noreply at github.com  Thu Feb  7 13:14:05 2013
From: noreply at github.com (GitHub)
Date: Thu, 07 Feb 2013 13:14:05 -0800
Subject: [Xorp-hackers] [greearb/xorp.ct] 6f6a1e: wrapper: Fix compile on
	older systems.
Message-ID: <5114191d1032f_64dde77ae822451@sh2.rs.github.com.mail>

  Branch: refs/heads/master
  Home:   https://github.com/greearb/xorp.ct
  Commit: 6f6a1eff821f2d6c55fdbea9c77984c85effcd7f
      https://github.com/greearb/xorp.ct/commit/6f6a1eff821f2d6c55fdbea9c77984c85effcd7f
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    M xorp/contrib/wrapper/wrapper.cc

  Log Message:
  -----------
  wrapper:  Fix compile on older systems.

Older systems (Fedora Core 8, for instance), do not have accept4(),
so use non-blocking socket call and normal accept instead.

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




From noreply at github.com  Thu Feb  7 13:22:40 2013
From: noreply at github.com (GitHub)
Date: Thu, 07 Feb 2013 13:22:40 -0800
Subject: [Xorp-hackers] [greearb/xorp.ct] 94f02b: wrapper: Disable wrapper
	for win32 builds.
Message-ID: <51141b20acd53_426de77ae83172f@sh2.rs.github.com.mail>

  Branch: refs/heads/master
  Home:   https://github.com/greearb/xorp.ct
  Commit: 94f02bba514ae3f19e5d3073fff087b753c4d6bb
      https://github.com/greearb/xorp.ct/commit/94f02bba514ae3f19e5d3073fff087b753c4d6bb
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    M xorp/win32_pkg.bash

  Log Message:
  -----------
  wrapper:  Disable wrapper for win32 builds.

It will not compile with mingw, at least.  Just disable it
for windows builds.

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