summaryrefslogtreecommitdiff
path: root/xio.h
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-06-04 10:11:55 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-06-04 10:11:55 +0200
commit78a23a4d5ab27c8af26c0e232c099a0c16907649 (patch)
tree7abfec64bdb1c639faca541512e95b6f3bfa9aad /xio.h
parent22e4551cb007312ef808669aa70cad10a7657136 (diff)
xio: add ioexact operations
Break this out so that we only need to have sigint non-static where it is really needed. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'xio.h')
-rw-r--r--xio.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/xio.h b/xio.h
index 8a8f58a..e443122 100644
--- a/xio.h
+++ b/xio.h
@@ -1,9 +1,3 @@
-/*
- * netsniff-ng - the packet sniffing beast
- * Copyright 2009, 2010 Daniel Borkmann.
- * Subject to the GPL, version 2.
- */
-
#ifndef XIO_H
#define XIO_H
@@ -14,7 +8,5 @@ extern int tun_open_or_die(char *name, int type);
extern void pipe_or_die(int pipefd[2], int flags);
extern ssize_t read_or_die(int fd, void *buf, size_t count);
extern ssize_t write_or_die(int fd, const void *buf, size_t count);
-extern ssize_t read_exact(int fd, void *buf, size_t len, int mayexit);
-extern ssize_t write_exact(int fd, void *buf, size_t len, int mayexit);
#endif /* XIO_H */
an. 7) Remove unnecessary check for broadcast in IPv6 in pkttype match and nft_meta, from Liping Zhang. 8) Add missing code to deal with loopback packets from nft_meta when used by the netdev family, also from Liping. 9) Several cleanups on nf_tables, one to remove unnecessary check from the netlink control plane path to add table, set and stateful objects and code consolidation when unregister chain hooks, from Gao Feng. 10) Fix harmless reference counter underflow in IPVS that, however, results in problems with the introduction of the new refcount_t type, from David Windsor. 11) Enable LIBCRC32C from nf_ct_sctp instead of nf_nat_sctp, from Davide Caratti. 12) Missing documentation on nf_tables uapi header, from Liping Zhang. 13) Use rb_entry() helper in xt_connlimit, from Geliang Tang. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ip_vs.h12
-rw-r--r--include/net/netfilter/ipv4/nf_conntrack_ipv4.h1
-rw-r--r--include/net/netfilter/ipv6/nf_conntrack_ipv6.h1
-rw-r--r--include/net/netfilter/nf_conntrack.h17
-rw-r--r--include/net/netfilter/nf_conntrack_core.h2
-rw-r--r--include/net/netfilter/nf_conntrack_l4proto.h2
-rw-r--r--include/net/netfilter/nf_log.h3
-rw-r--r--include/net/netns/conntrack.h16
8 files changed, 28 insertions, 26 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h