On Wed, Jun 12, 2013 at 07:44:12PM +0900, YAMAMOTO Takashi wrote:
>
> Signed-off-by: YAMAMOTO Takashi <[email protected]>
> ---
> ryu/ofproto/ofproto_v1_2_parser.py | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/ryu/ofproto/ofproto_v1_2_parser.py
> b/ryu/ofproto/ofproto_v1_2_parser.py
> index d13d044..6c0cead 100644
> --- a/ryu/ofproto/ofproto_v1_2_parser.py
> +++ b/ryu/ofproto/ofproto_v1_2_parser.py
> @@ -278,7 +278,7 @@ class OFPPacketIn(MsgBase):
> msg.match = OFPMatch.parser(msg.buf, ofproto_v1_2.OFP_PACKET_IN_SIZE
> -
> ofproto_v1_2.OFP_MATCH_SIZE)
>
> - match_len = utils.round_up(msg.match.length, 8)
> + match_len = utils.round_up(msg.match._length, 8)
> msg.data = msg.buf[(ofproto_v1_2.OFP_PACKET_IN_SIZE -
> ofproto_v1_2.OFP_MATCH_SIZE + match_len + 2):]
>
> @@ -906,7 +906,7 @@ class OFPTableMod(MsgBase):
>
>
> class OFPStatsRequest(MsgBase):
> - def __init__(self, datapath, type_, flags):
> + def __init__(self, datapath, type_, flags=0):
mis-squash?
> super(OFPStatsRequest, self).__init__(datapath)
> self.type = type_
> self.flags = flags
> @@ -1058,7 +1058,7 @@ class OFPFlowStats(StringifyMixin):
> ofproto_v1_2.OFP_MATCH_SIZE)
> match = OFPMatch.parser(buf, offset)
>
> - match_length = utils.round_up(match.length, 8)
> + match_length = utils.round_up(match._length, 8)
> inst_length = (length - (ofproto_v1_2.OFP_FLOW_STATS_SIZE -
> ofproto_v1_2.OFP_MATCH_SIZE + match_length))
> offset += match_length
> @@ -1566,7 +1566,7 @@ class FlowWildcards(object):
>
>
> class OFPMatch(StringifyMixin):
> - def __init__(self, fields=[], type_=None, length=None):
> + def __init__(self, fields=[], type_=None):
> super(OFPMatch, self).__init__()
> self._wc = FlowWildcards()
> self._flow = Flow()
> @@ -1574,8 +1574,6 @@ class OFPMatch(StringifyMixin):
> # accept type_ and length to be compatible with parser
> if not type_ is None:
> self.type = type_
> - if not length is None:
> - self.length = length
> if fields:
> # we are doing de-stringify.
> # we have two goals:
> @@ -1807,7 +1805,7 @@ class OFPMatch(StringifyMixin):
> type_, length = struct.unpack_from('!HH', buf, offset)
>
> match.type = type_
> - match.length = length
> + match._length = length
>
> # ofp_match adjustment
> offset += 4
> --
> 1.8.1.5
>
>
> ------------------------------------------------------------------------------
> This SF.net email is sponsored by Windows:
>
> Build for Windows Store.
>
> http://p.sf.net/sfu/windows-dev2dev
> _______________________________________________
> Ryu-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/ryu-devel
>
--
yamahata
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
