Removed legacy linux_compat.h file
Updated IPv6 address dump format
This commit is contained in:
@@ -1,277 +0,0 @@
|
||||
/*
|
||||
* linux_compat.h
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
*
|
||||
* This file is part of nDPI, an open source deep packet inspection
|
||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||
*
|
||||
* nDPI is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* nDPI is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#ifndef __NDPI_LINUX_COMPAT_H__
|
||||
#define __NDPI_LINUX_COMPAT_H__
|
||||
|
||||
#include "ndpi_define.h"
|
||||
|
||||
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
#include <machine/endian.h>
|
||||
|
||||
#if _BYTE_ORDER == _LITTLE_ENDIAN
|
||||
#ifndef __LITTLE_ENDIAN__
|
||||
#define __LITTLE_ENDIAN__ 1
|
||||
#endif
|
||||
#else
|
||||
#ifndef __BIG_ENDIAN__
|
||||
#define __BIG_ENDIAN__ 1
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#pragma pack(push, 1) /* push current alignment to stack */
|
||||
#pragma pack(1) /* set alignment to 1 byte boundary */
|
||||
|
||||
#pragma pack(pop) /* restore original alignment from stack */
|
||||
|
||||
|
||||
/* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
/* +++++++++++++++ Cisco data structures +++++++++++++++++++++++ */
|
||||
/* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
|
||||
/* Cisco HDLC */
|
||||
struct ndpi_chdlc
|
||||
{
|
||||
u_int8_t addr; /* 0x0F (Unicast) - 0x8F (Broadcast) */
|
||||
u_int8_t ctrl; /* always 0x00 */
|
||||
u_int16_t proto_code; /* protocol type (e.g. 0x0800 IP) */
|
||||
};
|
||||
|
||||
/* SLARP - Serial Line ARP http://tinyurl.com/qa54e95 */
|
||||
struct ndpi_slarp
|
||||
{
|
||||
/* address requests (0x00)
|
||||
address replies (0x01)
|
||||
keep-alive (0x02)
|
||||
*/
|
||||
u_int32_t slarp_type;
|
||||
u_int32_t addr_1;
|
||||
u_int32_t addr_2;
|
||||
};
|
||||
|
||||
/* Cisco Discovery Protocol http://tinyurl.com/qa6yw9l */
|
||||
struct ndpi_cdp
|
||||
{
|
||||
u_int8_t version;
|
||||
u_int8_t ttl;
|
||||
u_int16_t checksum;
|
||||
u_int16_t type;
|
||||
u_int16_t length;
|
||||
};
|
||||
|
||||
|
||||
/* ++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
/* +++++++++++ Ethernet data structures +++++++++++++ */
|
||||
/* ++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
|
||||
struct ndpi_ethhdr
|
||||
{
|
||||
u_char h_dest[6]; /* destination eth addr */
|
||||
u_char h_source[6]; /* source ether addr */
|
||||
u_int16_t h_proto; /* packet type ID field */
|
||||
};
|
||||
|
||||
/* ++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
/* +++++++++++ ieee802.11 data structures +++++++++++ */
|
||||
/* ++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
|
||||
/******* RADIO TAP *******/
|
||||
/* radiotap header */
|
||||
struct ndpi_radiotap_header
|
||||
{
|
||||
u_int8_t version; /* set to 0 */
|
||||
u_int8_t pad;
|
||||
u_int16_t len;
|
||||
u_int32_t present;
|
||||
u_int64_t MAC_timestamp;
|
||||
u_int8_t flags;
|
||||
|
||||
} __attribute__((__packed__));
|
||||
|
||||
/* Beacon frame */
|
||||
struct ndpi_beacon
|
||||
{
|
||||
/* header -- 24 byte */
|
||||
u_int16_t fc;
|
||||
u_int16_t duration;
|
||||
u_char rcv_addr[6];
|
||||
u_char trsm_addr[6];
|
||||
u_char bssid[6];
|
||||
u_int16_t seq_ctrl;
|
||||
/* body (variable) */
|
||||
u_int64_t timestamp; /* 802.11 Timestamp value at frame send */
|
||||
u_int16_t beacon_interval; /* Interval at which beacons are send */
|
||||
u_int16_t capability;
|
||||
/** List of information elements **/
|
||||
/* union ndpi_80211_info info_element[0]; */
|
||||
} __attribute__((packed));
|
||||
|
||||
|
||||
/* Wifi data frame - TODO: specify when addr1 addr2 addr3 is rcv, trams or bssid*/
|
||||
struct ndpi_wifi_data_frame
|
||||
{
|
||||
u_int16_t fc;
|
||||
u_int16_t duration;
|
||||
u_char addr1[6];
|
||||
u_char addr2[6];
|
||||
u_char addr3[6];
|
||||
u_int16_t seq_ctrl;
|
||||
} __attribute__((packed));
|
||||
|
||||
/* Logical-Link Control header */
|
||||
struct ndpi_llc_header_proto
|
||||
{
|
||||
u_int8_t dsap;
|
||||
u_int8_t ssap;
|
||||
u_int8_t ctl;
|
||||
/* u_int8_t pad1; */
|
||||
u_int16_t org;
|
||||
u_int8_t org2;
|
||||
/* u_int8_t pad2; */
|
||||
u_int16_t ether_IP_type;
|
||||
} __attribute__((packed));
|
||||
|
||||
|
||||
/* ++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
/* ++++++++++++++ IP data structures ++++++++++++++++ */
|
||||
/* ++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
|
||||
/* IP header */
|
||||
struct ndpi_iphdr {
|
||||
#if defined(__LITTLE_ENDIAN__)
|
||||
u_int8_t ihl:4, version:4;
|
||||
#elif defined(__BIG_ENDIAN__)
|
||||
u_int8_t version:4, ihl:4;
|
||||
#else
|
||||
# error "Byte order must be defined"
|
||||
#endif
|
||||
u_int8_t tos;
|
||||
u_int16_t tot_len;
|
||||
u_int16_t id;
|
||||
u_int16_t frag_off;
|
||||
u_int8_t ttl;
|
||||
u_int8_t protocol;
|
||||
u_int16_t check;
|
||||
u_int32_t saddr;
|
||||
u_int32_t daddr;
|
||||
};
|
||||
|
||||
|
||||
#ifdef WIN32
|
||||
|
||||
typedef unsigned char u_char;
|
||||
typedef unsigned short u_short;
|
||||
typedef unsigned int uint;
|
||||
typedef unsigned long u_long;
|
||||
typedef u_char u_int8_t;
|
||||
typedef u_short u_int16_t;
|
||||
typedef uint u_int32_t;
|
||||
|
||||
#define _WS2TCPIP_H_ /* Avoid compilation problems */
|
||||
#define HAVE_SIN6_LEN
|
||||
|
||||
/* IPv6 address */
|
||||
/* Already defined in WS2tcpip.h */
|
||||
struct ndpi_win_in6_addr
|
||||
{
|
||||
union {
|
||||
u_int8_t u6_addr8[16];
|
||||
u_int16_t u6_addr16[8];
|
||||
u_int32_t u6_addr32[4];
|
||||
} in6_u;
|
||||
};
|
||||
|
||||
#define in6_addr win_in6_addr
|
||||
|
||||
/* Generic extension header. */
|
||||
struct ndpi_ip6_ext
|
||||
{
|
||||
u_int8_t ip6e_nxt; /* next header. */
|
||||
u_int8_t ip6e_len; /* length in units of 8 octets. */
|
||||
};
|
||||
|
||||
/*
|
||||
#define s6_addr u6_addr.u6_addr8
|
||||
#define s6_addr16 u6_addr.u6_addr16
|
||||
#define s6_addr32 u6_addr.u6_addr32
|
||||
*/
|
||||
#else
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
|
||||
struct ndpi_in6_addr {
|
||||
union {
|
||||
u_int8_t u6_addr8[16];
|
||||
u_int16_t u6_addr16[8];
|
||||
u_int32_t u6_addr32[4];
|
||||
} u6_addr; /* 128-bit IP6 address */
|
||||
};
|
||||
|
||||
|
||||
struct ndpi_ip6_hdr {
|
||||
union {
|
||||
struct ndpi_ip6_hdrctl {
|
||||
u_int32_t ip6_un1_flow;
|
||||
u_int16_t ip6_un1_plen;
|
||||
u_int8_t ip6_un1_nxt;
|
||||
u_int8_t ip6_un1_hlim;
|
||||
} ip6_un1;
|
||||
u_int8_t ip6_un2_vfc;
|
||||
} ip6_ctlun;
|
||||
struct ndpi_in6_addr ip6_src;
|
||||
struct ndpi_in6_addr ip6_dst;
|
||||
};
|
||||
|
||||
/* ++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
/* ++++++++ Transport Layer data structures +++++++++ */
|
||||
/* ++++++++++++++++++++++++++++++++++++++++++++++++++ */
|
||||
|
||||
|
||||
struct ndpi_tcphdr {
|
||||
u_int16_t source;
|
||||
u_int16_t dest;
|
||||
u_int32_t seq;
|
||||
u_int32_t ack_seq;
|
||||
#if defined(__LITTLE_ENDIAN__)
|
||||
u_int16_t res1:4, doff:4, fin:1, syn:1, rst:1, psh:1, ack:1, urg:1, ece:1, cwr:1;
|
||||
#elif defined(__BIG_ENDIAN__)
|
||||
u_int16_t doff:4, res1:4, cwr:1, ece:1, urg:1, ack:1, psh:1, rst:1, syn:1, fin:1;
|
||||
#else
|
||||
# error "Byte order must be defined"
|
||||
#endif
|
||||
u_int16_t window;
|
||||
u_int16_t check;
|
||||
u_int16_t urg_ptr;
|
||||
};
|
||||
|
||||
struct ndpi_udphdr {
|
||||
u_int16_t source;
|
||||
u_int16_t dest;
|
||||
u_int16_t len;
|
||||
u_int16_t check;
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -25,8 +25,6 @@
|
||||
#ifndef __NDPI_UNIX_INCLUDE_FILE__
|
||||
#define __NDPI_UNIX_INCLUDE_FILE__
|
||||
|
||||
#include "linux_compat.h"
|
||||
|
||||
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
#include <netinet/in.h>
|
||||
#if defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
|
||||
Reference in New Issue
Block a user