BIER in non-MPLS netowrks

as decsribed in section 2.2
  ihttps://tools.ietf.org/html/draft-ietf-bier-mpls-encapsulation-10
with BIFT encoding from:
  https://tools.ietf.org/html/draft-wijnandsxu-bier-non-mpls-bift-encoding-00

changes:
1 - introduce the new BIFT lookup table. BIER tables that have an associated
    MPLS label are added to the MPLS-FIB. Those that don't are added to the
    BIER table
2 - BIER routes that have no associated output MPLS label will add a BIFT label.
3 - The BIER FMask has a path-list as a member to resolve via any possible path.

Change-Id: I1fd4d9dbd074f0e855c16e9329b81460ebe1efce
Signed-off-by: Neale Ranns <nranns@cisco.com>
diff --git a/test/patches/scapy-2.3.3/bier.patch b/test/patches/scapy-2.3.3/bier.patch
index 024805d..50814d4 100644
--- a/test/patches/scapy-2.3.3/bier.patch
+++ b/test/patches/scapy-2.3.3/bier.patch
@@ -3,7 +3,7 @@
 index 0000000..e173cdb
 --- /dev/null
 +++ b/scapy/contrib/bier.py
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,53 @@
 +# http://trac.secdev.org/scapy/ticket/31
 +
 +# scapy.contrib.description = MPLS
@@ -11,7 +11,7 @@
 +
 +from scapy.packet import *
 +from scapy.fields import *
-+from scapy.layers.inet import IP
++from scapy.layers.inet import IP, UDP
 +from scapy.layers.inet6 import IPv6
 +
 +class BIERLength:
@@ -20,12 +20,25 @@
 +   BIER_LEN_256 = 2
 +
 +
-+
 +BIERnhcls = {  1: "MPLS",
 +               2: "MPLS",
 +               4: "IPv4",
 +               5: "IPv6" }
 +
++
++class BIFT(Packet):
++   name = "BIFT"
++   fields_desc =  [ BitField("bsl", 0, 4),
++                    BitField("sd", 0, 8),
++                    BitField("set", 0, 8),
++                    BitField("cos", 0, 3),
++                    BitField("s", 1, 1),
++                    ByteField("ttl", 0)  ]
++
++   def guess_payload_class(self, payload):
++      return BIER
++
++
 +class BIER(Packet):
 +   name = "BIER"
 +   fields_desc =  [ BitField("id", 5, 4),
@@ -43,3 +56,4 @@
 +
 +bind_layers(BIER, IP,   Proto=4)
 +bind_layers(BIER, IPv6, Proto=5)
++bind_layers(UDP, BIFT, dport=8138)