merge up to iptables 1.3.8 with a basic set of extensions

[iptables.git] / include / iptables_common.h

diff --git a/include/iptables_common.h b/include/iptables_common.h
index 28bda9f..3b29327 100644 (file)
--- a/include/iptables_common.h
+++ b/include/iptables_common.h
@@ -5,7 +5,8 @@
 enum exittype {
        OTHER_PROBLEM = 1,
        PARAMETER_PROBLEM,
-       VERSION_PROBLEM
+       VERSION_PROBLEM,
+       RESOURCE_PROBLEM
 };
 
 /* this is a special 64bit data type that is 8-byte aligned */
@@ -26,17 +27,26 @@ extern int string_to_number_ll(const char *,
                            unsigned long long int, 
                            unsigned long long int,
                            unsigned long long *);
-extern int iptables_insmod(const char *modname, const char *modprobe);
+extern int
+iptables_insmod(const char *modname, const char *modprobe, int quiet);
+extern int load_iptables_ko(const char *modprobe, int quiet);
 void exit_error(enum exittype, char *, ...)__attribute__((noreturn,
                                                          format(printf,2,3)));
 extern const char *program_name, *program_version;
 extern char *lib_dir;
 
+#define _init __attribute__((constructor)) my_init
 #ifdef NO_SHARED_LIBS
 # ifdef _INIT
+#  undef _init
 #  define _init _INIT
 # endif
   extern void init_extensions(void);
 #endif
 
+#define __be32 u_int32_t
+#define __le32 u_int32_t
+#define __be16 u_int16_t
+#define __le16 u_int16_t
+
 #endif /*_IPTABLES_COMMON_H*/