summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/internal/Makefile.am2
-rw-r--r--include/internal/deprecated.h65
-rw-r--r--include/internal/internal.h1
-rw-r--r--include/internal/object.h5
4 files changed, 1 insertions, 72 deletions
diff --git a/include/internal/Makefile.am b/include/internal/Makefile.am
index b1632fa..d5c2be6 100644
--- a/include/internal/Makefile.am
+++ b/include/internal/Makefile.am
@@ -1,2 +1,2 @@
noinst_HEADERS = bitops.h extern.h linux_list.h prototypes.h \
- deprecated.h internal.h object.h types.h stack.h
+ internal.h object.h types.h stack.h
diff --git a/include/internal/deprecated.h b/include/internal/deprecated.h
deleted file mode 100644
index fe6f890..0000000
--- a/include/internal/deprecated.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * WARNING: Do *NOT* ever include this file, only for internal use!
- */
-#ifndef _NFCT_DEPRECATED_H_
-#define _NFCT_DEPRECATED_H_
-
-typedef int (*nfct_handler)(struct nfct_handle *cth, struct nlmsghdr *nlh,
- void *arg);
-
-/* some systems have old libc's */
-#include <netinet/in.h>
-#ifndef IPPROTO_SCTP
-#define IPPROTO_SCTP 132
-#endif
-
-#include "internal/linux_list.h"
-
-/* extensions */
-struct nfct_proto {
- struct list_head head;
-
- char *name;
- u_int8_t protonum;
- char *version;
-
- void (*parse_proto)(struct nfattr **, struct nfct_tuple *);
- void (*parse_protoinfo)(struct nfattr **, struct nfct_conntrack *);
- void (*build_tuple_proto)(struct nfnlhdr *, int, struct nfct_tuple *);
- void (*build_protoinfo)(struct nfnlhdr *, int, struct nfct_conntrack *);
- int (*print_protoinfo)(char *, union nfct_protoinfo *);
- int (*print_proto)(char *, struct nfct_tuple *);
- int (*compare)(struct nfct_conntrack *, struct nfct_conntrack *,
- unsigned int);
-};
-
-extern void nfct_register_proto(struct nfct_proto *h);
-
-struct nfct_l3proto {
- struct list_head head;
-
- char *name;
- u_int16_t protonum;
- char *version;
-
- void (*parse_proto)(struct nfattr **, struct nfct_tuple *);
- void (*build_tuple_proto)(struct nfnlhdr *, int, struct nfct_tuple *);
- int (*print_proto)(char *, struct nfct_tuple *);
- int (*compare)(struct nfct_conntrack *, struct nfct_conntrack *,
- unsigned int);
-};
-
-extern void nfct_register_l3proto(struct nfct_l3proto *h);
-
-/* backward compatibility of the deprecated API */
-extern struct nfct_l3proto ipv4;
-extern struct nfct_l3proto ipv6;
-
-extern struct nfct_proto tcp;
-extern struct nfct_proto udp;
-extern struct nfct_proto sctp;
-extern struct nfct_proto icmp;
-
-extern void deprecated_backward_support();
-
-#endif
diff --git a/include/internal/internal.h b/include/internal/internal.h
index 37e4143..a72e071 100644
--- a/include/internal/internal.h
+++ b/include/internal/internal.h
@@ -24,7 +24,6 @@
#include <libnfnetlink/libnfnetlink.h>
#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-#include "internal/deprecated.h"
#include "internal/object.h"
#include "internal/prototypes.h"
#include "internal/types.h"
diff --git a/include/internal/object.h b/include/internal/object.h
index 53f942d..f76bf98 100644
--- a/include/internal/object.h
+++ b/include/internal/object.h
@@ -15,11 +15,6 @@ struct nfct_handle {
struct nfnl_subsys_handle *nfnlssh_ct;
struct nfnl_subsys_handle *nfnlssh_exp;
- /* deprecated old API */
- nfct_callback callback;
- void *callback_data;
- nfct_handler handler;
-
/* callback handler for the new API */
struct nfnl_callback nfnl_cb;