libnfnetlink.h   libnfnetlink.h 
skipping to change at line 156 skipping to change at line 156
__ret; \ __ret; \
}) })
#define nfnl_get_pointer_to_data(tb, attr, type) \ #define nfnl_get_pointer_to_data(tb, attr, type) \
({ type *__ret = NULL; \ ({ type *__ret = NULL; \
if (tb[attr-1]) \ if (tb[attr-1]) \
__ret = NFA_DATA(tb[attr-1]); \ __ret = NFA_DATA(tb[attr-1]); \
__ret; \ __ret; \
}) })
#ifndef NLA_F_NESTED
#define NLA_F_NESTED (1 << 15)
#endif
/* nfnl attribute handling functions */ /* nfnl attribute handling functions */
extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int); extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int);
extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t); extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t);
extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t); extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t);
extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int) ; extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int) ;
extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t); extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t);
extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t); extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t);
extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int);
#define nfnl_parse_nested(tb, max, nfa) \ #define nfnl_parse_nested(tb, max, nfa) \
nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa))) nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa)))
#define nfnl_nest(nlh, bufsize, type) \ #define nfnl_nest(nlh, bufsize, type) \
({ struct nfattr *__start = NLMSG_TAIL(nlh); \ ({ struct nfattr *__start = NLMSG_TAIL(nlh); \
nfnl_addattr_l(nlh, bufsize, type, NULL, 0); \ nfnl_addattr_l(nlh, bufsize, (NLA_F_NESTED | type), NULL, 0); \
__start; }) __start; })
#define nfnl_nest_end(nlh, tail) \ #define nfnl_nest_end(nlh, tail) \
({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; }) ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; })
extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa,
u_int16_t type, u_int32_t len, u_int16_t type, u_int32_t len,
unsigned char *val); unsigned char *val);
extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h,
unsigned int size); unsigned int size);
skipping to change at line 197 skipping to change at line 201
#endif #endif
struct nlif_handle; struct nlif_handle;
struct nlif_handle *nlif_open(void); struct nlif_handle *nlif_open(void);
void nlif_close(struct nlif_handle *orig); void nlif_close(struct nlif_handle *orig);
int nlif_fd(struct nlif_handle *nlif_handle); int nlif_fd(struct nlif_handle *nlif_handle);
int nlif_query(struct nlif_handle *nlif_handle); int nlif_query(struct nlif_handle *nlif_handle);
int nlif_catch(struct nlif_handle *nlif_handle); int nlif_catch(struct nlif_handle *nlif_handle);
int nlif_index2name(struct nlif_handle *nlif_handle, int nlif_index2name(struct nlif_handle *nlif_handle,
unsigned int index, unsigned int if_index,
char *name); char *name);
/* Pablo: What is the equivalence of be64_to_cpu in userspace? /* Pablo: What is the equivalence of be64_to_cpu in userspace?
* *
* Harald: Good question. I don't think there's a standard way [yet?], * Harald: Good question. I don't think there's a standard way [yet?],
* so I'd suggest manually implementing it by "#if little endian" bitshift * so I'd suggest manually implementing it by "#if little endian" bitshift
* operations in C (at least for now). * operations in C (at least for now).
* *
* All the payload of any nfattr will always be in network byte order. * All the payload of any nfattr will always be in network byte order.
* This would allow easy transport over a real network in the future * This would allow easy transport over a real network in the future
* (e.g. jamal's netlink2). * (e.g. jamal's netlink2).
* *
* Pablo: I've called it __be64_to_cpu instead of be64_to_cpu, since maybe * Pablo: I've called it __be64_to_cpu instead of be64_to_cpu, since maybe
* there will one in the userspace headers someday. We don't want to * there will one in the userspace headers someday. We don't want to
* pollute POSIX space naming, * pollute POSIX space naming,
*/ */
#include <byteswap.h> #include <byteswap.h>
#if __BYTE_ORDER == __BIG_ENDIAN #if __BYTE_ORDER == __BIG_ENDIAN
# ifndef __be64_to_cpu
# define __be64_to_cpu(x) (x) # define __be64_to_cpu(x) (x)
# endif
# else # else
# if __BYTE_ORDER == __LITTLE_ENDIAN # if __BYTE_ORDER == __LITTLE_ENDIAN
# ifndef __be64_to_cpu
# define __be64_to_cpu(x) __bswap_64(x) # define __be64_to_cpu(x) __bswap_64(x)
# endif
# endif # endif
#endif #endif
#endif /* __LIBNFNETLINK_H */ #endif /* __LIBNFNETLINK_H */
 End of changes. 7 change blocks. 
2 lines changed or deleted 10 lines changed or added


 linux_nfnetlink.h   linux_nfnetlink.h 
#ifndef _NFNETLINK_H #ifndef _NFNETLINK_H
#define _NFNETLINK_H #define _NFNETLINK_H
#include <linux/types.h> #include <linux/types.h>
#include <libnfnetlink/linux_nfnetlink_compat.h>
#ifndef __KERNEL__
/* nfnetlink groups: Up to 32 maximum - backwards compatibility for userspa
ce */
#define NF_NETLINK_CONNTRACK_NEW 0x00000001
#define NF_NETLINK_CONNTRACK_UPDATE 0x00000002
#define NF_NETLINK_CONNTRACK_DESTROY 0x00000004
#define NF_NETLINK_CONNTRACK_EXP_NEW 0x00000008
#define NF_NETLINK_CONNTRACK_EXP_UPDATE 0x00000010
#define NF_NETLINK_CONNTRACK_EXP_DESTROY 0x00000020
#endif
enum nfnetlink_groups { enum nfnetlink_groups {
NFNLGRP_NONE, NFNLGRP_NONE,
#define NFNLGRP_NONE NFNLGRP_NONE #define NFNLGRP_NONE NFNLGRP_NONE
NFNLGRP_CONNTRACK_NEW, NFNLGRP_CONNTRACK_NEW,
#define NFNLGRP_CONNTRACK_NEW NFNLGRP_CONNTRACK_NEW #define NFNLGRP_CONNTRACK_NEW NFNLGRP_CONNTRACK_NEW
NFNLGRP_CONNTRACK_UPDATE, NFNLGRP_CONNTRACK_UPDATE,
#define NFNLGRP_CONNTRACK_UPDATE NFNLGRP_CONNTRACK_UPDATE #define NFNLGRP_CONNTRACK_UPDATE NFNLGRP_CONNTRACK_UPDATE
NFNLGRP_CONNTRACK_DESTROY, NFNLGRP_CONNTRACK_DESTROY,
#define NFNLGRP_CONNTRACK_DESTROY NFNLGRP_CONNTRACK_DESTROY #define NFNLGRP_CONNTRACK_DESTROY NFNLGRP_CONNTRACK_DESTROY
NFNLGRP_CONNTRACK_EXP_NEW, NFNLGRP_CONNTRACK_EXP_NEW,
#define NFNLGRP_CONNTRACK_EXP_NEW NFNLGRP_CONNTRACK_EXP_NEW #define NFNLGRP_CONNTRACK_EXP_NEW NFNLGRP_CONNTRACK_EXP_NEW
NFNLGRP_CONNTRACK_EXP_UPDATE, NFNLGRP_CONNTRACK_EXP_UPDATE,
#define NFNLGRP_CONNTRACK_EXP_UPDATE NFNLGRP_CONNTRACK_EXP_UPDATE #define NFNLGRP_CONNTRACK_EXP_UPDATE NFNLGRP_CONNTRACK_EXP_UPDATE
NFNLGRP_CONNTRACK_EXP_DESTROY, NFNLGRP_CONNTRACK_EXP_DESTROY,
#define NFNLGRP_CONNTRACK_EXP_DESTROY NFNLGRP_CONNTRACK_EXP_DESTROY #define NFNLGRP_CONNTRACK_EXP_DESTROY NFNLGRP_CONNTRACK_EXP_DESTROY
__NFNLGRP_MAX, __NFNLGRP_MAX,
}; };
#define NFNLGRP_MAX (__NFNLGRP_MAX - 1) #define NFNLGRP_MAX (__NFNLGRP_MAX - 1)
/* Generic structure for encapsulation optional netfilter information.
* It is reminiscent of sockaddr, but with sa_family replaced
* with attribute type.
* ! This should someday be put somewhere generic as now rtnetlink and
* ! nfnetlink use the same attributes methods. - J. Schulist.
*/
struct nfattr
{
u_int16_t nfa_len;
u_int16_t nfa_type; /* we use 15 bits for the type, and the high
est
* bit to indicate whether the payload is ne
sted */
};
/* FIXME: Apart from NFNL_NFA_NESTED shamelessly copy and pasted from
* rtnetlink.h, it's time to put this in a generic file */
#define NFNL_NFA_NEST 0x8000
#define NFA_TYPE(attr) ((attr)->nfa_type & 0x7fff)
#define NFA_ALIGNTO 4
#define NFA_ALIGN(len) (((len) + NFA_ALIGNTO - 1) & ~(NFA_ALIGNTO - 1))
#define NFA_OK(nfa,len) ((len) > 0 && (nfa)->nfa_len >= sizeof(struc
t nfattr) \
&& (nfa)->nfa_len <= (len))
#define NFA_NEXT(nfa,attrlen) ((attrlen) -= NFA_ALIGN((nfa)->nfa_len), \
(struct nfattr *)(((char *)(nfa)) + NFA_ALIGN((nfa)->nfa_len)))
#define NFA_LENGTH(len) (NFA_ALIGN(sizeof(struct nfattr)) + (len))
#define NFA_SPACE(len) NFA_ALIGN(NFA_LENGTH(len))
#define NFA_DATA(nfa) ((void *)(((char *)(nfa)) + NFA_LENGTH(0)))
#define NFA_PAYLOAD(nfa) ((int)((nfa)->nfa_len) - NFA_LENGTH(0))
#define NFA_NEST(skb, type) \
({ struct nfattr *__start = (struct nfattr *)skb_tail_pointer(skb); \
NFA_PUT(skb, (NFNL_NFA_NEST | type), 0, NULL); \
__start; })
#define NFA_NEST_END(skb, start) \
({ (start)->nfa_len = skb_tail_pointer(skb) - (unsigned char *)(start)
; \
(skb)->len; })
#define NFA_NEST_CANCEL(skb, start) \
({ if (start) \
skb_trim(skb, (unsigned char *) (start) - (skb)->data); \
-1; })
/* General form of address family dependent message. /* General form of address family dependent message.
*/ */
struct nfgenmsg { struct nfgenmsg {
u_int8_t nfgen_family; /* AF_xxx */ u_int8_t nfgen_family; /* AF_xxx */
u_int8_t version; /* nfnetlink version */ u_int8_t version; /* nfnetlink version */
__be16 res_id; /* resource id */ u_int16_t res_id; /* resource id */
}; };
#define NFNETLINK_V0 0 #define NFNETLINK_V0 0
#define NFM_NFA(n) ((struct nfattr *)(((char *)(n)) \
+ NLMSG_ALIGN(sizeof(struct nfgenmsg))))
#define NFM_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg))
/* netfilter netlink message types are split in two pieces: /* netfilter netlink message types are split in two pieces:
* 8 bit subsystem, 8bit operation. * 8 bit subsystem, 8bit operation.
*/ */
#define NFNL_SUBSYS_ID(x) ((x & 0xff00) >> 8) #define NFNL_SUBSYS_ID(x) ((x & 0xff00) >> 8)
#define NFNL_MSG_TYPE(x) (x & 0x00ff) #define NFNL_MSG_TYPE(x) (x & 0x00ff)
/* No enum here, otherwise __stringify() trick of MODULE_ALIAS_NFNL_SUBSYS( ) /* No enum here, otherwise __stringify() trick of MODULE_ALIAS_NFNL_SUBSYS( )
* won't work anymore */ * won't work anymore */
#define NFNL_SUBSYS_NONE 0 #define NFNL_SUBSYS_NONE 0
#define NFNL_SUBSYS_CTNETLINK 1 #define NFNL_SUBSYS_CTNETLINK 1
#define NFNL_SUBSYS_CTNETLINK_EXP 2 #define NFNL_SUBSYS_CTNETLINK_EXP 2
#define NFNL_SUBSYS_QUEUE 3 #define NFNL_SUBSYS_QUEUE 3
#define NFNL_SUBSYS_ULOG 4 #define NFNL_SUBSYS_ULOG 4
#define NFNL_SUBSYS_COUNT 5 #define NFNL_SUBSYS_COUNT 5
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/capability.h> #include <linux/capability.h>
#include <net/netlink.h>
struct nfnl_callback struct nfnl_callback
{ {
int (*call)(struct sock *nl, struct sk_buff *skb, int (*call)(struct sock *nl, struct sk_buff *skb,
struct nlmsghdr *nlh, struct nfattr *cda[]); struct nlmsghdr *nlh, struct nlattr *cda[]);
u_int16_t attr_count; /* number of nfattr's */ const struct nla_policy *policy; /* netlink attribute policy
*/
const u_int16_t attr_count; /* number of nlattr's */
}; };
struct nfnetlink_subsystem struct nfnetlink_subsystem
{ {
const char *name; const char *name;
__u8 subsys_id; /* nfnetlink subsystem ID */ __u8 subsys_id; /* nfnetlink subsystem ID */
__u8 cb_count; /* number of callbacks */ __u8 cb_count; /* number of callbacks */
struct nfnl_callback *cb; /* callback for individual types */ const struct nfnl_callback *cb; /* callback for individual types */
}; };
extern void __nfa_fill(struct sk_buff *skb, int attrtype, extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n);
int attrlen, const void *data); extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n)
#define NFA_PUT(skb, attrtype, attrlen, data) \ ;
({ if (skb_tailroom(skb) < (int)NFA_SPACE(attrlen)) goto nfattr_failure; \
__nfa_fill(skb, attrtype, attrlen, data); })
extern int nfnetlink_subsys_register(struct nfnetlink_subsystem *n);
extern int nfnetlink_subsys_unregister(struct nfnetlink_subsystem *n);
extern void nfattr_parse(struct nfattr *tb[], int maxattr,
struct nfattr *nfa, int len);
#define nfattr_parse_nested(tb, max, nfa) \
nfattr_parse((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa)))
#define nfattr_bad_size(tb, max, cta_min) \
({ int __i, __res = 0; \
for (__i=0; __i<max; __i++) { \
if (!cta_min[__i]) \
continue; \
if (tb[__i] && NFA_PAYLOAD(tb[__i]) < cta_min[__i]){ \
__res = 1; \
break; \
} \
} \
__res; \
})
extern int nfnetlink_has_listeners(unsigned int group); extern int nfnetlink_has_listeners(unsigned int group);
extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group,
int echo); int echo);
extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags) ; extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags) ;
#define MODULE_ALIAS_NFNL_SUBSYS(subsys) \ #define MODULE_ALIAS_NFNL_SUBSYS(subsys) \
MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys)) MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys))
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
 End of changes. 8 change blocks. 
94 lines changed or deleted 13 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/