Max Kellermann <max@duempel.org>:

import tcp_state_helper only once

2 files changed, 3 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 2c3c50f..63fe5f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,7 @@ o use the comma operator instead of curly braces
 o add missing function prototypes
 o merge several *_alarm() functions into init_alarm()
 o use add_alarm() in mod_alarm() to avoid code duplication
+o import tcp_state_helper only once
 
 version 0.9.5 (2007/07/29)
 ------------------------------
diff --git a/src/read_config_yy.y b/src/read_config_yy.y
index be484fe..317b45a 100644
--- a/src/read_config_yy.y
+++ b/src/read_config_yy.y
@@ -27,6 +27,8 @@
 #include "ignore.h"
 #include <syslog.h>
 
+extern struct state_replication_helper tcp_state_helper;
+
 extern char *yytext;
 extern int   yylineno;
 
@@ -471,47 +473,38 @@ state: tcp_state;
 
 tcp_state: T_SYN_SENT
 {
-	extern struct state_replication_helper tcp_state_helper;
 	state_helper_register(&tcp_state_helper, TCP_CONNTRACK_SYN_SENT);
 };
 tcp_state: T_SYN_RECV
 {
-	extern struct state_replication_helper tcp_state_helper;
 	state_helper_register(&tcp_state_helper, TCP_CONNTRACK_SYN_RECV);
 };
 tcp_state: T_ESTABLISHED
 {
-	extern struct state_replication_helper tcp_state_helper;
 	state_helper_register(&tcp_state_helper, TCP_CONNTRACK_ESTABLISHED);
 };
 tcp_state: T_FIN_WAIT
 {
-	extern struct state_replication_helper tcp_state_helper;
 	state_helper_register(&tcp_state_helper, TCP_CONNTRACK_FIN_WAIT);
 };
 tcp_state: T_CLOSE_WAIT
 {
-	extern struct state_replication_helper tcp_state_helper;
 	state_helper_register(&tcp_state_helper, TCP_CONNTRACK_CLOSE_WAIT);
 };
 tcp_state: T_LAST_ACK
 {
-	extern struct state_replication_helper tcp_state_helper;
 	state_helper_register(&tcp_state_helper, TCP_CONNTRACK_LAST_ACK);
 };
 tcp_state: T_TIME_WAIT
 {
-	extern struct state_replication_helper tcp_state_helper;
 	state_helper_register(&tcp_state_helper, TCP_CONNTRACK_TIME_WAIT);
 };
 tcp_state: T_CLOSE
 {
-	extern struct state_replication_helper tcp_state_helper;
 	state_helper_register(&tcp_state_helper, TCP_CONNTRACK_CLOSE);
 };
 tcp_state: T_LISTEN
 {
-	extern struct state_replication_helper tcp_state_helper;
 	state_helper_register(&tcp_state_helper, TCP_CONNTRACK_LISTEN);
 };