From cdf0d6c32f5c6c7c3071d35fa770eaf62fbad312 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 17 Feb 2009 21:36:43 +0100 Subject: src: remove old deprecated API This patch removes the first API version which was scheduled in 2007. That API had several major limitations that the new one solved. I don't know of any known existing client of this old API. Signed-off-by: Pablo Neira Ayuso --- include/internal/Makefile.am | 2 +- include/internal/deprecated.h | 65 ------------------------------------------- include/internal/internal.h | 1 - include/internal/object.h | 5 ---- 4 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 include/internal/deprecated.h (limited to 'include') 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 -#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 #include -#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; -- cgit v1.2.3