From: Ethan Jackson Date: Mon, 18 Apr 2011 19:33:14 +0000 (-0700) Subject: lacp: Move LACP packet data to lacp header file. X-Git-Tag: v1.2.0~427 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=81aee5f901556e778069a70613d99a87ddcf2116;p=sliver-openvswitch.git lacp: Move LACP packet data to lacp header file. --- diff --git a/lib/lacp.c b/lib/lacp.c index 3c7b1caab..7a7ca6efe 100644 --- a/lib/lacp.c +++ b/lib/lacp.c @@ -87,6 +87,51 @@ static bool info_tx_equal(struct lacp_info *, struct lacp_info *); static void lacp_unixctl_show(struct unixctl_conn *, const char *args, void *aux); +/* Populates 'pdu' with a LACP PDU comprised of 'actor' and 'partner'. */ +void +compose_lacp_pdu(const struct lacp_info *actor, + const struct lacp_info *partner, struct lacp_pdu *pdu) +{ + memset(pdu, 0, sizeof *pdu); + + pdu->subtype = 1; + pdu->version = 1; + + pdu->actor_type = 1; + pdu->actor_len = 20; + pdu->actor = *actor; + + pdu->partner_type = 2; + pdu->partner_len = 20; + pdu->partner = *partner; + + pdu->collector_type = 3; + pdu->collector_len = 16; + pdu->collector_delay = htons(0); +} + +/* Parses 'b' which represents a packet containing a LACP PDU. This function + * returns NULL if 'b' is malformed, or does not represent a LACP PDU format + * supported by OVS. Otherwise, it returns a pointer to the lacp_pdu contained + * within 'b'. */ +const struct lacp_pdu * +parse_lacp_packet(const struct ofpbuf *b) +{ + const struct lacp_pdu *pdu; + + pdu = ofpbuf_at(b, (uint8_t *)b->l3 - (uint8_t *)b->data, LACP_PDU_LEN); + + if (pdu && pdu->subtype == 1 + && pdu->actor_type == 1 && pdu->actor_len == 20 + && pdu->partner_type == 2 && pdu->partner_len == 20) { + return pdu; + } else { + return NULL; + } +} + +/* LACP Protocol Implementation. */ + /* Initializes the lacp module. */ void lacp_init(void) diff --git a/lib/lacp.h b/lib/lacp.h index ad8211efc..8371feceb 100644 --- a/lib/lacp.h +++ b/lib/lacp.h @@ -21,6 +21,61 @@ #include #include "packets.h" +/* Masks for lacp_info state member. */ +#define LACP_STATE_ACT 0x01 /* Activity. Active or passive? */ +#define LACP_STATE_TIME 0x02 /* Timeout. Short or long timeout? */ +#define LACP_STATE_AGG 0x04 /* Aggregation. Is the link is bondable? */ +#define LACP_STATE_SYNC 0x08 /* Synchronization. Is the link in up to date? */ +#define LACP_STATE_COL 0x10 /* Collecting. Is the link receiving frames? */ +#define LACP_STATE_DIST 0x20 /* Distributing. Is the link sending frames? */ +#define LACP_STATE_DEF 0x40 /* Defaulted. Using default partner info? */ +#define LACP_STATE_EXP 0x80 /* Expired. Using expired partner info? */ + +#define LACP_FAST_TIME_TX 1000 /* Fast transmission rate. */ +#define LACP_SLOW_TIME_TX 30000 /* Slow transmission rate. */ +#define LACP_FAST_TIME_RX (LACP_FAST_TIME_TX * 3) /* Fast receive rate. */ +#define LACP_SLOW_TIME_RX (LACP_SLOW_TIME_TX * 3) /* Slow receive rate. */ + +#define LACP_INFO_LEN 15 +struct lacp_info { + ovs_be16 sys_priority; /* System priority. */ + uint8_t sys_id[ETH_ADDR_LEN]; /* System ID. */ + ovs_be16 key; /* Operational key. */ + ovs_be16 port_priority; /* Port priority. */ + ovs_be16 port_id; /* Port ID. */ + uint8_t state; /* State mask. See LACP_STATE macros. */ +} __attribute__((packed)); +BUILD_ASSERT_DECL(LACP_INFO_LEN == sizeof(struct lacp_info)); + +#define LACP_PDU_LEN 110 +struct lacp_pdu { + uint8_t subtype; /* Always 1. */ + uint8_t version; /* Always 1. */ + + uint8_t actor_type; /* Always 1. */ + uint8_t actor_len; /* Always 20. */ + struct lacp_info actor; /* LACP actor information. */ + uint8_t z1[3]; /* Reserved. Always 0. */ + + uint8_t partner_type; /* Always 2. */ + uint8_t partner_len; /* Always 20. */ + struct lacp_info partner; /* LACP partner information. */ + uint8_t z2[3]; /* Reserved. Always 0. */ + + uint8_t collector_type; /* Always 3. */ + uint8_t collector_len; /* Always 16. */ + ovs_be16 collector_delay; /* Maximum collector delay. Set to UINT16_MAX. */ + uint8_t z3[64]; /* Combination of several fields. Always 0. */ +} __attribute__((packed)); +BUILD_ASSERT_DECL(LACP_PDU_LEN == sizeof(struct lacp_pdu)); + +void compose_lacp_pdu(const struct lacp_info *actor, + const struct lacp_info *partner, struct lacp_pdu *); + +const struct lacp_pdu *parse_lacp_packet(const struct ofpbuf *); + +/* LACP Protocol Implementation. */ + struct lacp_settings { char *name; uint8_t id[ETH_ADDR_LEN]; diff --git a/lib/packets.c b/lib/packets.c index d2229cd21..e05e3ebca 100644 --- a/lib/packets.c +++ b/lib/packets.c @@ -289,46 +289,3 @@ snap_compose(struct ofpbuf *b, const uint8_t eth_dst[ETH_ADDR_LEN], return payload; } - -/* Populates 'pdu' with a LACP PDU comprised of 'actor' and 'partner'. */ -void -compose_lacp_pdu(const struct lacp_info *actor, - const struct lacp_info *partner, struct lacp_pdu *pdu) -{ - memset(pdu, 0, sizeof *pdu); - - pdu->subtype = 1; - pdu->version = 1; - - pdu->actor_type = 1; - pdu->actor_len = 20; - pdu->actor = *actor; - - pdu->partner_type = 2; - pdu->partner_len = 20; - pdu->partner = *partner; - - pdu->collector_type = 3; - pdu->collector_len = 16; - pdu->collector_delay = htons(0); -} - -/* Parses 'b' which represents a packet containing a LACP PDU. This function - * returns NULL if 'b' is malformed, or does not represent a LACP PDU format - * supported by OVS. Otherwise, it returns a pointer to the lacp_pdu contained - * within 'b'. */ -const struct lacp_pdu * -parse_lacp_packet(const struct ofpbuf *b) -{ - const struct lacp_pdu *pdu; - - pdu = ofpbuf_at(b, (uint8_t *)b->l3 - (uint8_t *)b->data, LACP_PDU_LEN); - - if (pdu && pdu->subtype == 1 - && pdu->actor_type == 1 && pdu->actor_len == 20 - && pdu->partner_type == 2 && pdu->partner_len == 20) { - return pdu; - } else { - return NULL; - } -} diff --git a/lib/packets.h b/lib/packets.h index 251fc1cb3..f45c33121 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -403,57 +403,4 @@ void *snap_compose(struct ofpbuf *, const uint8_t eth_dst[ETH_ADDR_LEN], const uint8_t eth_src[ETH_ADDR_LEN], unsigned int oui, uint16_t snap_type, size_t size); -/* Masks for lacp_info state member. */ -#define LACP_STATE_ACT 0x01 /* Activity. Active or passive? */ -#define LACP_STATE_TIME 0x02 /* Timeout. Short or long timeout? */ -#define LACP_STATE_AGG 0x04 /* Aggregation. Is the link is bondable? */ -#define LACP_STATE_SYNC 0x08 /* Synchronization. Is the link in up to date? */ -#define LACP_STATE_COL 0x10 /* Collecting. Is the link receiving frames? */ -#define LACP_STATE_DIST 0x20 /* Distributing. Is the link sending frames? */ -#define LACP_STATE_DEF 0x40 /* Defaulted. Using default partner info? */ -#define LACP_STATE_EXP 0x80 /* Expired. Using expired partner info? */ - -#define LACP_FAST_TIME_TX 1000 /* Fast transmission rate. */ -#define LACP_SLOW_TIME_TX 30000 /* Slow transmission rate. */ -#define LACP_FAST_TIME_RX (LACP_FAST_TIME_TX * 3) /* Fast receive rate. */ -#define LACP_SLOW_TIME_RX (LACP_SLOW_TIME_TX * 3) /* Slow receive rate. */ - -#define LACP_INFO_LEN 15 -struct lacp_info { - ovs_be16 sys_priority; /* System priority. */ - uint8_t sys_id[ETH_ADDR_LEN]; /* System ID. */ - ovs_be16 key; /* Operational key. */ - ovs_be16 port_priority; /* Port priority. */ - ovs_be16 port_id; /* Port ID. */ - uint8_t state; /* State mask. See LACP_STATE macros. */ -} __attribute__((packed)); -BUILD_ASSERT_DECL(LACP_INFO_LEN == sizeof(struct lacp_info)); - -#define LACP_PDU_LEN 110 -struct lacp_pdu { - uint8_t subtype; /* Always 1. */ - uint8_t version; /* Always 1. */ - - uint8_t actor_type; /* Always 1. */ - uint8_t actor_len; /* Always 20. */ - struct lacp_info actor; /* LACP actor information. */ - uint8_t z1[3]; /* Reserved. Always 0. */ - - uint8_t partner_type; /* Always 2. */ - uint8_t partner_len; /* Always 20. */ - struct lacp_info partner; /* LACP partner information. */ - uint8_t z2[3]; /* Reserved. Always 0. */ - - uint8_t collector_type; /* Always 3. */ - uint8_t collector_len; /* Always 16. */ - ovs_be16 collector_delay; /* Maximum collector delay. Set to UINT16_MAX. */ - uint8_t z3[64]; /* Combination of several fields. Always 0. */ -} __attribute__((packed)); -BUILD_ASSERT_DECL(LACP_PDU_LEN == sizeof(struct lacp_pdu)); - -void compose_lacp_pdu(const struct lacp_info *actor, - const struct lacp_info *partner, struct lacp_pdu *); - -const struct lacp_pdu *parse_lacp_packet(const struct ofpbuf *); - #endif /* packets.h */