wanderer/fastnetmon-ng
1
1
Fork 0
Code Issues 2 Pull Requests Projects 1 Releases Activity

Fix syn umbrella code for PFRING 6.0.2 and 6.0.3 support both

Browse Source
This commit is contained in:
Pavel Odintsov 2015-02-26 16:26:51 +03:00
parent ff19fc03c1
commit 1a8ae106ff
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_syn_umbrella.sh
View File

@ -1,3 +1,5 @@
#!/bin/bash
g++ syn_umbrella.cpp -I/opt/crafter/include -I/opt/pf_ring/include -lpthread -l/opt/pf_ring/lib/libpfring.so -lnuma -l/opt/crafter/lib/libcrafter.so -o umbrella
g++ syn_umbrella.cpp -I/opt/crafter/include -I/opt/pf_ring/include -lpthread -l/opt/pf_ring/lib/libpfring.so -lnuma -l/opt/crafter/lib/libcrafter.so -o synumbrella
# ./umbrella -i zc:eth4 -c 1 -o zc:eth4 -g 0 -v

24
syn_umbrella.cpp
View File

@ -64,18 +64,28 @@ int bind2core(int core_id) {
}
}
// !!!!!!
// TODO: fix it to compile on 6.0.2 PF_RING!!!!!
int max_packet_len(char *device) {
int max_len;
pfring *ring;
int max_packet_len(const char *device) {
int max_len = 0;
ring = pfring_open(device, 1536, PF_RING_PROMISC);
pfring* ring = pfring_open(device, 1536, PF_RING_PROMISC);
if (ring == NULL)
return 1536;
max_len = pfring_get_max_packet_size(ring);
// pfring_get_card_settings have added in 6.0.3
#if RING_VERSION_NUM >= 0x060003
pfring_card_settings settings;
pfring_get_card_settings(ring, &settings);
max_len = settings.max_packet_size;
#else
if (ring->dna.dna_mapped_device) {
max_len = ring->dna.dna_dev.mem_info.rx.packet_memory_slot_len;
} else {
max_len = pfring_get_mtu_size(ring);
if (max_len == 0) max_len = 9000 /* Jumbo */;
max_len += 14 /* Eth */ + 4 /* VLAN */;
}
#endif
pfring_close(ring);