X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Freconnect.h;h=4446713ce8734d078ea8c9266341f7f856eddb82;hb=c5cf10598f8c9f4428291e9df3ecd72a05fb1ccf;hp=9dfcfd7dfa276bc9b7b5920bdc3ccaeca88870e9;hpb=f125905cdd3dc0339ad968c0a70128807884b400;p=sliver-openvswitch.git

diff --git a/lib/reconnect.h b/lib/reconnect.h
index 9dfcfd7df..4446713ce 100644
--- a/lib/reconnect.h
+++ b/lib/reconnect.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2012 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,6 @@
  * revisited later.) */
 
 #include <stdbool.h>
-#include "openvswitch/types.h"
 
 struct reconnect *reconnect_create(long long int now);
 void reconnect_destroy(struct reconnect *);
@@ -49,7 +48,6 @@ void reconnect_set_name(struct reconnect *, const char *name);
 int reconnect_get_min_backoff(const struct reconnect *);
 int reconnect_get_max_backoff(const struct reconnect *);
 int reconnect_get_probe_interval(const struct reconnect *);
-uint8_t reconnect_get_dscp(const struct reconnect *);
 
 void reconnect_set_max_tries(struct reconnect *, unsigned int max_tries);
 unsigned int reconnect_get_max_tries(struct reconnect *);
@@ -57,7 +55,6 @@ unsigned int reconnect_get_max_tries(struct reconnect *);
 void reconnect_set_backoff(struct reconnect *,
                            int min_backoff, int max_backoff);
 void reconnect_set_probe_interval(struct reconnect *, int probe_interval);
-void reconnect_set_dscp(struct reconnect *, uint8_t dscp);
 
 bool reconnect_is_passive(const struct reconnect *);
 void reconnect_set_passive(struct reconnect *, bool passive,
@@ -82,7 +79,7 @@ void reconnect_listen_error(struct reconnect *, long long int now, int error);
 void reconnect_connected(struct reconnect *, long long int now);
 void reconnect_connect_failed(struct reconnect *, long long int now,
                               int error);
-void reconnect_received(struct reconnect *, long long int now);
+void reconnect_activity(struct reconnect *, long long int now);
 
 enum reconnect_action {
     RECONNECT_CONNECT = 1,
@@ -96,7 +93,7 @@ int reconnect_timeout(struct reconnect *, long long int now);
 struct reconnect_stats {
     /* All times and durations in this structure are in milliseconds. */
     long long int creation_time;     /* Time reconnect_create() called. */
-    long long int last_received;     /* Last call to reconnect_received(). */
+    long long int last_activity;     /* Last call to reconnect_activity(). */
     long long int last_connected;    /* Last call to reconnect_connected(). */
     long long int last_disconnected; /* Last call to reconnect_disconnected(). */
     int backoff;                     /* Current backoff duration.  */