X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Flacp.h;h=293fc454d2f0d7ca1f9ae857ccf361949927b86a;hb=2a529ead2a3a3a6367896834ef2024ea1a6dd396;hp=38c8f6eb4de4803ad32ec0d59e87c9babf47717f;hpb=0f1a47f108ba6c599b252bc1b17ea59609d60e09;p=openvswitch

diff --git a/lib/lacp.h b/lib/lacp.h
index 38c8f6eb..293fc454 100644
--- a/lib/lacp.h
+++ b/lib/lacp.h
@@ -21,12 +21,28 @@
 #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. */
+};
+
+enum lacp_status {
+    LACP_NEGOTIATED,                  /* Successful LACP negotations. */
+    LACP_CONFIGURED,                  /* LACP is enabled but not negotiated. */
+    LACP_DISABLED                     /* LACP is not enabled. */
+};
+
 struct lacp_settings {
-    char *name;
-    uint8_t id[ETH_ADDR_LEN];
-    uint16_t priority;
-    bool active;
-    bool fast;
+    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);
@@ -36,14 +52,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 *);
-bool lacp_negotiated(const struct lacp *);
+void lacp_process_packet(struct lacp *, const void *slave,
+                         const struct ofpbuf *packet);
+enum lacp_status lacp_status(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_,
@@ -52,9 +69,10 @@ void lacp_slave_unregister(struct lacp *, const void *slave);
 void lacp_slave_carrier_changed(const struct lacp *, const void *slave);
 bool lacp_slave_may_enable(const struct lacp *, const void *slave);
 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 *);