DeforaNetworks/fwknop
DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Updated sniffer to be able to handle the linux "any" interface.

Browse Source 
git-svn-id: file:///home/mbr/svn/fwknop/trunk@151 510a4753-2344-4c79-9c09-4d669213fbeb
This commit is contained in:
Damien Stuart 2009-09-28 00:33:09 +00:00
parent 5a72c4fca7
commit e399f39c39
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/pcap_capture.c
View File

@ -105,6 +105,9 @@ pcap_capture(fko_srv_options_t *opts)
case DLT_EN10MB: case DLT_EN10MB:
opts->data_link_offset = 14; opts->data_link_offset = 14;
break; break;
case DLT_LINUX_SLL:
opts->data_link_offset = 16;
break;
case DLT_NULL: case DLT_NULL:
opts->data_link_offset = 4; opts->data_link_offset = 4;
break; break;
@ -139,6 +142,7 @@ pcap_capture(fko_srv_options_t *opts)
pcap_errcnt = 0; pcap_errcnt = 0;
continue; continue;
} }
/* If there was an error, complain and go on (to an extent /* If there was an error, complain and go on (to an extent
* before giving up). * before giving up).
*/ */

9
server/process_packet.c
View File

@ -66,6 +66,12 @@ process_packet(unsigned char *args, const struct pcap_pkthdr *packet_header,
unsigned short pkt_len = packet_header->len; unsigned short pkt_len = packet_header->len;
/* This is a hack to determine if we are using the linux cooked
* interface. We base it on the offset being 16 which is the
* value it would be if the datalink is DLT_LINUX_SLL. I don't
* know if this is the correct way to do this, but it seems to work.
*/
unsigned char assume_cooked = (offset == 16 ? 1 : 0);
/* Determine packet end. /* Determine packet end.
*/ */
@ -91,7 +97,7 @@ process_packet(unsigned char *args, const struct pcap_pkthdr *packet_header,
/* When using libpcap, pkthdr->len for 802.3 frames include CRC_LEN, /* When using libpcap, pkthdr->len for 802.3 frames include CRC_LEN,
* but Ethenet_II frames do not. * but Ethenet_II frames do not.
*/ */
if (eth_type > 1500) if (eth_type > 1500 || assume_cooked == 1)
{ {
pkt_len += ETHER_CRC_LEN; pkt_len += ETHER_CRC_LEN;
@ -124,7 +130,6 @@ process_packet(unsigned char *args, const struct pcap_pkthdr *packet_header,
if (ip_hdr_words < MIN_IPV4_WORDS) if (ip_hdr_words < MIN_IPV4_WORDS)
return; return;
/* Now, find the packet data payload (depending on IPPROTO). /* Now, find the packet data payload (depending on IPPROTO).
*/ */
src_ip = iph_p->saddr; src_ip = iph_p->saddr;