At Mon, 22 Aug 2016 09:40:25 +0900, IWASE Yusuke wrote: > > Signed-off-by: IWASE Yusuke <[email protected]> > --- > ryu/lib/packet/afi.py | 1 + > ryu/lib/packet/bgp.py | 806 > +++++++++++++++++++++++++++++++++++++++++++++++-- > ryu/lib/packet/safi.py | 1 + > 3 files changed, 777 insertions(+), 31 deletions(-) > > diff --git a/ryu/lib/packet/afi.py b/ryu/lib/packet/afi.py > index c84bf47..7076042 100644 > --- a/ryu/lib/packet/afi.py > +++ b/ryu/lib/packet/afi.py > @@ -22,3 +22,4 @@ address-family-numbers.xhtml > > IP = 1 > IP6 = 2 > +L2VPN = 25 > diff --git a/ryu/lib/packet/bgp.py b/ryu/lib/packet/bgp.py > index 99da867..697eff3 100644 > --- a/ryu/lib/packet/bgp.py > +++ b/ryu/lib/packet/bgp.py > @@ -37,6 +37,7 @@ from ryu.lib.packet import safi as subaddr_family > from ryu.lib.packet import packet_base > from ryu.lib.packet import stream_parser > from ryu.lib import addrconv > +from ryu.lib import type_desc > from ryu.lib.pack_utils import msg_pack_into > > reduce = six.moves.reduce > @@ -180,9 +181,7 @@ class _Value(object): > args = [] > for f in self._VALUE_FIELDS: > args.append(getattr(self, f)) > - buf = bytearray() > - msg_pack_into(self._VALUE_PACK_STR, buf, 0, *args) > - return buf > + return struct.pack(self._VALUE_PACK_STR, *args) > > > class _TypeDisp(object):
> @@ -661,7 +662,7 @@ class _RouteDistinguisher(StringifyMixin, _TypeDisp, > _Value): > value = self.serialize_value() > buf = bytearray() > msg_pack_into(self._PACK_STR, buf, 0, self.type) > - return buf + value > + return six.binary_type(buf + value) > > @property > def formatted_str(self): > @@ -820,7 +821,7 @@ class _LabelledAddrPrefix(_AddrPrefix): > (label & 0xff0000) >> 16, > (label & 0x00ff00) >> 8, > (label & 0x0000ff) >> 0) > - return buf > + return six.binary_type(buf) > > @classmethod > def _label_from_bin(cls, label): > @@ -1030,6 +1031,651 @@ class LabelledVPNIP6AddrPrefix(_LabelledAddrPrefix, > _VPNAdd IIRC, ryu packet library returns bytearray as serialize() outputs. Are we changing that? -- IWAMOTO Toshihiro ------------------------------------------------------------------------------ _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
