FOSS/nethogs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

now uses the ethernet_header structure in <net/ethernet.h> instead of a local one

Browse Source
This commit is contained in:
Arnout Engelen
2004-08-31 09:15:48 +00:00
parent be08f938ac
commit 71878bdcd3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packet.cpp
View File

@@ -1,3 +1,4 @@
#include "nethogs.h"
#include <iostream> #include <iostream>
#include "packet.h" #include "packet.h"
#include <netinet/tcp.h> #include <netinet/tcp.h>
@@ -5,8 +6,8 @@
#include <malloc.h> #include <malloc.h>
#include <assert.h> #include <assert.h>
#include <net/if.h> #include <net/if.h>
#include <net/ethernet.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "nethogs.h"
// #include "inet6.c" // #include "inet6.c"
local_addr * local_addrs = NULL; local_addr * local_addrs = NULL;
@@ -33,8 +34,6 @@ void getLocal (const char *device)
} }
saddr=(struct sockaddr_in*)&iFreq.ifr_addr; saddr=(struct sockaddr_in*)&iFreq.ifr_addr;
local_addrs = new local_addr (saddr->sin_addr.s_addr, local_addrs); local_addrs = new local_addr (saddr->sin_addr.s_addr, local_addrs);
//malloc
//(*local_addr)=saddr->sin_addr;
} }
typedef u_int32_t tcp_seq; typedef u_int32_t tcp_seq;
@@ -103,7 +102,8 @@ struct tcp_hdr {
/* Packet 'Constructor' - but returns NULL on failure */ /* Packet 'Constructor' - but returns NULL on failure */
Packet * getPacket (const struct pcap_pkthdr * header, const u_char * packet) Packet * getPacket (const struct pcap_pkthdr * header, const u_char * packet)
{ {
const struct ethernet_hdr * ethernet = (struct ethernet_hdr *)packet; //const struct ethernet_hdr * ethernet = (struct ethernet_hdr *)packet;
const struct ether_header * ethernet = (struct ether_header *)packet;
if (ethernet->ether_type != 8) if (ethernet->ether_type != 8)
{ {
#if DEBUG #if DEBUG