X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Flacp.h;h=1d717d608b3c2e062f861b653529402013da1120;hb=fbac791aea04553de6efa02e78a9724d85cccb88;hp=ad8211efc5dd848f27db58d003c403ac85f54171;hpb=206018136a10d00b275d85386c5744a555584151;p=openvswitch

diff --git a/lib/lacp.h b/lib/lacp.h
index ad8211ef..1d717d60 100644
--- a/lib/lacp.h
+++ b/lib/lacp.h
@@ -21,13 +21,22 @@
 #include <stdint.h>
 #include "packets.h"
 
+/* LACP Protocol Implementation. */
+
+enum lacp_time {
+    LACP_TIME_FAST,                   /* LACP fast mode. */
+    LACP_TIME_SLOW,                   /* LACP slow mode. */
+    LACP_TIME_CUSTOM                  /* Nonstandard custom mode. */
+};
+
 struct lacp_settings {
-    char *name;
-    uint8_t id[ETH_ADDR_LEN];
-    uint16_t priority;
-    bool active;
-    bool fast;
-    bool strict;
+    char *name;                       /* Name (for debugging). */
+    uint8_t id[ETH_ADDR_LEN];         /* System ID. Must be nonzero. */
+    uint16_t priority;                /* System priority. */
+    bool active;                      /* Active or passive mode? */
+    enum lacp_time lacp_time;         /* Probe rate. */
+    long long int custom_time;        /* Probe interval if LACP_TIME_CUSTOM. */
+    bool heartbeat;                   /* Heartbeat mode. */
 };
 
 void lacp_init(void);
@@ -37,14 +46,15 @@ void lacp_destroy(struct lacp *);
 void lacp_configure(struct lacp *, const struct lacp_settings *);
 bool lacp_is_active(const struct lacp *);
 
-void lacp_process_pdu(struct lacp *, const void *slave,
-                      const struct lacp_pdu *);
+void lacp_process_packet(struct lacp *, const void *slave,
+                         const struct ofpbuf *packet);
 bool lacp_negotiated(const struct lacp *);
 
 struct lacp_slave_settings {
-    char *name;
-    uint16_t id;
-    uint16_t priority;
+    char *name;                       /* Name (for debugging). */
+    uint16_t id;                      /* Port ID. */
+    uint16_t priority;                /* Port priority. */
+    uint16_t key;                     /* Aggregation key. */
 };
 
 void lacp_slave_register(struct lacp *, void *slave_,
@@ -56,7 +66,7 @@ uint16_t lacp_slave_get_port_id(const struct lacp *, const void *slave);
 bool lacp_slave_is_current(const struct lacp *, const void *slave_);
 
 /* Callback function for lacp_run() for sending a LACP PDU. */
-typedef void lacp_send_pdu(void *slave, const struct lacp_pdu *);
+typedef void lacp_send_pdu(void *slave, const void *pdu, size_t pdu_size);
 
 void lacp_run(struct lacp *, lacp_send_pdu *);
 void lacp_wait(struct lacp *);