diff options
| author | Simon Horman <horms@verge.net.au> | 2014-03-11 10:42:08 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2014-03-16 21:42:26 +0900 |
| commit | a376cc93c8e9e5448c03900703f32252d556efdd (patch) | |
| tree | 60d8dbd8d0a9858f4dc691a40fccf0d17e64dff6 | |
| parent | c0a1fd6d99fd296c6ba2fbd6a41136be9cef23ef (diff) | |
of14: Remove incorrect OFP_ASYNC_CONFIG_{PACK_STR, SIZE}
OFP_ASYNC_CONFIG_PACK_STR and OFP_ASYNC_CONFIG_SIZE are based
on the OpenFlow 1.3 implementation and specification. However,
the Openflow 1.4 specification defines a rather different structure:
struct ofp_async_config {
struct ofp_header header; /* OFPT_GET_ASYNC_REPLY or OFPT_SET_ASYNC. */
/* Async config Property list - 0 or more */
struct ofp_async_config_prop_header properties[0];
};
OFP_ASSERT(sizeof(struct ofp_async_config) == 8);
In implementation terms this means that OFP_ASYNC_CONFIG_PACK_STR
is empty and OFP_ASYNC_CONFIG_SIZE is zero. In the new implementation
these values are unused so simply remove them.
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/ofproto/ofproto_v1_4.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ryu/ofproto/ofproto_v1_4.py b/ryu/ofproto/ofproto_v1_4.py index 200e9b09..8b9431e1 100644 --- a/ryu/ofproto/ofproto_v1_4.py +++ b/ryu/ofproto/ofproto_v1_4.py @@ -1375,12 +1375,6 @@ OFP_ROLE_STATUS_SIZE = 24 assert (calcsize(OFP_ROLE_STATUS_PACK_STR) + OFP_HEADER_SIZE == OFP_ROLE_STATUS_SIZE) -# struct ofp_async_config -OFP_ASYNC_CONFIG_PACK_STR = '!2I2I2I' -OFP_ASYNC_CONFIG_SIZE = 32 -assert (calcsize(OFP_ASYNC_CONFIG_PACK_STR) + OFP_HEADER_SIZE == - OFP_ASYNC_CONFIG_SIZE) - # enum ofp_async_config_prop_type OFPACPT_PACKET_IN_SLAVE = 0 # Packet-in mask for slave. OFPACPT_PACKET_IN_MASTER = 1 # Packet-in mask for master. |