libnetfilter_log/patches/libnetfilter_log-sysheader.patch

   1 diff -urN libnetfilter_log-1.0.0/include/libnetfilter_log/libnetfilter_log.h libnetfilter_log-1.0.0-noheader/include/libnetfilter_log/libnetfilter_log.h
   2 --- libnetfilter_log-1.0.0/include/libnetfilter_log/libnetfilter_log.h  2010-11-03 15:39:00.000000000 +0300
   3 +++ libnetfilter_log-1.0.0-noheader/include/libnetfilter_log/libnetfilter_log.h 2010-11-03 15:36:09.000000000 +0300
   4 @@ -9,7 +9,11 @@
   5  #ifndef __LIBNETFILTER_LOG_H
   6  #define __LIBNETFILTER_LOG_H
   7
   8 -#include <libnetfilter_log/linux_nfnetlink_log.h>
   9 +#ifndef aligned_be64
  10 +#define aligned_be64 __be64 __attribute__((aligned(8)))
  11 +#endif
  12 +
  13 +#include <linux/netfilter/nfnetlink_log.h>
  14
  15  struct nflog_handle;
  16  struct nflog_g_handle;
  17 diff -urN libnetfilter_log-1.0.0/include/libnetfilter_log/linux_nfnetlink_log.h libnetfilter_log-1.0.0-noheader/include/libnetfilter_log/linux_nfnetlink_log.h
  18 --- libnetfilter_log-1.0.0/include/libnetfilter_log/linux_nfnetlink_log.h       2010-11-03 15:39:00.000000000 +0300
  19 +++ libnetfilter_log-1.0.0-noheader/include/libnetfilter_log/linux_nfnetlink_log.h      1970-01-01 03:00:00.000000000 +0300
  20 @@ -1,102 +0,0 @@
  21 -#ifndef _NFNETLINK_LOG_H
  22 -#define _NFNETLINK_LOG_H
  23 -
  24 -#ifndef aligned_u64
  25 -#define aligned_u64 unsigned long long __attribute__((aligned(8)))
  26 -#endif
  27 -
  28 -/* This file describes the netlink messages (i.e. 'protocol packets'),
  29 - * and not any kind of function definitions.  It is shared between kernel and
  30 - * userspace.  Don't put kernel specific stuff in here */
  31 -
  32 -#include <linux/types.h>
  33 -#include <libnfnetlink/linux_nfnetlink.h>
  34 -
  35 -enum nfulnl_msg_types {
  36 -       NFULNL_MSG_PACKET,              /* packet from kernel to userspace */
  37 -       NFULNL_MSG_CONFIG,              /* connect to a particular queue */
  38 -
  39 -       NFULNL_MSG_MAX
  40 -};
  41 -
  42 -struct nfulnl_msg_packet_hdr {
  43 -       u_int16_t       hw_protocol;    /* hw protocol (network order) */
  44 -       u_int8_t        hook;           /* netfilter hook */
  45 -       u_int8_t        _pad;
  46 -} __attribute__ ((packed));
  47 -
  48 -struct nfulnl_msg_packet_hw {
  49 -       u_int16_t       hw_addrlen;
  50 -       u_int16_t       _pad;
  51 -       u_int8_t        hw_addr[8];
  52 -} __attribute__ ((packed));
  53 -
  54 -struct nfulnl_msg_packet_timestamp {
  55 -       aligned_u64     sec;
  56 -       aligned_u64     usec;
  57 -} __attribute__ ((packed));
  58 -
  59 -#define NFULNL_PREFIXLEN       30      /* just like old log target */
  60 -
  61 -enum nfulnl_attr_type {
  62 -       NFULA_UNSPEC,
  63 -       NFULA_PACKET_HDR,
  64 -       NFULA_MARK,                     /* u_int32_t nfmark */
  65 -       NFULA_TIMESTAMP,                /* nfulnl_msg_packet_timestamp */
  66 -       NFULA_IFINDEX_INDEV,            /* u_int32_t ifindex */
  67 -       NFULA_IFINDEX_OUTDEV,           /* u_int32_t ifindex */
  68 -       NFULA_IFINDEX_PHYSINDEV,        /* u_int32_t ifindex */
  69 -       NFULA_IFINDEX_PHYSOUTDEV,       /* u_int32_t ifindex */
  70 -       NFULA_HWADDR,                   /* nfulnl_msg_packet_hw */
  71 -       NFULA_PAYLOAD,                  /* opaque data payload */
  72 -       NFULA_PREFIX,                   /* string prefix */
  73 -       NFULA_UID,                      /* user id of socket */
  74 -       NFULA_SEQ,                      /* instance-local sequence number */
  75 -       NFULA_SEQ_GLOBAL,               /* global sequence number */
  76 -       NFULA_GID,                      /* group id of socket */
  77 -       NFULA_HWTYPE,                   /* hardware type */
  78 -       NFULA_HWHEADER,                 /* hardware header */
  79 -       NFULA_HWLEN,                    /* hardware header length */
  80 -
  81 -       __NFULA_MAX
  82 -};
  83 -#define NFULA_MAX (__NFULA_MAX - 1)
  84 -
  85 -enum nfulnl_msg_config_cmds {
  86 -       NFULNL_CFG_CMD_NONE,
  87 -       NFULNL_CFG_CMD_BIND,
  88 -       NFULNL_CFG_CMD_UNBIND,
  89 -       NFULNL_CFG_CMD_PF_BIND,
  90 -       NFULNL_CFG_CMD_PF_UNBIND,
  91 -};
  92 -
  93 -struct nfulnl_msg_config_cmd {
  94 -       u_int8_t        command;        /* nfulnl_msg_config_cmds */
  95 -} __attribute__ ((packed));
  96 -
  97 -struct nfulnl_msg_config_mode {
  98 -       u_int32_t       copy_range;
  99 -       u_int8_t        copy_mode;
 100 -       u_int8_t        _pad;
 101 -} __attribute__ ((packed));
 102 -
 103 -enum nfulnl_attr_config {
 104 -       NFULA_CFG_UNSPEC,
 105 -       NFULA_CFG_CMD,                  /* nfulnl_msg_config_cmd */
 106 -       NFULA_CFG_MODE,                 /* nfulnl_msg_config_mode */
 107 -       NFULA_CFG_NLBUFSIZ,             /* u_int32_t buffer size */
 108 -       NFULA_CFG_TIMEOUT,              /* u_int32_t in 1/100 s */
 109 -       NFULA_CFG_QTHRESH,              /* u_int32_t */
 110 -       NFULA_CFG_FLAGS,                /* u_int16_t */
 111 -       __NFULA_CFG_MAX
 112 -};
 113 -#define NFULA_CFG_MAX (__NFULA_CFG_MAX -1)
 114 -
 115 -#define NFULNL_COPY_NONE       0x00
 116 -#define NFULNL_COPY_META       0x01
 117 -#define NFULNL_COPY_PACKET     0x02
 118 -
 119 -#define NFULNL_CFG_F_SEQ       0x0001
 120 -#define NFULNL_CFG_F_SEQ_GLOBAL        0x0002
 121 -
 122 -#endif /* _NFNETLINK_LOG_H */
 123 diff -urN libnetfilter_log-1.0.0/include/libnetfilter_log/Makefile.am libnetfilter_log-1.0.0-noheader/include/libnetfilter_log/Makefile.am
 124 --- libnetfilter_log-1.0.0/include/libnetfilter_log/Makefile.am 2010-11-03 15:39:00.000000000 +0300
 125 +++ libnetfilter_log-1.0.0-noheader/include/libnetfilter_log/Makefile.am        2010-11-03 15:36:09.000000000 +0300
 126 @@ -1,3 +1 @@
 127 -
 128 -pkginclude_HEADERS = libnetfilter_log.h libipulog.h linux_nfnetlink_log.h
 129 -
 130 +pkginclude_HEADERS = libnetfilter_log.h libipulog.h
 131 diff -urN libnetfilter_log-1.0.0/include/libnetfilter_log/Makefile.in libnetfilter_log-1.0.0-noheader/include/libnetfilter_log/Makefile.in
 132 --- libnetfilter_log-1.0.0/include/libnetfilter_log/Makefile.in 2010-11-03 15:39:26.000000000 +0300
 133 +++ libnetfilter_log-1.0.0-noheader/include/libnetfilter_log/Makefile.in        2010-11-03 15:36:42.000000000 +0300
 134 @@ -196,7 +196,7 @@
 135  top_build_prefix = @top_build_prefix@
 136  top_builddir = @top_builddir@
 137  top_srcdir = @top_srcdir@
 138 -pkginclude_HEADERS = libnetfilter_log.h libipulog.h linux_nfnetlink_log.h
 139 +pkginclude_HEADERS = libnetfilter_log.h libipulog.h
 140  all: all-am
 141
 142  .SUFFIXES:
 143 diff -urN libnetfilter_log-1.0.0/src/libnetfilter_log.c libnetfilter_log-1.0.0-noheader/src/libnetfilter_log.c
 144 --- libnetfilter_log-1.0.0/src/libnetfilter_log.c       2010-11-03 15:39:00.000000000 +0300
 145 +++ libnetfilter_log-1.0.0-noheader/src/libnetfilter_log.c      2010-11-03 15:36:09.000000000 +0300
 146 @@ -27,8 +27,6 @@
 147  #include <netinet/in.h>
 148  #include <sys/socket.h>
 149
 150 -#include <libnetfilter_log/linux_nfnetlink_log.h>
 151 -
 152  #include <libnfnetlink/libnfnetlink.h>
 153  #include <libnetfilter_log/libnetfilter_log.h>
 154