diff options
| author | YAMAMOTO Takashi <yamamoto@valinux.co.jp> | 2013-08-26 15:34:32 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2013-08-26 16:49:07 +0900 |
| commit | aa6f056a26e42842b340cf4d309506b81c84512a (patch) | |
| tree | fde9f45f0413824a8fe813f002a77902b4ede4d5 | |
| parent | 4af07ca97526dce9f25e6904cad5e6fe74ef23ce (diff) | |
of10: remove trailing NULs in OFPPhyPort.name
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/ofproto/ofproto_v1_0_parser.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ryu/ofproto/ofproto_v1_0_parser.py b/ryu/ofproto/ofproto_v1_0_parser.py index eecdd133..be031894 100644 --- a/ryu/ofproto/ofproto_v1_0_parser.py +++ b/ryu/ofproto/ofproto_v1_0_parser.py @@ -86,6 +86,10 @@ class OFPPhyPort(ofproto_parser.namedtuple('OFPPhyPort', ( _TYPE = { 'ascii': [ 'hw_addr', + + # XXX OF spec is unclear about the encoding of name. + # OVS seems to use UTF-8. + # 'name', ] } @@ -93,9 +97,11 @@ class OFPPhyPort(ofproto_parser.namedtuple('OFPPhyPort', ( def parser(cls, buf, offset): port = struct.unpack_from(ofproto_v1_0.OFP_PHY_PORT_PACK_STR, buf, offset) - i = cls._fields.index('hw_addr') port = list(port) + i = cls._fields.index('hw_addr') port[i] = addrconv.mac.bin_to_text(port[i]) + i = cls._fields.index('name') + port[i] = port[i].rstrip('\0') return cls(*port) |