mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-05-08 22:06:10 +02:00
Code Issues Projects Releases Wiki Activity

of14: Remove incorrect OFP_ASYNC_CONFIG_{PACK_STR, SIZE}

Browse Source 
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>
This commit is contained in:
Simon Horman 2014-03-11 10:42:08 +09:00 committed by FUJITA Tomonori
parent c0a1fd6d99
commit a376cc93c8
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ryu/ofproto/ofproto_v1_4.py
View File

@ -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.