mark/iftop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

802.1q VLAN support from Jacek Konieczny <jajcus@bnet.pl>

Browse Source
This commit is contained in:
pdw
2005-03-31 12:08:05 +00:00
parent 42e3e8e43a
commit 65726d562a
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ether.h
View File

@@ -14,4 +14,9 @@ struct ether_header {
u_int16_t ether_type; u_int16_t ether_type;
}; };
struct vlan_8021q_header {
u_int16_t priority_cfi_vid;
u_int16_t ether_type;
};
#endif #endif

19
iftop.c
View File

@@ -76,8 +76,8 @@ static void finish(int sig) {
/* Only need ethernet and IP headers (48) + first 2 bytes of tcp/udp header */ /* Only need ethernet (plus optional 4 byte VLAN) and IP headers (48) + first 2 bytes of tcp/udp header */
#define CAPTURE_LENGTH 68 #define CAPTURE_LENGTH 72
void init_history() { void init_history() {
history = addr_hash_create(); history = addr_hash_create();
@@ -405,11 +405,22 @@ static void handle_cooked_packet(unsigned char *args, const struct pcap_pkthdr *
static void handle_eth_packet(unsigned char* args, const struct pcap_pkthdr* pkthdr, const unsigned char* packet) static void handle_eth_packet(unsigned char* args, const struct pcap_pkthdr* pkthdr, const unsigned char* packet)
{ {
struct ether_header *eptr; struct ether_header *eptr;
int ether_type;
const unsigned char *payload;
eptr = (struct ether_header*)packet; eptr = (struct ether_header*)packet;
ether_type = ntohs(eptr->ether_type);
payload = packet + sizeof(struct ether_header);
tick(0); tick(0);
if(ntohs(eptr->ether_type) == ETHERTYPE_IP) { if(ether_type == ETHERTYPE_8021Q) {
struct vlan_8021q_header* vptr;
vptr = (struct vlan_8021q_header*)payload;
ether_type = ntohs(vptr->ether_type);
payload += sizeof(struct vlan_8021q_header);
}
if(ether_type == ETHERTYPE_IP) {
struct ip* iptr; struct ip* iptr;
int dir = -1; int dir = -1;
@@ -429,7 +440,7 @@ static void handle_eth_packet(unsigned char* args, const struct pcap_pkthdr* pkt
dir = 0; dir = 0;
} }
iptr = (struct ip*)(packet + sizeof(struct ether_header) ); /* alignment? */ iptr = (struct ip*)(payload); /* alignment? */
handle_ip_packet(iptr, dir); handle_ip_packet(iptr, dir);
} }
} }