Updating upstream with merged content from netfilter conntrack-tools version 1.0.1

1 files changed, 21 insertions, 8 deletions

diff --git a/include/external.h b/include/external.h
index 938941a..70f0c5c 100644
--- a/include/external.h
+++ b/include/external.h
@@ -7,15 +7,28 @@ struct external_handler {
 	int	(*init)(void);
 	void	(*close)(void);
 
-	void	(*new)(struct nf_conntrack *ct);
-	void	(*update)(struct nf_conntrack *ct);
-	void	(*destroy)(struct nf_conntrack *ct);
+	struct {
+		void	(*new)(struct nf_conntrack *ct);
+		void	(*upd)(struct nf_conntrack *ct);
+		void	(*del)(struct nf_conntrack *ct);
 
-	void	(*dump)(int fd, int type);
-	void	(*flush)(void);
-	void	(*commit)(struct nfct_handle *h, int fd);
-	void	(*stats)(int fd);
-	void	(*stats_ext)(int fd);
+		void	(*dump)(int fd, int type);
+		void	(*flush)(void);
+		int	(*commit)(struct nfct_handle *h, int fd);
+		void	(*stats)(int fd);
+		void	(*stats_ext)(int fd);
+	} ct;
+	struct {
+		void	(*new)(struct nf_expect *exp);
+		void	(*upd)(struct nf_expect *exp);
+		void	(*del)(struct nf_expect *exp);
+
+		void	(*dump)(int fd, int type);
+		void	(*flush)(void);
+		int	(*commit)(struct nfct_handle *h, int fd);
+		void	(*stats)(int fd);
+		void	(*stats_ext)(int fd);
+	} exp;
 };
 
 extern struct external_handler external_cache;