fix compatibility with new xtables

Author: splitice

ipthelper/ip6tables.c

@@ -1424,6 +1424,12 @@ static void command_match(struct iptables_command_state *cs)
 			"unexpected ! flag before --match");
 
 	m = xtables_find_match(optarg, XTF_LOAD_MUST_SUCCEED, &cs->matches);
+	if (m == NULL) {
+		xtables_error(PARAMETER_PROBLEM,
+			"unable to load match module %s",
+			optarg);
+		return;
+	}
 	size = XT_ALIGN(sizeof(struct xt_entry_match)) + m->size;
 	m->m = xtables_calloc(1, size);
 	m->m->u.match_size = size;
@@ -1463,6 +1469,10 @@ static void command_match(struct iptables_command_state *cs)
 }
 
 
+EXPORT void* set_modprobe(const char* program) {
+	xtables_modprobe_program = program;
+}
+
 EXPORT void* init_handle6(const char* table){
 	const char* err;
 	void* handle = ip6tc_init(table);

ipthelper/iptables.c

@@ -148,6 +148,9 @@ struct xtables_globals iptables_globals = {
 	.program_version = "1.1.1",
 	.orig_opts = original_opts,
 	.opts = NULL,
+#if XTABLES_VERSION_CODE >= 11
+	.compat_rev = xtables_compatible_revision,
+#endif
 	.exit_err = iptables_exit_error
 };
 

ipthelper/ipthelper.h

@@ -30,6 +30,7 @@ extern "C" {
 	extern EXPORT void* init_handle6(const char* table);
 	extern EXPORT char* ipth_bpf_compile(const char* dltname, const char* program, int length);
 	extern EXPORT void ipth_free(void* ptr);
+	extern EXPORT void* set_modprobe(const char* program);
 #ifdef __cplusplus
 }
 #endif