Creating development branch expect-sync, has merged content from oxnard and upstreamexpect-sync

1 files changed, 34 insertions, 14 deletions

diff --git a/include/internal.h b/include/internal.h
index 1f11340..2ba9714 100644
--- a/include/internal.h
+++ b/include/internal.h
@@ -12,25 +12,45 @@ enum {
 };
 
 struct internal_handler {
-	void	*data;
 	unsigned int flags;
 
 	int	(*init)(void);
 	void	(*close)(void);
 
-	void	(*new)(struct nf_conntrack *ct, int origin_type);
-	void	(*update)(struct nf_conntrack *ct, int origin_type);
-	int	(*destroy)(struct nf_conntrack *ct, int origin_type);
-
-	void	(*dump)(int fd, int type);
-	void	(*populate)(struct nf_conntrack *ct);
-	void	(*purge)(void);
-	int	(*resync)(enum nf_conntrack_msg_type type,
-			  struct nf_conntrack *ct, void *data);
-	void	(*flush)(void);
-
-	void	(*stats)(int fd);
-	void	(*stats_ext)(int fd);
+	struct {
+		void	*data;
+
+		void	(*new)(struct nf_conntrack *ct, int origin_type);
+		void	(*upd)(struct nf_conntrack *ct, int origin_type);
+		int	(*del)(struct nf_conntrack *ct, int origin_type);
+
+		void	(*dump)(int fd, int type);
+		void	(*populate)(struct nf_conntrack *ct);
+		void	(*purge)(void);
+		int	(*resync)(enum nf_conntrack_msg_type type,
+				  struct nf_conntrack *ct, void *data);
+		void	(*flush)(void);
+
+		void	(*stats)(int fd);
+		void	(*stats_ext)(int fd);
+	} ct;
+	struct {
+		void	*data;
+
+		void	(*new)(struct nf_expect *exp, int origin_type);
+		void	(*upd)(struct nf_expect *exp, int origin_type);
+		int	(*del)(struct nf_expect *exp, int origin_type);
+
+		void	(*dump)(int fd, int type);
+		void	(*populate)(struct nf_expect *exp);
+		void	(*purge)(void);
+		int	(*resync)(enum nf_conntrack_msg_type type,
+				  struct nf_expect *exp, void *data);
+		void	(*flush)(void);
+
+		void	(*stats)(int fd);
+		void	(*stats_ext)(int fd);
+	} exp;
 };
 
 extern struct internal_handler internal_cache;