I chose this inconsistency because the spec is inconsistent. :-(
>From the spec 1.0,
struct ofp_desc_stats
struct ofp_flow_stats
struct ofp_aggregate_stats_reply
struct ofp_table_stats
struct ofp_port_stats
struct ofp_queue_stats
Later versions also keep this inconsistency.
Hmm, it seems that they decided to keep it instead of fixing it
with compatibility breakage.
I vote for going with the spec.
On Thu, May 17, 2012 at 11:28:38PM +0900, FUJITA Tomonori wrote:
> Signed-off-by: FUJITA Tomonori <[email protected]>
> ---
> ryu/ofproto/ofproto_v1_0.py | 7 +++----
> ryu/ofproto/ofproto_v1_0_parser.py | 4 ++--
> 2 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/ryu/ofproto/ofproto_v1_0.py b/ryu/ofproto/ofproto_v1_0.py
> index a757e13..a458b9b 100644
> --- a/ryu/ofproto/ofproto_v1_0.py
> +++ b/ryu/ofproto/ofproto_v1_0.py
> @@ -468,10 +468,9 @@ OFP_FLOW_STATS_PACK_STR = '!' +
> _OFP_FLOW_STATS_0_PACK_STR +\
> OFP_FLOW_STATS_SIZE = 88
> assert calcsize(OFP_FLOW_STATS_PACK_STR) == OFP_FLOW_STATS_SIZE
>
> -OFP_AGGREGATE_STATS_REPLY_PACK_STR = '!QQI4x'
> -OFP_AGGREGATE_STATS_REPLY_SIZE = 36
> -assert (calcsize(OFP_AGGREGATE_STATS_REPLY_PACK_STR) +
> - OFP_STATS_MSG_SIZE == OFP_AGGREGATE_STATS_REPLY_SIZE)
> +OFP_AGGREGATE_STATS_PACK_STR = '!QQI4x'
> +OFP_AGGREGATE_STATS_SIZE = 24
> +assert (calcsize(OFP_AGGREGATE_STATS_PACK_STR) == OFP_AGGREGATE_STATS_SIZE)
>
> OFP_TABLE_STATS_PACK_STR = '!B3x' + OFP_MAX_TABLE_NAME_LEN_STR + 'sIIIQQ'
> OFP_TABLE_STATS_SIZE = 64
> diff --git a/ryu/ofproto/ofproto_v1_0_parser.py
> b/ryu/ofproto/ofproto_v1_0_parser.py
> index 222d94b..8251f9c 100644
> --- a/ryu/ofproto/ofproto_v1_0_parser.py
> +++ b/ryu/ofproto/ofproto_v1_0_parser.py
> @@ -750,9 +750,9 @@ class
> OFPAggregateStats(collections.namedtuple('OFPAggregateStats',
> @classmethod
> def parser(cls, buf, offset):
> agg = struct.unpack_from(
> - ofproto_v1_0.OFP_AGGREGATE_STATS_REPLY_PACK_STR, buf, offset)
> + ofproto_v1_0.OFP_AGGREGATE_STATS_PACK_STR, buf, offset)
> stats = cls(*agg)
> - stats.length = ofproto_v1_0.OFP_AGGREGATE_STATS_REPLY_SIZE
> + stats.length = ofproto_v1_0.OFP_AGGREGATE_STATS_SIZE
> return stats
>
>
> --
> 1.7.4.4
>
>
> ------------------------------------------------------------------------------
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and
> threat landscape has changed and how IT managers can respond. Discussions
> will include endpoint security, mobile security and the latest in malware
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> _______________________________________________
> Ryu-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/ryu-devel
>
--
yamahata
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
