diff options
| -rw-r--r-- | example/reader_util.c | 19 | ||||
| -rw-r--r-- | src/include/ndpi_define.h.in | 32 |
2 files changed, 34 insertions, 17 deletions
diff --git a/example/reader_util.c b/example/reader_util.c index bc7444f31..bd2d0d202 100644 --- a/example/reader_util.c +++ b/example/reader_util.c @@ -40,22 +40,7 @@ #include "reader_util.h" -#ifndef ETH_P_IP -#define ETH_P_IP 0x0800 /* IPv4 */ -#endif - -#ifndef ETH_P_IPv6 -#define ETH_P_IPV6 0x86dd /* IPv6 */ -#endif - -#define SLARP 0x8035 /* Cisco Slarp */ -#define CISCO_D_PROTO 0x2000 /* Cisco Discovery Protocol */ - -#define VLAN 0x8100 -#define MPLS_UNI 0x8847 -#define MPLS_MULTI 0x8848 -#define PPPoE 0x8864 -#define SNAP 0xaa +#define SNAP 0XAA #define BSTP 0x42 /* Bridge Spanning Tree Protocol */ /* Keep last 32 packets */ @@ -1834,7 +1819,7 @@ struct ndpi_proto ndpi_workflow_process_packet(struct ndpi_workflow * workflow, recheck_type = 1; break; - case PPPoE: + case PPPOE: workflow->stats.pppoe_count++; type = ETH_P_IP; ip_offset += 8; diff --git a/src/include/ndpi_define.h.in b/src/include/ndpi_define.h.in index dd4b6dea6..5488b046f 100644 --- a/src/include/ndpi_define.h.in +++ b/src/include/ndpi_define.h.in @@ -382,4 +382,36 @@ #endif /* __APPLE__ */ +#ifndef ETH_P_IP +#define ETH_P_IP 0x0800 /* IPv4 */ +#endif + +#ifndef ETH_P_IPv6 +#define ETH_P_IPV6 0x86dd /* IPv6 */ +#endif + +#ifndef CISCO_SLARP +#define CISCO_SLARP 0x8035 /* Cisco Slarp */ +#endif + +#ifndef CISCO_D_PROTO +#define CISCO_D_PROTO 0x2000 /* Cisco Discovery Protocol */ +#endif + +#ifndef VLAN +#define VLAN 0x8100 +#endif + +#ifndef MPLS_UNI +#define MPLS_UNI 0x8847 +#endif + +#ifndef MPLS_MULTI +#define MPLS_MULTI 0x8848 +#endif + +#ifndef PPPOE +#define PPPOE 0x8864 +#endif + #endif /* __NDPI_DEFINE_INCLUDE_FILE__ */ |