Move capwap timeout functions into new file

build/Makefile_common.am

@@ -20,6 +20,7 @@
 capwap_SOURCES = \
 	$(top_srcdir)/src/common/md5.c \
 	$(top_srcdir)/src/common/capwap.c \
+	$(top_srcdir)/src/common/capwap_timeout.c \
 	$(top_srcdir)/src/common/capwap_network.c \
 	$(top_srcdir)/src/common/capwap_protocol.c \
 	$(top_srcdir)/src/common/capwap_logging.c \

src/common/capwap.c

@@ -5,136 +5,6 @@ void capwap_exit(int errorcode) {
 	exit(errorcode);
 }
 
-/* Helper timeout calc */
-struct timeout_control* capwap_timeout_init(void) {
-	struct timeout_control* timeout;
-
-	timeout = (struct timeout_control*)capwap_alloc(sizeof(struct timeout_control));
-	memset(timeout, 0, sizeof(struct timeout_control));
-
-	return timeout;
-}
-
-/* */
-void capwap_timeout_free(struct timeout_control* timeout) {
-	ASSERT(timeout != NULL);
-
-	capwap_free(timeout);
-}
-
-/* */
-void capwap_timeout_update(struct timeout_control* timeout) {
-	int i;
-	struct timeval now;
-	
-	ASSERT(timeout);
-	
-	gettimeofday(&now, NULL);
-	
-	for (i = 0; i < CAPWAP_MAX_TIMER; i++) {
-		if (timeout->items[i].enable && (timeout->items[i].delta >= 0)) {
-			timeout->items[i].delta = (timeout->items[i].timestop.tv_sec - now.tv_sec) * 1000 + (timeout->items[i].timestop.tv_usec - now.tv_usec) / 1000;
-			if (timeout->items[i].delta < 0) {
-				timeout->items[i].delta = 0;
-			} else if (timeout->items[i].delta > timeout->items[i].durate) {
-				/* Changed system time */
-				timeout->items[i].delta = timeout->items[i].durate;
-				memcpy(&timeout->items[i].timestop, &now, sizeof(struct timeval));
-				timeout->items[i].timestop.tv_sec += timeout->items[i].durate;
-			}
-		}
-	}
-}
-
-/* */
-long capwap_timeout_get(struct timeout_control* timeout, long* index) {
-	long i;
-	long delta = 0;
-
-	ASSERT(timeout != NULL);
-	ASSERT(index != NULL);
-	
-	*index = CAPWAP_TIMER_UNDEF;
-	for (i = 0; i < CAPWAP_MAX_TIMER; i++) {
-		if (timeout->items[i].enable) {
-			if (timeout->items[i].delta <= 0) {
-				*index = i;
-				delta = 0;
-				break;
-			} else if (!delta || (delta > timeout->items[i].delta)) {
-				*index = i;
-				delta = timeout->items[i].delta;
-			}
-		}
-	}
-	
-	return delta;
-}
-
-/* */
-void capwap_timeout_wait(struct timeout_control* timeout, unsigned long index) {
-	ASSERT(timeout != NULL);
-	ASSERT(index < CAPWAP_MAX_TIMER);
-
-	if (timeout->items[index].enable) {
-		for (capwap_timeout_update(timeout); timeout->items[index].delta > 0; capwap_timeout_update(timeout)) {
-			usleep((useconds_t)timeout->items[index].delta * 1000);
-		}
-	}
-}
-
-/* */
-int capwap_timeout_isenable(struct timeout_control* timeout, unsigned long index) {
-	ASSERT(timeout != NULL);
-	ASSERT(index < CAPWAP_MAX_TIMER);
-
-	return (timeout->items[index].enable ? 1 : 0);
-}
-
-/* */
-int capwap_timeout_hasexpired(struct timeout_control* timeout, unsigned long index) {
-	ASSERT(timeout != NULL);
-	ASSERT(index < CAPWAP_MAX_TIMER);
-
-	if (timeout->items[index].enable && (timeout->items[index].delta <= 0)) {
-		return 1;
-	}
-
-	return 0;
-}
-
-/* */
-void capwap_timeout_set(unsigned long value, struct timeout_control* timeout, unsigned long index) {
-	ASSERT(timeout != NULL);
-	ASSERT(index < CAPWAP_MAX_TIMER);
-	
-	/* Set timeout in ms */
-	timeout->items[index].enable = 1;
-	timeout->items[index].delta = value * 1000;
-	timeout->items[index].durate = timeout->items[index].delta;
-	gettimeofday(&timeout->items[index].timestop, NULL);
-	timeout->items[index].timestop.tv_sec += value;
-}
-
-/* */
-void capwap_timeout_kill(struct timeout_control* timeout, unsigned long index) {
-	ASSERT(timeout != NULL);
-	ASSERT(index < CAPWAP_MAX_TIMER);
-	
-	timeout->items[index].enable = 0;
-}
-
-/* */
-void capwap_timeout_killall(struct timeout_control* timeout) {
-	long i;
-
-	ASSERT(timeout != NULL);
-
-	for (i = 0; i < CAPWAP_MAX_TIMER; i++) {
-		timeout->items[i].enable = 0;
-	}
-}
-
 /* Init randon generator */
 void capwap_init_rand(void) {
 	srand(time(NULL));

src/common/capwap.h

@@ -58,6 +58,7 @@
 #include "capwap_logging.h"
 #include "capwap_debug.h"
 #include "capwap_error.h"
+#include "capwap_timeout.h"
 
 /* Helper exit */
 void capwap_exit(int errorcode);
@@ -66,40 +67,6 @@ void capwap_exit(int errorcode);
 void capwap_init_rand(void);
 int capwap_get_rand(int max);
 
-/* Helper timeout calc */
-struct timeout_control_item {
-	int enable;
-	long delta;
-	unsigned long durate;
-	struct timeval timestop;
-};
-
-#define CAPWAP_TIMER_UNDEF						-1
-#define CAPWAP_TIMER_CONTROL_CONNECTION			0
-#define CAPWAP_TIMER_CONTROL_ECHO				1
-#define CAPWAP_TIMER_DATA_KEEPALIVE				2
-#define CAPWAP_TIMER_DATA_KEEPALIVEDEAD			3
-#define CAPWAP_MAX_TIMER						4
-
-struct timeout_control {
-	struct timeout_control_item items[CAPWAP_MAX_TIMER];
-};
-
-struct timeout_control* capwap_timeout_init(void);
-void capwap_timeout_free(struct timeout_control* timeout);
-
-long capwap_timeout_get(struct timeout_control* timeout, long* index);
-void capwap_timeout_update(struct timeout_control* timeout);
-void capwap_timeout_set(unsigned long value, struct timeout_control* timeout, unsigned long index);
-
-void capwap_timeout_wait(struct timeout_control* timeout, unsigned long index);
-
-int capwap_timeout_isenable(struct timeout_control* timeout, unsigned long index);
-int capwap_timeout_hasexpired(struct timeout_control* timeout, unsigned long index);
-
-void capwap_timeout_kill(struct timeout_control* timeout, unsigned long index);
-void capwap_timeout_killall(struct timeout_control* timeout);
-
 /* */
 void capwap_daemon(void);
 

src/common/capwap_timeout.c

@@ -0,0 +1,131 @@
+#include "capwap.h"
+
+/* */
+struct timeout_control* capwap_timeout_init(void) {
+	struct timeout_control* timeout;
+
+	timeout = (struct timeout_control*)capwap_alloc(sizeof(struct timeout_control));
+	memset(timeout, 0, sizeof(struct timeout_control));
+
+	return timeout;
+}
+
+/* */
+void capwap_timeout_free(struct timeout_control* timeout) {
+	ASSERT(timeout != NULL);
+
+	capwap_free(timeout);
+}
+
+/* */
+void capwap_timeout_update(struct timeout_control* timeout) {
+	int i;
+	struct timeval now;
+	
+	ASSERT(timeout);
+	
+	gettimeofday(&now, NULL);
+	
+	for (i = 0; i < CAPWAP_MAX_TIMER; i++) {
+		if (timeout->items[i].enable && (timeout->items[i].delta >= 0)) {
+			timeout->items[i].delta = (timeout->items[i].timestop.tv_sec - now.tv_sec) * 1000 + (timeout->items[i].timestop.tv_usec - now.tv_usec) / 1000;
+			if (timeout->items[i].delta < 0) {
+				timeout->items[i].delta = 0;
+			} else if (timeout->items[i].delta > timeout->items[i].durate) {
+				/* Changed system time */
+				timeout->items[i].delta = timeout->items[i].durate;
+				memcpy(&timeout->items[i].timestop, &now, sizeof(struct timeval));
+				timeout->items[i].timestop.tv_sec += timeout->items[i].durate;
+			}
+		}
+	}
+}
+
+/* */
+long capwap_timeout_get(struct timeout_control* timeout, long* index) {
+	long i;
+	long delta = 0;
+
+	ASSERT(timeout != NULL);
+	ASSERT(index != NULL);
+	
+	*index = CAPWAP_TIMER_UNDEF;
+	for (i = 0; i < CAPWAP_MAX_TIMER; i++) {
+		if (timeout->items[i].enable) {
+			if (timeout->items[i].delta <= 0) {
+				*index = i;
+				delta = 0;
+				break;
+			} else if (!delta || (delta > timeout->items[i].delta)) {
+				*index = i;
+				delta = timeout->items[i].delta;
+			}
+		}
+	}
+	
+	return delta;
+}
+
+/* */
+void capwap_timeout_wait(struct timeout_control* timeout, unsigned long index) {
+	ASSERT(timeout != NULL);
+	ASSERT(index < CAPWAP_MAX_TIMER);
+
+	if (timeout->items[index].enable) {
+		for (capwap_timeout_update(timeout); timeout->items[index].delta > 0; capwap_timeout_update(timeout)) {
+			usleep((useconds_t)timeout->items[index].delta * 1000);
+		}
+	}
+}
+
+/* */
+int capwap_timeout_isenable(struct timeout_control* timeout, unsigned long index) {
+	ASSERT(timeout != NULL);
+	ASSERT(index < CAPWAP_MAX_TIMER);
+
+	return (timeout->items[index].enable ? 1 : 0);
+}
+
+/* */
+int capwap_timeout_hasexpired(struct timeout_control* timeout, unsigned long index) {
+	ASSERT(timeout != NULL);
+	ASSERT(index < CAPWAP_MAX_TIMER);
+
+	if (timeout->items[index].enable && (timeout->items[index].delta <= 0)) {
+		return 1;
+	}
+
+	return 0;
+}
+
+/* */
+void capwap_timeout_set(unsigned long value, struct timeout_control* timeout, unsigned long index) {
+	ASSERT(timeout != NULL);
+	ASSERT(index < CAPWAP_MAX_TIMER);
+	
+	/* Set timeout in ms */
+	timeout->items[index].enable = 1;
+	timeout->items[index].delta = value * 1000;
+	timeout->items[index].durate = timeout->items[index].delta;
+	gettimeofday(&timeout->items[index].timestop, NULL);
+	timeout->items[index].timestop.tv_sec += value;
+}
+
+/* */
+void capwap_timeout_kill(struct timeout_control* timeout, unsigned long index) {
+	ASSERT(timeout != NULL);
+	ASSERT(index < CAPWAP_MAX_TIMER);
+	
+	timeout->items[index].enable = 0;
+}
+
+/* */
+void capwap_timeout_killall(struct timeout_control* timeout) {
+	long i;
+
+	ASSERT(timeout != NULL);
+
+	for (i = 0; i < CAPWAP_MAX_TIMER; i++) {
+		timeout->items[i].enable = 0;
+	}
+}

src/common/capwap_timeout.h

@@ -0,0 +1,39 @@
+#ifndef __CAPWAP_TIMEOUT_HEADER__
+#define __CAPWAP_TIMEOUT_HEADER__
+
+#define CAPWAP_TIMER_UNDEF						-1
+#define CAPWAP_TIMER_CONTROL_CONNECTION			0
+#define CAPWAP_TIMER_CONTROL_ECHO				1
+#define CAPWAP_TIMER_DATA_KEEPALIVE				2
+#define CAPWAP_TIMER_DATA_KEEPALIVEDEAD			3
+#define CAPWAP_MAX_TIMER						4
+
+/* */
+struct timeout_control_item {
+	int enable;
+	long delta;
+	unsigned long durate;
+	struct timeval timestop;
+};
+
+struct timeout_control {
+	struct timeout_control_item items[CAPWAP_MAX_TIMER];
+};
+
+/* */
+struct timeout_control* capwap_timeout_init(void);
+void capwap_timeout_free(struct timeout_control* timeout);
+
+long capwap_timeout_get(struct timeout_control* timeout, long* index);
+void capwap_timeout_update(struct timeout_control* timeout);
+void capwap_timeout_set(unsigned long value, struct timeout_control* timeout, unsigned long index);
+
+void capwap_timeout_wait(struct timeout_control* timeout, unsigned long index);
+
+int capwap_timeout_isenable(struct timeout_control* timeout, unsigned long index);
+int capwap_timeout_hasexpired(struct timeout_control* timeout, unsigned long index);
+
+void capwap_timeout_kill(struct timeout_control* timeout, unsigned long index);
+void capwap_timeout_killall(struct timeout_control* timeout);
+
+#endif /* __CAPWAP_TIMEOUT_HEADER__ */