ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Copy necessary ipt_ULOG.h structure to source." am: 0231f4fc38 am: f39c7b6a0e

Browse source 
Change-Id: Ibeb5c80cc1cf7e6eb2758f6b4f2e4721bbc9b4b7
This commit is contained in:
Automerger Merge Worker 2019-12-13 22:05:44 +00:00
commit 1d18aa89ea
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libsysutils/src/NetlinkEvent.cpp
View file

@ -24,7 +24,6 @@
#include <linux/if_link.h> #include <linux/if_link.h>
#include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink.h>
#include <linux/netfilter/nfnetlink_log.h> #include <linux/netfilter/nfnetlink_log.h>
#include <linux/netfilter_ipv4/ipt_ULOG.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <net/if.h> #include <net/if.h>
@ -39,6 +38,23 @@
const int LOCAL_QLOG_NL_EVENT = 112; const int LOCAL_QLOG_NL_EVENT = 112;
const int LOCAL_NFLOG_PACKET = NFNL_SUBSYS_ULOG << 8 | NFULNL_MSG_PACKET; const int LOCAL_NFLOG_PACKET = NFNL_SUBSYS_ULOG << 8 | NFULNL_MSG_PACKET;
/* From deprecated ipt_ULOG.h to parse QLOG_NL_EVENT. */
#define ULOG_MAC_LEN 80
#define ULOG_PREFIX_LEN 32
typedef struct ulog_packet_msg {
unsigned long mark;
long timestamp_sec;
long timestamp_usec;
unsigned int hook;
char indev_name[IFNAMSIZ];
char outdev_name[IFNAMSIZ];
size_t data_len;
char prefix[ULOG_PREFIX_LEN];
unsigned char mac_len;
unsigned char mac[ULOG_MAC_LEN];
unsigned char payload[0];
} ulog_packet_msg_t;
#include <android-base/parseint.h> #include <android-base/parseint.h>
#include <log/log.h> #include <log/log.h>
#include <sysutils/NetlinkEvent.h> #include <sysutils/NetlinkEvent.h>