[Xorp-hackers] [greearb/xorp.ct] 5d2311: static: Add 'mcast-route' framework.

GitHub noreply at github.com
Fri Jul 13 16:18:56 PDT 2012


  Branch: refs/heads/master
  Home:   https://github.com/greearb/xorp.ct
  Commit: 5d2311adc5256cf25b08cc3400b2be62863c779a
      https://github.com/greearb/xorp.ct/commit/5d2311adc5256cf25b08cc3400b2be62863c779a
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M xorp/etc/templates/static_routes.tp
    M xorp/static_routes/static_routes_node.cc
    M xorp/static_routes/static_routes_node.hh
    M xorp/static_routes/xrl_static_routes_node.cc
    M xorp/static_routes/xrl_static_routes_node.hh
    M xorp/xrl/interfaces/mfea.xif
    M xorp/xrl/interfaces/static_routes.xif
    M xorp/xrl/targets/static_routes.tgt

  Log Message:
  -----------
  static:  Add 'mcast-route' framework.

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


  Commit: 2651a0dc575c2f06c2e87b5632f70331d396ef37
      https://github.com/greearb/xorp.ct/commit/2651a0dc575c2f06c2e87b5632f70331d396ef37
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M xorp/rib/rib_manager.hh
    M xorp/rib/xrl_target.cc
    M xorp/rib/xrl_target.hh
    M xorp/static_routes/static_routes_node.cc
    M xorp/static_routes/static_routes_node.hh
    M xorp/static_routes/xrl_static_routes_node.cc
    M xorp/static_routes/xrl_static_routes_node.hh
    M xorp/xrl/interfaces/rib.xif
    M xorp/xrl/interfaces/rib_client.xif

  Log Message:
  -----------
  static/mcast:  Add much of the mcast-route logic to the static protocol.

fea logic is just dummied out at this point, and probably everything
needs more work.


  Commit: b6db4f0b2a6218ef9fbaf28c94d45c97ad99bd9a
      https://github.com/greearb/xorp.ct/commit/b6db4f0b2a6218ef9fbaf28c94d45c97ad99bd9a
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M xorp/fea/mfea_node.cc
    M xorp/fea/mfea_node.hh
    M xorp/fea/xrl_fea_node.hh
    M xorp/fea/xrl_mfea_node.cc
    M xorp/fea/xrl_mfea_node.hh
    M xorp/static_routes/SConscript
    M xorp/static_routes/static_routes_node.cc
    M xorp/static_routes/xorp_static_routes.cc
    M xorp/static_routes/xrl_static_routes_node.cc
    M xorp/static_routes/xrl_static_routes_node.hh
    M xorp/xrl/interfaces/mfea.xif
    M xorp/xrl/interfaces/mfea_client.xif
    M xorp/xrl/interfaces/pim.xif
    M xorp/xrl/interfaces/rib.xif
    M xorp/xrl/targets/static_routes.tgt

  Log Message:
  -----------
  static/mfea:  Have static module call directly to MFEA

Instead of previous idea to push this all through the RIB.


  Commit: 48998f1bc99b6c27b44c924ac27f460dadefd25a
      https://github.com/greearb/xorp.ct/commit/48998f1bc99b6c27b44c924ac27f460dadefd25a
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M xorp/static_routes/static_routes_node.cc
    M xorp/static_routes/static_routes_node.hh
    M xorp/static_routes/xrl_static_routes_node.cc
    M xorp/static_routes/xrl_static_routes_node.hh

  Log Message:
  -----------
  static/mfea:  Rename rib -> mfea

That better describes what is actually happening.


  Commit: 521eab57cc2edc1b3c197e1d2e9d1b174dd4c9a4
      https://github.com/greearb/xorp.ct/commit/521eab57cc2edc1b3c197e1d2e9d1b174dd4c9a4
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M xorp/etc/templates/static_routes.tp
    M xorp/fea/mfea_node.cc
    M xorp/fea/xrl_mfea_node.cc
    M xorp/libproto/proto_node.hh
    M xorp/static_routes/xrl_static_routes_node.cc

  Log Message:
  -----------
  static/mfea:  Fix up some bugs

Template file issues, etc.


  Commit: 65667793a73ecc5523343d9697e29cd96375c738
      https://github.com/greearb/xorp.ct/commit/65667793a73ecc5523343d9697e29cd96375c738
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M xorp/fea/mfea_node.cc
    M xorp/fea/mfea_node.hh
    M xorp/fea/xrl_mfea_node.cc

  Log Message:
  -----------
  static/mcast:  Support multiple mcast routes of different distances.

This allows static routes to over-ride ones created by PIM.
Route distance is currently fixed:  static == 0, pim == 1.
Lower distance wins.

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


  Commit: 8462aa7ca32dba39488717b9169f79215ce580c0
      https://github.com/greearb/xorp.ct/commit/8462aa7ca32dba39488717b9169f79215ce580c0
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M xorp/etc/templates/static_routes.tp
    M xorp/fea/mfea_node.cc
    M xorp/fea/mfea_node.hh
    M xorp/fea/xrl_mfea_node.cc
    M xorp/fea/xrl_mfea_node.hh
    M xorp/pim/xrl_pim_node.cc
    M xorp/static_routes/static_routes_node.cc
    M xorp/static_routes/static_routes_node.hh
    M xorp/static_routes/xrl_static_routes_node.cc
    M xorp/static_routes/xrl_static_routes_node.hh
    M xorp/xrl/interfaces/mfea.xif
    M xorp/xrl/interfaces/static_routes.xif

  Log Message:
  -----------
  static/mcast:  Support per-route distance configurable.

Default distance is 0 for static, 1 for PIM.  Static supports
over-rides, but PIM does not at this time.

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


  Commit: 3f22693c1f2471d73f1ec770d8ee57c9d70d377d
      https://github.com/greearb/xorp.ct/commit/3f22693c1f2471d73f1ec770d8ee57c9d70d377d
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M xorp/fea/mfea_node.cc
    M xorp/fea/mfea_node.hh
    M xorp/fea/xrl_fea_node.hh
    M xorp/fea/xrl_mfea_node.cc
    M xorp/fea/xrl_mfea_node.hh
    M xorp/pim/xrl_pim_node.cc
    M xorp/xrl/interfaces/mfea.xif
    M xorp/xrl/interfaces/mfea_client.xif
    M xorp/xrl/interfaces/pim.xif

  Log Message:
  -----------
  static-mcast:  Support multicast address distances.

Add RIB-like behaviour for multicast addresses in
the MFEA logic.  This will allow static multicast
routes to over-ride dynamic routes, for instance.

PIM currently always uses distance of 1, so if
static uses 0, it will win.

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


  Commit: 5eb6be022efaea8db937e0b721e9c73c80026838
      https://github.com/greearb/xorp.ct/commit/5eb6be022efaea8db937e0b721e9c73c80026838
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M xorp/libproto/proto_node.hh
    M xorp/rib/rib_manager.hh

  Log Message:
  -----------
  Whitespace cleanup.


  Commit: d7ecee95044437b8a097fdb0a3d9884677a72f44
      https://github.com/greearb/xorp.ct/commit/d7ecee95044437b8a097fdb0a3d9884677a72f44
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M xorp/etc/templates/static_routes.tp
    M xorp/static_routes/SConscript
    M xorp/static_routes/static_routes_node.cc
    M xorp/static_routes/static_routes_node.hh
    M xorp/static_routes/xorp_static_routes.cc
    M xorp/static_routes/xrl_static_routes_node.cc
    M xorp/static_routes/xrl_static_routes_node.hh
    M xorp/xrl/interfaces/static_routes.xif
    M xorp/xrl/targets/static_routes.tgt

  Log Message:
  -----------
  static-mcast:  Add support for static multicast routes.

This adds the ability to configure static multicast routes
using the static-route module.

Example config file looks like:

interfaces {
  interface "p3p1" {
          disable: false
          default-system-config
  }
  interface "wlan0" {
          disable: false
          default-system-config
  }
}
fea {
  unicast-forwarding4 {
          disable: false
  }
}

protocols {
  static {
    route 10.2.46.91/16 {
      next-hop: 10.2.46.20
      metric: 1
    }
    mrib-route 10.2.46.0/16 {
      next-hop: 10.2.46.30
      metric: 1
    }
    mcast-route 226.0.0.1 {
      input_if: "p3p1"
      input_ip: 192.168.9.11
      output_ifs: "wlan0"
      distance: 2
    }
  }
}

plumbing {
    mfea4 {
  disable: false
  interface "p3p1" {
      vif "p3p1" {
          disable: false
      }
  }
  interface "wlan0" {
      vif "wlan0" {
          disable: false
      }
  }
  interface "register_vif" {
      vif "register_vif" {
          disable: false
      }
  }
    } /*  mfea4  */
} /* plumbing */

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


  Commit: 765193bfb7889610475d6cdce6444d8c15b1cea0
      https://github.com/greearb/xorp.ct/commit/765193bfb7889610475d6cdce6444d8c15b1cea0
  Author: Ben Greear <greearb at candelatech.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M xorp/rib/xrl_target.cc
    M xorp/rib/xrl_target.hh
    M xorp/xrl/interfaces/rib.xif
    M xorp/xrl/interfaces/rib_client.xif

  Log Message:
  -----------
  Merge branch 'master' of dmz2:/pub/scm/xorp.ct.ben


Compare: https://github.com/greearb/xorp.ct/compare/32d7b974021b...765193bfb788


More information about the Xorp-hackers mailing list