Skip to content

Commit

Permalink
Cleanup minor issues and add example for ft2nfdump
Browse files Browse the repository at this point in the history
  • Loading branch information
@phaag
phaag committed May 11, 2024
1 parent d105409 commit 564f3a9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 178 deletions.
7 changes: 6 additions & 1 deletion man/ft2nfdump.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,13 @@ Print ft2nfdump version and exit.
.It Fl h
Print help text to stdout and exit.
.El
.Sh EXAMPLES
To convert a flow tools file into nfdump format:
.Dl % ft2nfdump -r <flow-tools-file> -z=lz4 -w <nfdump-file.nf>
.Dl % nfdump -r <nfdump-file.nf>
.Ed
.Sh RETURN VALUES
.Nm
returns 0 on success and 255 otherwise.
.Sh SEE ALSO
.Xr nfdump 1
.Xr nfdump 1
1 change: 1 addition & 0 deletions src/nfdump/nfdump.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ static stat_record_t process_data(void *engine, int processwMode, char *wfile, R
if (sumSize == dataBlock_r->size) {
LogError("DataBlock count error");
LogError("DataBlock: count: %u, size: %u. Found: %u, size: %u", dataBlock_r->NumRecords, dataBlock_r->size, i, sumSize);
dataBlock_r->NumRecords = i;
break;
}
LogError("Corrupt data file. Inconsistent block size in %s line %d", __FILE__, __LINE__);
Expand Down
177 changes: 0 additions & 177 deletions src/test/nfgen.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -551,183 +551,6 @@ int main(int argc, char **argv) {
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);

/*
record.exElementList[i] = 0;
record.numElements = i;
record.map_ref = 0;
record.type = CommonRecordType;
record.flags = 0;
record.exporter_sysid = 1;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET, "172.16.2.66", "192.168.170.101");
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
genericFlow->inPackets = 101;
record.inByytes = 102;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET, "172.16.3.66", "192.168.170.102");
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET, "172.16.4.66", "192.168.170.103");
record.srcPort = 2024;
record.proto = IPPROTO_UDP;
genericFlow->tcpFlags = 1;
record.tos = 1;
genericFlow->inPackets = 1001;
record.inByytes = 1002;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET, "172.16.5.66", "192.168.170.104");
record.srcPort = 3024;
record.proto = 51;
genericFlow->tcpFlags = 2;
record.tos = 2;
genericFlow->inPackets = 10001;
record.inByytes = 10002;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET, "172.16.6.66", "192.168.170.105");
record.srcPort = 4024;
record.proto = IPPROTO_TCP;
genericFlow->tcpFlags = 4;
record.tos = 3;
genericFlow->inPackets = 100001;
record.inByytes = 100002;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET, "172.16.7.66", "192.168.170.106");
record.srcPort = 5024;
genericFlow->tcpFlags = 8;
record.tos = 4;
genericFlow->inPackets = 1000001;
record.inByytes = 1000002;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET, "172.16.8.66", "192.168.170.107");
genericFlow->tcpFlags = 1;
record.tos = 4;
genericFlow->inPackets = 10000001;
record.inByytes = 1001;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET, "172.16.9.66", "192.168.170.108");
record.srcPort = 6024;
genericFlow->tcpFlags = 16;
record.tos = 5;
genericFlow->inPackets = 500;
record.inByytes = 10000001;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET, "172.16.10.66", "192.168.170.109");
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET, "172.16.11.66", "192.168.170.110");
record.srcPort = 7024;
genericFlow->tcpFlags = 32;
record.tos = 255;
genericFlow->inPackets = 5000;
record.inByytes = 100000001;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET, "172.16.12.66", "192.168.170.111");
record.srcPort = 8024;
genericFlow->tcpFlags = 63;
record.tos = 0;
record.inByytes = 1000000001;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET, "172.16.13.66", "192.168.170.112");
record.srcPort = 0;
record.dstPort = 8;
record.proto = 1;
genericFlow->tcpFlags = 0;
record.tos = 0;
genericFlow->inPackets = 50002;
record.inByytes = 50000;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET, "172.160.160.166", "172.160.160.180");
record.srcPort = 10024;
record.dstPort = 25000;
record.proto = IPPROTO_TCP;
genericFlow->inPackets = 500001;
record.inByytes = 500000;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET6, "fe80::2110:abcd:1234:0", "fe80::2110:abcd:1235:4321");
SetNextIPaddress(&record, PF_INET6, "2003:234:aabb::211:24ff:fe80:d01e");
SetBGPNextIPaddress(&record, PF_INET6, "2004:234:aabb::211:24ff:fe80:d01e");
record.srcPort = 1024;
record.dstPort = 25;
genericFlow->tcpFlags = 27;
genericFlow->inPackets = 10;
record.inByytes = 15100;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET6, "2001:234:aabb::211:24ff:fe80:d01e", "2001:620::8:203:baff:fe52:38e5");
record.srcPort = 10240;
record.dstPort = 52345;
genericFlow->inPackets = 10100;
record.inByytes = 15000000;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
genericFlow->inPackets = 10100000;
record.inByytes = 0x100000000LL;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
genericFlow->inPackets = 0x100000000LL;
record.inByytes = 15000000;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
record.inByytes = 0x200000000LL;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET, "172.16.14.18", "192.168.170.113");
SetNextIPaddress(&record, PF_INET, "172.72.1.2");
SetBGPNextIPaddress(&record, PF_INET, "172.73.2.3");
record.srcPort = 10240;
record.dstPort = 52345;
genericFlow->inPackets = 10100000;
record.inByytes = 0x100000000LL;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET, "172.16.15.18", "192.168.170.114");
genericFlow->inPackets = 0x100000000LL;
record.inByytes = 15000000;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
SetIPaddress(&record, PF_INET, "172.16.16.18", "192.168.170.115");
record.inByytes = 0x200000000LL;
UpdateRecord(recordHandle);
dataBlock = StoreRecord(recordHandle, nffile, dataBlock);
*/
FlushBlock(nffile, dataBlock);
CloseUpdateFile(nffile);
return 0;
Expand Down

0 comments on commit 564f3a9

Please sign in to comment.