o Restore include "conntrack.h" in ICMP handler

o Add missing flags coversion in SCTP handler

4 files changed, 16 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index befb699..e5d9bf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,6 @@
 	o Update manpage
 	o Missing static function declaration in the protocol handlers
 	o Use protocol flags defined in libnetfilter_conntrack
-	o Kill leftover #include "conntrack.h" in the ICMP helper
 	o Bumped version to 0.991
 
 2005-11-22
diff --git a/extensions/libct_proto_icmp.c b/extensions/libct_proto_icmp.c
index afae25e..57a621f 100644
--- a/extensions/libct_proto_icmp.c
+++ b/extensions/libct_proto_icmp.c
@@ -15,6 +15,7 @@
 #include <netinet/ip_icmp.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_icmp.h>
+#include "conntrack.h"
 
 static struct option opts[] = {
 	{"icmp-type", 1, 0, '1'},
diff --git a/extensions/libct_proto_sctp.c b/extensions/libct_proto_sctp.c
index 7ff1dcf..825cbd9 100644
--- a/extensions/libct_proto_sctp.c
+++ b/extensions/libct_proto_sctp.c
@@ -56,25 +56,25 @@ static int parse_options(char c, char *argv[],
 		case '1':
 			if (optarg) {
 				orig->l4src.sctp.port = htons(atoi(optarg));
-				*flags |= ORIG_SPORT;
+				*flags |= SCTP_ORIG_SPORT;
 			}
 			break;
 		case '2':
 			if (optarg) {
 				orig->l4dst.sctp.port = htons(atoi(optarg));
-				*flags |= ORIG_DPORT;
+				*flags |= SCTP_ORIG_DPORT;
 			}
 			break;
 		case '3':
 			if (optarg) {
 				reply->l4src.sctp.port = htons(atoi(optarg));
-				*flags |= REPL_SPORT;
+				*flags |= SCTP_REPL_SPORT;
 			}
 			break;
 		case '4':
 			if (optarg) {
 				reply->l4dst.sctp.port = htons(atoi(optarg));
-				*flags |= REPL_DPORT;
+				*flags |= SCTP_REPL_DPORT;
 			}
 			break;
 		case '5':
@@ -92,7 +92,7 @@ static int parse_options(char c, char *argv[],
 					printf("doh?\n");
 					return 0;
 				}
-				*flags |= STATE;
+				*flags |= SCTP_STATE;
 			}
 			break;
 	}
@@ -106,23 +106,23 @@ static int final_check(unsigned int flags,
 {
 	int ret = 0;
 	
-	if ((flags & (ORIG_SPORT|ORIG_DPORT)) 
-	    && !(flags & (REPL_SPORT|REPL_DPORT))) {
+	if ((flags & (SCTP_ORIG_SPORT|SCTP_ORIG_DPORT)) 
+	    && !(flags & (SCTP_REPL_SPORT|SCTP_REPL_DPORT))) {
 		reply->l4src.sctp.port = orig->l4dst.sctp.port;
 		reply->l4dst.sctp.port = orig->l4src.sctp.port;
 		ret = 1;
-	} else if (!(flags & (ORIG_SPORT|ORIG_DPORT))
-	            && (flags & (REPL_SPORT|REPL_DPORT))) {
+	} else if (!(flags & (SCTP_ORIG_SPORT|SCTP_ORIG_DPORT))
+	            && (flags & (SCTP_REPL_SPORT|SCTP_REPL_DPORT))) {
 		orig->l4src.sctp.port = reply->l4dst.sctp.port;
 		orig->l4dst.sctp.port = reply->l4src.sctp.port;
 		ret = 1;
 	}
-	if ((flags & (ORIG_SPORT|ORIG_DPORT)) 
-	    && ((flags & (REPL_SPORT|REPL_DPORT))))
+	if ((flags & (SCTP_ORIG_SPORT|SCTP_ORIG_DPORT)) 
+	    && ((flags & (SCTP_REPL_SPORT|SCTP_REPL_DPORT))))
 		ret = 1;
 
 	/* --state is missing and we are trying to create a conntrack */
-	if (ret && (command & CT_CREATE) && (!(flags & STATE)))
+	if (ret && (command & CT_CREATE) && (!(flags & SCTP_STATE)))
 		ret = 0;
 
 	return ret;
diff --git a/src/conntrack.c b/src/conntrack.c
index eb9064d..1527c50 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -1035,10 +1035,11 @@ int main(int argc, char *argv[])
 				.protoflag = extra_flags
 			};
 			nfct_register_callback(cth,
-				nfct_default_conntrack_display, (void *)&cmp);
+				nfct_default_conntrack_event_display, 
+				(void *)&cmp);
 		} else {
 			nfct_register_callback(cth, 
-				nfct_default_conntrack_display, NULL);
+				nfct_default_conntrack_event_display, NULL);
 		}
 		res = nfct_event_conntrack(cth);
 		nfct_close(cth);