[netfilter-cvslog] r7292 - in trunk/conntrack-tools: . include src

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2008-01-23 13:15:25 +0100 (Wed, 23 Jan 2008)
New Revision: 7292

Modified:
   trunk/conntrack-tools/ChangeLog
   trunk/conntrack-tools/include/alarm.h
   trunk/conntrack-tools/src/alarm.c
   trunk/conntrack-tools/src/cache_timer.c
Log:
Max Kellermann <max at duempel.org>:
introduce alarm_pending()


Modified: trunk/conntrack-tools/ChangeLog
===================================================================
--- trunk/conntrack-tools/ChangeLog	2008-01-23 11:45:29 UTC (rev 7291)
+++ trunk/conntrack-tools/ChangeLog	2008-01-23 12:15:25 UTC (rev 7292)
@@ -94,6 +94,7 @@
 o added struct local_server, several cleanups in local socket infrastructure
 o remove unused prototypes in network.h
 o check if the received packet is large enough
+o introduce alarm_pending()
 
 version 0.9.5 (2007/07/29)
 ------------------------------

Modified: trunk/conntrack-tools/include/alarm.h
===================================================================
--- trunk/conntrack-tools/include/alarm.h	2008-01-23 11:45:29 UTC (rev 7291)
+++ trunk/conntrack-tools/include/alarm.h	2008-01-23 12:15:25 UTC (rev 7292)
@@ -24,6 +24,8 @@
 
 void del_alarm(struct alarm_list *alarm);
 
+int alarm_pending(struct alarm_list *alarm);
+
 struct timeval *
 get_next_alarm_run(struct timeval *next_alarm);
 

Modified: trunk/conntrack-tools/src/alarm.c
===================================================================
--- trunk/conntrack-tools/src/alarm.c	2008-01-23 11:45:29 UTC (rev 7291)
+++ trunk/conntrack-tools/src/alarm.c	2008-01-23 12:15:25 UTC (rev 7292)
@@ -70,6 +70,14 @@
 		list_del_init(&alarm->head);
 }
 
+int alarm_pending(struct alarm_list *alarm)
+{
+	if (list_empty(&alarm->head))
+		return 0;
+
+	return 1;
+}
+
 static struct timeval *
 calculate_next_run(struct timeval *cand,
 		   struct timeval *tv, 

Modified: trunk/conntrack-tools/src/cache_timer.c
===================================================================
--- trunk/conntrack-tools/src/cache_timer.c	2008-01-23 11:45:29 UTC (rev 7291)
+++ trunk/conntrack-tools/src/cache_timer.c	2008-01-23 12:15:25 UTC (rev 7292)
@@ -60,6 +60,9 @@
 	if (type == NFCT_O_XML)
 		return 0;
 
+	if (!alarm_pending(alarm))
+		return 0;
+
 	gettimeofday(&tv, NULL);
 	timersub(&tv, &alarm->tv, &tmp);
 	return sprintf(buf, " [expires in %lds]", tmp.tv_sec);