summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2011-01-17 00:11:46 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2011-02-17 18:52:17 +0100
commitbe4fb61b6e85a218879adda4e41abec8909d5653 (patch)
treebf07611616e4d74dc9d65017322c5095a3add054
parent9f53603a10aa738d6f5a41a061bc3e1182c42d0c (diff)
conntrack: deprecate nfct_sizeof() and nfct_maxsize() functions
These functions are evil since they allow the use of memcpy() instead of nfct_copy(). This is a problem because it violates the design principle that the library follows, that is to provide opaque objects in which the client code does not care on the binary layout. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--include/libnetfilter_conntrack/libnetfilter_conntrack.h4
-rw-r--r--src/conntrack/api.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack.h b/include/libnetfilter_conntrack/libnetfilter_conntrack.h
index b3e6758..5fe2bc7 100644
--- a/include/libnetfilter_conntrack/libnetfilter_conntrack.h
+++ b/include/libnetfilter_conntrack/libnetfilter_conntrack.h
@@ -199,10 +199,10 @@ extern void nfct_destroy(struct nf_conntrack *ct);
struct nf_conntrack *nfct_clone(const struct nf_conntrack *ct);
/* object size */
-extern size_t nfct_sizeof(const struct nf_conntrack *ct);
+extern __attribute__((deprecated)) size_t nfct_sizeof(const struct nf_conntrack *ct);
/* maximum object size */
-extern size_t nfct_maxsize(void);
+extern __attribute__((deprecated)) size_t nfct_maxsize(void);
/* set option */
enum {
diff --git a/src/conntrack/api.c b/src/conntrack/api.c
index a35c670..c0d3deb 100644
--- a/src/conntrack/api.c
+++ b/src/conntrack/api.c
@@ -98,6 +98,8 @@ void nfct_destroy(struct nf_conntrack *ct)
/**
* nf_sizeof - return the size in bytes of a certain conntrack object
* \param ct pointer to the conntrack object
+ *
+ * This function is DEPRECATED, don't use it in your code.
*/
size_t nfct_sizeof(const struct nf_conntrack *ct)
{
@@ -118,6 +120,8 @@ size_t nfct_sizeof(const struct nf_conntrack *ct)
* Note: As for now this function returns the same size that nfct_sizeof(ct)
* does although _this could change in the future_. Therefore, do not assume
* that nfct_sizeof(ct) == nfct_maxsize().
+ *
+ * This function is DEPRECATED, don't use it in your code.
*/
size_t nfct_maxsize(void)
{