diff options
| author | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2007-07-09 16:02:28 +0000 |
|---|---|---|
| committer | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2007-07-09 16:02:28 +0000 |
| commit | e7bcbbc16fa1db3704d897905b720932fdddc8ec (patch) | |
| tree | 7cb1bf1f9564f379d249ab131d9bc213e9b9b796 | |
| parent | 3a220d89e351738f03842ba608afce9c27e63d45 (diff) | |
- introduce nfct_nfnlh() to use functions like nfnl_rcvbufsiz(): return read-only nfnl_handle
- remove unused build_id() from build.c
- bump version to 0.0.81
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | include/libnetfilter_conntrack/libnetfilter_conntrack.h | 1 | ||||
| -rw-r--r-- | src/conntrack/build.c | 9 | ||||
| -rw-r--r-- | src/libnetfilter_conntrack.c | 5 |
4 files changed, 8 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 612d23c..37533c3 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ AC_INIT AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(libnetfilter_conntrack, 0.0.80) +AM_INIT_AUTOMAKE(libnetfilter_conntrack, 0.0.81) AC_PROG_CC AM_PROG_LIBTOOL diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack.h b/include/libnetfilter_conntrack/libnetfilter_conntrack.h index c6e2425..3975dfc 100644 --- a/include/libnetfilter_conntrack/libnetfilter_conntrack.h +++ b/include/libnetfilter_conntrack/libnetfilter_conntrack.h @@ -42,6 +42,7 @@ extern struct nfct_handle *nfct_open_nfnl(struct nfnl_handle *nfnlh, extern int nfct_close(struct nfct_handle *cth); extern int nfct_fd(struct nfct_handle *cth); +extern const struct nfnl_handle *nfct_nfnlh(struct nfct_handle *cth); /* * NEW libnetfilter_conntrack API diff --git a/src/conntrack/build.c b/src/conntrack/build.c index 774e3c5..d04ad86 100644 --- a/src/conntrack/build.c +++ b/src/conntrack/build.c @@ -1,5 +1,5 @@ /* - * (C) 2006 by Pablo Neira Ayuso <pablo@netfilter.org> + * (C) 2006-2007 by Pablo Neira Ayuso <pablo@netfilter.org> * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. @@ -224,13 +224,6 @@ void __build_mark(struct nfnlhdr *req, nfnl_addattr32(&req->nlh, size, CTA_MARK, htonl(ct->mark)); } -void __build_id(struct nfnlhdr *req, - size_t size, - const const struct nf_conntrack *ct) -{ - nfnl_addattr32(&req->nlh, size, CTA_ID, htonl(ct->id)); -} - int __build_conntrack(struct nfnl_subsys_handle *ssh, struct nfnlhdr *req, size_t size, diff --git a/src/libnetfilter_conntrack.c b/src/libnetfilter_conntrack.c index 66f215a..b647694 100644 --- a/src/libnetfilter_conntrack.c +++ b/src/libnetfilter_conntrack.c @@ -159,6 +159,11 @@ int nfct_fd(struct nfct_handle *cth) return nfnl_fd(cth->nfnlh); } +const struct nfnl_handle *nfct_nfnlh(struct nfct_handle *cth) +{ + return cth->nfnlh; +} + void nfct_register_callback(struct nfct_handle *cth, nfct_callback callback, void *data) { |