Refactoring timeout functions, change functions name and add timeout handler

into session.

src/common/capwap.c

@@ -6,13 +6,24 @@ void capwap_exit(int errorcode) {
 }
 
 /* Helper timeout calc */
-void capwap_init_timeout(struct timeout_control* timeout) {
-	ASSERT(timeout);
+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_update_timeout(struct timeout_control* 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;
 	
@@ -35,7 +46,8 @@ void capwap_update_timeout(struct timeout_control* timeout) {
 	}
 }
 
-long capwap_get_timeout(struct timeout_control* timeout, long* index) {
+/* */
+long capwap_timeout_get(struct timeout_control* timeout, long* index) {
 	long i;
 	long delta = 0;
 
@@ -59,25 +71,28 @@ long capwap_get_timeout(struct timeout_control* timeout, long* index) {
 	return delta;
 }
 
-void capwap_wait_timeout(struct timeout_control* timeout, unsigned long index) {
+/* */
+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_update_timeout(timeout); timeout->items[index].delta > 0; capwap_update_timeout(timeout)) {
+		for (capwap_timeout_update(timeout); timeout->items[index].delta > 0; capwap_timeout_update(timeout)) {
 			usleep((useconds_t)timeout->items[index].delta * 1000);
 		}
 	}
 }
 
-int capwap_is_enable_timeout(struct timeout_control* timeout, unsigned long index) {
+/* */
+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_is_timeout(struct timeout_control* timeout, unsigned long index) {
+/* */
+int capwap_timeout_hasexpired(struct timeout_control* timeout, unsigned long index) {
 	ASSERT(timeout != NULL);
 	ASSERT(index < CAPWAP_MAX_TIMER);
 
@@ -88,7 +103,8 @@ int capwap_is_timeout(struct timeout_control* timeout, unsigned long index) {
 	return 0;
 }
 
-void capwap_set_timeout(unsigned long value, struct timeout_control* timeout, unsigned long index) {
+/* */
+void capwap_timeout_set(unsigned long value, struct timeout_control* timeout, unsigned long index) {
 	ASSERT(timeout != NULL);
 	ASSERT(index < CAPWAP_MAX_TIMER);
 	
@@ -100,14 +116,16 @@ void capwap_set_timeout(unsigned long value, struct timeout_control* timeout, un
 	timeout->items[index].timestop.tv_sec += value;
 }
 
-void capwap_kill_timeout(struct timeout_control* timeout, unsigned long index) {
+/* */
+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_killall_timeout(struct timeout_control* timeout) {
+/* */
+void capwap_timeout_killall(struct timeout_control* timeout) {
 	long i;
 
 	ASSERT(timeout != NULL);

src/common/capwap.h

@@ -85,15 +85,20 @@ struct timeout_control {
 	struct timeout_control_item items[CAPWAP_MAX_TIMER];
 };
 
-void capwap_init_timeout(struct timeout_control* timeout);
-long capwap_get_timeout(struct timeout_control* timeout, long* index);
-void capwap_update_timeout(struct timeout_control* timeout);
-void capwap_set_timeout(unsigned long value, struct timeout_control* timeout, unsigned long index);
-void capwap_kill_timeout(struct timeout_control* timeout, unsigned long index);
-void capwap_wait_timeout(struct timeout_control* timeout, unsigned long index);
-void capwap_killall_timeout(struct timeout_control* timeout);
-int capwap_is_enable_timeout(struct timeout_control* timeout, unsigned long index);
-int capwap_is_timeout(struct timeout_control* timeout, unsigned long index);
+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_network.c

@@ -321,8 +321,8 @@ int capwap_wait_recvready(struct pollfd* fds, int fdscount, struct timeout_contr
 	if (timeout) {
 		long indextimer;
 		
-		capwap_update_timeout(timeout);
-		polltimeout = capwap_get_timeout(timeout, &indextimer);
+		capwap_timeout_update(timeout);
+		polltimeout = capwap_timeout_get(timeout, &indextimer);
 		if ((polltimeout <= 0) && (indextimer != CAPWAP_TIMER_UNDEF)) {
 			return CAPWAP_RECV_ERROR_TIMEOUT;
 		}
@@ -346,7 +346,7 @@ int capwap_wait_recvready(struct pollfd* fds, int fdscount, struct timeout_contr
 	} else if (readysocket == 0) {
 		/* Update timer for detect timeout */
 		if (timeout) {
-			capwap_update_timeout(timeout);
+			capwap_timeout_update(timeout);
 		}
 
 		return CAPWAP_RECV_ERROR_TIMEOUT;