-
Notifications
You must be signed in to change notification settings - Fork 31
/
ChangeLog
2076 lines (1425 loc) · 62.4 KB
/
ChangeLog
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
commit 1d5ca1ca6423a96a0065dd493e8280e73d09d7bc
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Mon Sep 19 14:11:53 2022 +0000
solve warnings
commit fb015b413b9b5d9708db8c5468b62c47284b497a
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sat Aug 13 06:57:19 2022 +0000
Update man page for -x option.
Add softflowd.html generated from softflowd.8 (groff -Thtml -mandoc -c softflowd.8 > softflowd.html)
Update softflowd.md generated from softflowd.html (pandoc -f html -t markdown softflowd.html > softflowd.md)
commit 18049517c1eef937bfbe71a9da10ef83db76eb23
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sat Aug 13 02:23:00 2022 +0000
Add -x option for supporting MPLS packet.
commit 52eab7bd3c786a406fbf0e96c76b03accf5cc9b6
Merge: c96ad14 2fe941e
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sat Dec 19 00:01:47 2020 +0900
Merge pull request #36 from sanjaymsh/ppc64le
Travis-ci:added support for ppc64le
commit 2fe941e5505defffdcc8197c64300d44d3e97e32
Author: sanjay-cpu <snjkmr32@gmail.com>
Date: Thu Dec 17 08:44:32 2020 +0000
Travis-ci:added support for ppc64le
commit c96ad14fcab93d9c79e22cacc41cb149cfce7e19
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sun Sep 20 05:58:47 2020 +0900
Add markdown files generated from manpages
commit a305d9151e75939dae251ab17a7c7f999b0f9e5c
Merge: b9bacb0 e3eff52
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Fri Jul 31 23:58:46 2020 +0900
Merge pull request #34 from atonkyra/add-buffer-size-argument
Add option for setting libpcap buffer size
commit e3eff52474625375ae64fb28c0fdf5989c7a8e0b
Author: Antti Tönkyrä <antti@sensorfleet.com>
Date: Wed Jul 29 13:28:08 2020 +0300
Add option for setting libpcap buffer size
commit b9bacb0c64e1a3adb45600706f160f9f0f5c3419
Merge: a86b5e3 f19307b
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sat Jul 25 14:39:39 2020 +0900
Merge pull request #33 from pwp333/ifname
Amend configure help message to add IPFIX for enable-ifname
commit f19307b0533bcadaadaccbc63ec26e8c23820c84
Author: Michael Hu <mhu@aviatrix.com>
Date: Thu Jul 23 16:10:12 2020 -0700
Amend configure help message to add IPFIX for enable-ifname
commit a86b5e35e5cbfb9aa6ac0d0a02f70dbfc1232063
Merge: 72c1f9a dcedadb
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Fri Jul 24 07:59:57 2020 +0900
Merge pull request #29 from pwp333/ifname
Report interfaceName in normal data and tempalte record
commit 72c1f9ab77205c7107d9aeb13eb01701b890dd14
Merge: f5dd974 2eebed3
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Thu Jul 23 13:42:42 2020 +0900
Merge pull request #32 from pwp333/icmp
Report ip protocol number for ICMP flow for IPFIX
commit 2eebed3a8aba2d84dbf71a13c0250467c2ff5989
Author: Michael Hu <pwp333@hotmail.com>
Date: Fri Jul 17 17:43:24 2020 -0700
Report ip protocol number for ICMP flow for IPFIX
Currently protocol number is missing in v9/IPFIX for ICMP flow.
commit dcedadb3cd302ddbbcc7fafea98de9b371c4ca69
Author: Michael Hu <pwp333@hotmail.com>
Date: Mon Jun 15 23:23:57 2020 -0700
Report interfaceName in normal data and template of v9 record
Some popular netflow collectors like logstash and elasticsearch
take if_name from common netflow records only.
Add configure option --enable-ifname to report interfaceName
in normal data and template of v9 record.
Also fix if_name is empty string always since strlen(src_string) is 0 initially.
Need to use sizeof() instead.
commit f5dd97464623d0a58435cb74acefa8f7f78ed3d6
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sat Jul 11 15:32:40 2020 +0900
Fix sequence in Netflow v9 header.
commit 986358392821934f4629f3a306563f9206a13368
Merge: c8cc54a ab9faac
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Thu May 28 07:21:29 2020 +0900
Merge pull request #28 from overhacked/vlan_mask_fix
Correctly mask the 802.1q TCI bytes
commit ab9faacae7b39230cecdb8e2b9edcea766c396fb
Author: Ross Williams <ross@ross-williams.net>
Date: Wed May 27 19:39:41 2020 +0000
Correctly mask the 802.1q TCI bytes
The 802.1q tag is constructed as follows:
0 1 2 3
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
| TPID | PCP | | VID |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
^
|
DEI
\_______________________________/
TCI
softflowd assumed that all 16 bits of the TCI represented the
VLAN ID (VID). If the PCP or DEI were not zero, the reported VLAN
ID would be incorrect (e.g. VLAN 4090 reported as 12282, not a valid
VID). The solution here is to apply a 12-bit mask to the extracted TCI
bytes.
This discards the PCP and DEI value, but softflowd wasn't reporting
those anyway. They could be recovered in the future if needed. For
terms and definitions without reading the IEEE 802.1q standard, the
Wikipedia article is excellent: https://en.wikipedia.org/wiki/IEEE_802.1Q
commit c8cc54a30376a79960e8ad1264ace129f9e743af
Merge: ebe6cc4 8f94ea2
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Mon May 25 06:38:43 2020 +0900
Merge pull request #27 from overhacked/patch-1
Fix ipfix.c `vlanId` & `postVlanId` network byte order
commit 8f94ea27f27e17d508c6888681255dc0721e3c38
Author: Ross Williams <ross@ross-williams.net>
Date: Sun May 24 08:08:03 2020 -0400
Fix ipfix.c vlanId network byte order
IPFIX requires the vlanid to be in network byte order but it was
being exported in host byte order.
commit ebe6cc44d896334bb4b4f3e7f8f34f304fb0c56c
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sat May 9 20:44:15 2020 +0900
fix code to avoid gcc warnings about buffer overflow.
commit 1c038e107469821da906192065139d5df48c5d74
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sat May 9 19:52:45 2020 +0900
remove autogenerated file
commit f690df8166341b543e86cd65d39841d08b9c3721
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sat May 9 19:50:57 2020 +0900
update README
commit ead968d2843019dfb9e686f1c114833be761b32c
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sun Apr 26 15:09:03 2020 +0900
Add flowDirection and flowEndReason in IPFIX and NetFlow v9
commit f1223c3e81dd0191f30edb05cee8cdcb0fc7162d
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sun Apr 26 11:11:26 2020 +0900
Add interfaceName in option tamplate of IPFIX and NetFlow v9
commit 1401758248ac7d31be6af68c293ff3b38d64b042
Merge: f510969 3e731d4
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Wed Apr 15 22:48:03 2020 +0900
Merge pull request #24 from tofurky/ntopng_ntohs_ports
Convert ports to host byte order for ntopng
commit 3e731d4d806250a37826a6cd283ba9ca2c6406bb
Author: Matt Merhar <mattmerhar@protonmail.com>
Date: Sat Apr 11 21:40:50 2020 -0400
Convert ports to host byte order for ntopng
ntopng expects the ports to be in host byte order and does no conversion
of its own.
Tested on both big (MIPS) and little (x86_64) endian devices with ntopng
4.0.
Signed-off-by: Matt Merhar <mattmerhar@protonmail.com>
commit f5109693f76dd608c2ce40f51b039c68023dc6a7
Merge: 178c5ff 020dd2a
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Fri Apr 10 21:33:30 2020 +0900
Merge pull request #23 from neheb/patch-1
fix compilation with musl
commit 020dd2a325a15ba8bd995e5ea19ba23477b85e58
Author: Rosen Penev <rosenp@gmail.com>
Date: Sat Mar 28 17:20:00 2020 -0700
fix compilation with musl
__uid_t is a glibc type.
commit 178c5ff522308a20986184306ae04ec1c276f33d
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sat Nov 30 00:18:05 2019 +0900
fix bug that displays wrong (dec instead of hex) MAC Address in ntopng
commit db2fbb082fa9c7fbaacadfbf862c139099195202
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sun Nov 17 17:38:24 2019 +0900
Add -S option for specifying send interface name.
commit 479ca8fb32db4d74b543abc1437dd504502faf9d
Merge: fe37a4e 07ae8b2
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Wed Sep 4 22:43:09 2019 +0900
Merge pull request #18 from bruceg/no-promisc
Add support for non-promiscuous operation
commit 07ae8b26890e8c4b0dbebd58438fe0e1aa990831
Author: Bruce Guenter <bruce@untroubled.org>
Date: Mon Sep 2 10:30:16 2019 -0600
Add support for non-promiscuous operation
Signed-off-by: Bruce Guenter <bruce@untroubled.org>
commit fe37a4e64f12d1d571ef9c2b00dfd54debba4c16
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sat Aug 24 09:21:07 2019 +0900
Update README about manpages
commit 64d7e96f2aca9188cf847a49a1a7e1dd9dc91d07
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sat Aug 24 08:52:31 2019 +0900
deleting pdfs from git
commit 3681af73d21b3f34cb555de29b464b320e41745b
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sat Aug 24 07:14:56 2019 +0900
Changing installation directory from bin to sbin which is original installation directory. (Issue #16)
commit 088cf827075dbd4ba6a73761d05d85d9d1d8ca66
Merge: 9cf249e f9a1e88
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sat Aug 24 07:01:17 2019 +0900
Merge pull request #17 from neheb/master
Replace deprecated bzero with memset
commit f9a1e8829c6b442c1d8d8d0b78b7b672ede0cee2
Author: Rosen Penev <rosenp@gmail.com>
Date: Fri Aug 23 12:39:36 2019 -0700
Replace deprecated bzero with memset
bzero is optionally unavailable with uClibc-ng.
commit 9cf249ebc18745a59418a62de124ff3975b59a01
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Fri Aug 16 22:42:16 2019 +0900
fix typo in NEWS
commit f0a614318d1f9b39106da47b78659dfcb12568c8
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Fri Aug 16 20:31:36 2019 +0900
Minor fixes
- fix typos.
- update date in NEWS
- symlink from LICENSE to COPYING
- replace "0.9.9" to "1.0.0"
commit bf7f0ec0c335d8d367c9b1e64371acd8e7bcc1d0
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Thu Aug 15 23:05:08 2019 +0900
update NEWS
commit a01f664f6b664d451799b511912c948edd57e93e
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Thu Aug 15 22:56:31 2019 +0900
Add function for receiving PSAMP which is originated softflowd.
commit 3a87c82424c1181e82a77c499724f90f56183085
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sun Aug 11 16:10:10 2019 +0900
remove portable_endian.h
commit f6cde9fb93c13aa85f3ce91f66a7f7398902c627
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sun Aug 11 15:58:21 2019 +0900
move definition relating APPLE to common.h from portable_endian.h
commit 43bdd0caf797c10885bc4cad95625db74467fca8
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sun Aug 11 14:29:43 2019 +0900
fix error about initial declarations in for loop
commit b2e4816533c485b9a0270b0209801aeb7f96eea5
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sun Aug 11 08:53:29 2019 +0900
add .travis.yml
commit 9925c0e78ea8f746a70afc5185147f1519ad47b8
Merge: 7d1c667 6bf55a5
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Thu Aug 8 19:57:04 2019 +0900
Merge pull request #13 from gsfjohnson/macos_mojave
adjustments for MacOS Mojave
commit 6bf55a5e4f30583a65eef5212770e5b8b25da622
Author: Glen Johnson <gsfjohnson@gmail.com>
Date: Tue Aug 6 17:45:21 2019 -0700
adjustments for MacOS Mojave
commit 7d1c667e484563841066e0b08e87a39d3c5092fb
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sun Aug 4 12:08:04 2019 +0900
Fix segmentation fault error due to buffer overflow for ntopng direct injection.
commit 61ef846c801f027cee5febc9ea06acb2b99ade90
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sun Aug 4 10:09:38 2019 +0900
Change ntopng function
- replace enable-zeromq to enable-ntopng
- replace -v 11 to -v ntopng for NTOPNG direct injection
commit b1e762e9c6915cf95cc9dbf4d2c95d00e21d6e0f
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sun Aug 4 08:31:25 2019 +0900
Remove Makefile.in because this file is autogenerated.
commit 377efd931fcd92bff5c478885632bda2ca2e3b43
Merge: 01f77c1 cc2ee36
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sat Aug 3 10:04:32 2019 +0900
Merge pull request #12 from deece/ntopng
Push flows to ntopng
commit cc2ee36e55b89dec007eafb425ba89bd5cd7942a
Author: Alastair D'Silva <alastair@d-silva.org>
Date: Thu Aug 1 13:47:56 2019 +1000
Push flows to ntopng
Ntopng is a an open-source traffic analyser:
https://www.ntop.org/products/traffic-analysis/ntop/
Unfortunately, it cannot ingest Netflow data directly, instead,
it requires a payware component (Nprobe) to tranlate Netflow to JSON
encapsulated in ZeroMQ messages.
This patch allows softflowd to generate those messages directly,
allowing Ntopng to be used without the need for the payware component.
Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
commit 01f77c1e6fa03b1ed355e35a33b680f167f9a9ac
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sun Jul 21 17:06:35 2019 +0900
Merge netflow v1 code into netflow5.c
commit eae2cd6b934e1713333658f37e39da95e631d7c5
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Mon Jul 15 16:40:51 2019 +0900
Add load balancing mode
- change configure enable option from legacy-nf9 to legacy
- indent -lp -br -brs -brf -ce -cdw -nut ipfix.c ipfix.h netflow1.c netflow5.c netflow9.c netflow9.h psamp.c psamp.h softflowd.c softflowd.h
- update manpage
commit 3d96d6be9a452bcd41bffd0bd0d0abfdaa22ff8d
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Tue Jul 2 23:20:53 2019 +0900
Add new fuctionality for sending multiple destinations
commit 8dc420c3b0a7ecc148e07ae92416694b6e00b38e
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sun Jun 30 20:51:57 2019 +0900
Add sending psamp functionality.
In addition
- separate Information Elements definitions to header files (netflow9.h ipfix.h psamp.h )
- indent -lp -br -brs -brf -ce -cdw -nut common.h ipfix.c ipfix.h netflow9.c psamp.c softflowd.c softflowd.h
- update man page
- update configure.ac and Makefile.am for exclude compiling netflow9.c without enable-legacy-nf9
commit 973fcf5e7a1424094ca10d56a43673c66f619413
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sun Jun 2 00:18:00 2019 +0900
Add multithread option when configure --enable-pthread (It is unstable function)
Additonally
- indent -lp -br -brs -brf -ce -cdw -nut softflowd.c softflowd.h netflow*.c ipfix.c
- upddate manpage
- fix configure bug
commit 2e18e6d0b0e4a2b2d6aeff1ea3cfe55f90ecc95b
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sat Jun 1 12:52:27 2019 +0900
Use automake and update manpage.
commit ddda5064cbee8984edef09edec2357c5295775ae
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Wed May 29 07:32:56 2019 +0900
indent -lp -br -brs -brf softflowd.c softflowd.h netflow*.c ipfix.c
commit e6d29a172d9d0b922b6701838fe073f036746651
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sun May 26 23:00:41 2019 +0900
Add option "-a" for reading pcap file and fix some bugs.
- fix flow_compare for comparing vlan and ether
- fix missing sequence in netflow v9
commit 5dc03fd092e5a9e05856f8221715a0b3eb1bd9cd
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Mon May 6 11:33:06 2019 +0900
update explanation about -b option in usage function.
commit 4fcb3c1f5a8dc2e91ed65ca1aeb802e878fd0ae2
Merge: 7526e9c 34ebfeb
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sat Dec 1 10:14:40 2018 +0900
Merge pull request #9 from nm-mrt/configure
Add autoconf tools to build instructions in README
commit 34ebfeb98e21e6ec36909ef3dde32cf3ea16bfb3
Author: Moritz Rosenthal <moritz.rosenthal@netmodule.com>
Date: Tue Nov 20 16:20:06 2018 +0100
Add autoconf tools to build instructions in README
The build instructions were misleading as the configure script is not
inclueded in the files shipped with repository.
commit 7526e9ca2627a7af22eb04aa35f4683de24b7f66
Merge: bbd0685 e2d1cbd
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Fri Sep 14 21:57:25 2018 +0900
Merge pull request #7 from richb-hanover/documentation-tweaks
Update documentation to include PDF pages.
commit e2d1cbdc498b7cd5dc68dfd146d804d0b5e28f6d
Author: Rich Brown <richb.hanover@gmail.com>
Date: Fri Sep 14 08:27:29 2018 -0400
Update documentation to include PDF pages.
Since this has become the official repo for softflowd, readers can learn about softflowd without running software. Also added Irino's name as maintainer in the man pages, as well as a link to the github repo for bugs and source code.
commit bbd0685d69236844138f96df387a31506d641d0d
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Fri Sep 14 18:32:33 2018 +0900
Add check of the length of string for -i (interface) option.
commit 4391b4b749056298b69ea400de9e6472e6f25667
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Fri Sep 14 17:08:45 2018 +0900
Delete .cvsignore
commit 8a47e875e2070e0dc50f1c63c99fae612e27e33c
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Fri Sep 14 15:50:48 2018 +0900
Adding current repository information in README.
commit 49c039a19203c2f20cfd097612e44481ce067831
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Fri Sep 14 15:37:53 2018 +0900
Added define _DEFAULT_SOURCE line to avoid warning in Linux.
commit 8ea92c3545663a86497a892c53ad394c78a8856a
Author: Hitoshi Irino <irino@sfc.wide.ad.jp>
Date: Sun Aug 6 08:17:43 2017 +0900
New implementation of IPFIX/Netflow v9 for supporting VLAN and Mac-address.
commit 3aa2af5894dd420e049c61fe69aa124003a2390d
Author: SysError956 <paulgodard@gmail.com>
Date: Tue Apr 25 18:26:07 2017 -0400
Fix format type for pid (%u for unsigned instead of %d for signed)
commit 2f195a052b1bed1565d07e2cdfac0467a6be31d1
Author: SysError956 <paulgodard@gmail.com>
Date: Tue Apr 25 18:09:54 2017 -0400
Check pidfile to see if daemon already running
commit b7e50ae4ebb3368a52c7938e1d2b046f90cf6d8f
Author: SysError956 <paulgodard@gmail.com>
Date: Thu Mar 23 20:36:50 2017 -0400
Added support for the pflog datalink type and fixed some typos
commit d53e821bb744c2475858c4d604058e0a475d6177
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Sun Oct 5 15:24:17 2014 +0900
Add bidirectional flow (RFC5103) support in IPFIX. Fix the compile warnings.
commit 3f8e0fceec51047a27574395fb436ef52ceaf792
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Sun Sep 28 20:23:07 2014 +0900
This commit fix sequence number in ipfix header. And it display number of exported data records in statistics.
commit 94786397a40326853462005f4434544528c23b76
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Mon Mar 17 13:10:54 2014 +0900
This commit includes 2 changes.
1. It enables metering and exporting vlanid when using NetFlow v9 and IPFIX.
2. When ICMP flow information are exported It uses the ICMP_TYPE field instead of the L4_DST_PORT field
commit b4a7a1cd4541d89fc985c2caad4dc747378a7b69
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Sun Dec 23 23:44:10 2012 +0900
ToS field is metered and exported in NetFlow v1,v5,v9 and IPFIX in default settings.
-A option is added for exporting absolute time field in IPFIX records to be able to receive with NFDUMP(nfcapd).
-P option is added to select export transport protocol from UDP, TCP, and SCTP. (It is not tested yet.)
commit 417e018c0aca09dbc9edc39a2d4ac0b125d536c0
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Mon Dec 10 22:33:53 2012 +0900
add ipfix.c to support exporting IPFIX formated flow records.
commit bd8e31ecc0bc050f10d549d6e5d526ccd97733b3
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Sat Sep 29 22:35:18 2012 +0900
Fix bug. The sequence number field in NetFlow version 9 is number of exported packets. Older version used number of exported flows for this field.
commit cdf7ae1e3ef368d6b1fa7ae0694bf6f4aaabb325
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Sun Sep 23 03:43:48 2012 +0900
Using strtok instead of strsep in environments which does not have strsep.
commit 91b2a2ced9954777d417a0d4c58bc957622b0f6a
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Fri Sep 21 14:46:18 2012 +0900
Changes for avoidance warnings in gcc compilation on Linux (Ubuntu 12.04), OpenBSD 5.1 and Oracle solaris 11 with AMD64 architecture when enables "--enable-gcc-warnings" option in configure.
commit 5719206e1d0d6cedf92ba6d77909729c691ed6f4
Author: Damien Miller <djm@mindrot.org>
Date: Mon Feb 13 12:38:18 2012 +1100
Added tag softflowd-0.9.9 for changeset c496d4d49348
commit f7c9e6d8fa61fe9bece16ce9ac749286c764e43e
Author: Damien Miller <djm@mindrot.org>
Date: Mon Feb 13 12:37:33 2012 +1100
Update version to 0.9.9 in anticipation of release
commit 43e4ee1c5a1f8b5afb32d891fa968cc266ae99ef
Author: Damien Miller <djm@mindrot.org>
Date: Mon Feb 13 12:36:54 2012 +1100
remove obsolete RCS Id markers
commit 0f461a9e063190e35e66a73bb46dacd88286ac22
Author: Damien Miller <djm@mindrot.org>
Date: Mon Feb 13 12:32:11 2012 +1100
Changelog is now deprecated in favour of mercurial log.
commit 69149d2383163f55411e1e81e2f412cf29e975e4
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Sat Nov 26 10:36:24 2011 +0900
Add AC_ARG_WITH chrootdir in configure.ac to be able to change privdrop chroot direcotry for non BSD environments.
commit 49ad50331dac83e51f257680949312fb726b3118
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Fri Oct 14 21:04:09 2011 +0900
Fix roff errors. (http://lists.mindrot.org/pipermail/netflow-tools/2011-February/000487.html)
commit 6e45d1e8f56c762e2cd99024be9a47d24f320ab8
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Fri Oct 14 19:01:12 2011 +0900
Broken URL in comments is replaced to another URL.
commit 1083d3dd10b42bfe6f179856901ed414e3e31c6a
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Wed Oct 12 23:08:40 2011 +0900
Broken URL in softflowd.8 man page is replaced to other URLs.
commit 51495c4ee4114534bf0f1a97c96f7017a9bae562
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Mon Oct 10 16:53:45 2011 +0900
Some compiler warnings that are appears in AMD64 environment are reduced. "%llu" keywords are replaced with "%PRIu64".
commit 4807417a8d632298256346336e29f39c0f60b43b
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Mon Oct 10 16:10:39 2011 +0900
Description about "-s" sampling option is added in manpage of softflowd.
commit b844d025df2619f9d7148c4628b64ae101ce5866
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Mon Oct 10 15:59:08 2011 +0900
Sampling function as "-s" option is added. If -s option is enabled, option template flow records and option data flow records are exported when export protocol is netflow version 9.
commit 0dce54e9a289a36f3c0d0c85650b2604db0c7bcf
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Thu Sep 22 09:43:38 2011 +0900
fix broken NetFlow v9 flow creation for IPv6 (http://lists.mindrot.org/pipermail/netflow-tools/2011-February/000489.html)
commit 916db7f5bf456b8fd13a02c36f795098b21014f0
Author: Hitoshi Irino <hitoshi.irino@gmail.com>
Date: Wed Sep 21 23:50:08 2011 +0900
avoid to leave main loop while listening on "any" interface. (http://lists.mindrot.org/pipermail/netflow-tools/2011-February/000488.html)
commit cc60ffabafe969a05e6ed0a8fb64883c0aee45b8
Author: Damien Miller <djm@mindrot.org>
Date: Mon Nov 1 12:03:41 2010 +1100
fix some warnings
commit c8eef71995f9a4c6af6c53239b408ee8ae65f77d
Author: Damien Miller <djm@mindrot.org>
Date: Mon Nov 1 12:03:34 2010 +1100
remove broken -WformatC=2 flag that somehow snuck into configure.ac
commit 9c8f5edc65a63566c62cb32021e708ea4d61c412
Author: Damien Miller <djm@mindrot.org>
Date: Mon Nov 1 12:03:02 2010 +1100
mention new Google Code repository
commit c8c3065f6032d20115a971c46b70efdb91423e40
Author: convert-repo <devnull@localhost>
Date: Sun Oct 31 14:34:12 2010 +0000
update tags
commit 2652c7b5c48ee6b9cf4f1d3fcfa704844313ff91
Author: djm <devnull@localhost>
Date: Tue May 4 02:23:51 2010 +0000
- (djm) Swap nf9 last/first switched. They were reversed in the struct
vs our template flowset. Patch from stephen AT sfnelson.org.
https://bugzilla.mindrot.org/show_bug.cgi?id=1760
commit 09512a462b17dff6d6c0c62190b28383abf2d481
Author: djm <devnull@localhost>
Date: Thu Oct 1 08:23:33 2009 +0000
- (djm) Display softflowd start time in "softflowctl statistics" display.
Suggestion from Tamas TEVESZ.
commit f57006dbe892990adf936a99c24bff3f13df10be
Author: djm <devnull@localhost>
Date: Thu Oct 1 07:25:34 2009 +0000
- (djm) One more manpage tweak from Tamas TEVESZ.
commit 0e41def7876bcb8ef2624fb5448d1586113b7fc4
Author: djm <devnull@localhost>
Date: Thu Oct 1 07:06:08 2009 +0000
- (djm) Support manual specification of an interface index to be used
as the input and output interface of all flows generated. Patch from
kempf AT rpi.edu
commit 548decbf01ae5abfa0415e6353882642b4a3838d
Author: djm <devnull@localhost>
Date: Thu Oct 1 06:29:19 2009 +0000
Lots of manpage tweaks from Tamas TEVESZ, ice AT extreme.hu
commit afbd3cc9a747e3b1319ec320268b1d9e81c89854
Author: djm <devnull@localhost>
Date: Thu May 15 18:22:02 2008 +0000
- (djm) Fix typo in manpage for PID file location; patch from
ice AT extreme.hu
- (djm) Make privsep directory compile-time configurable; patch from
ice AT extreme.hu
commit 407dd0870cad7ddaed38180b2412aec0587564f6
Author: djm <devnull@localhost>
Date: Mon Sep 3 10:50:05 2007 +0000
- (djm) Implement a very simple freelist allocator for flows and expiry
events
commit ef74b9062cf531035fe7ebefa4d6f8d5f1457621
Author: djm <devnull@localhost>
Date: Fri Aug 31 03:11:03 2007 +0000
- (djm) Move max_flows into struct FLOWTRACK
commit b0a0d54cd768b69f8f0c0f1e4f9845749c9a5f40
Author: djm <devnull@localhost>
Date: Thu Jul 26 00:50:31 2007 +0000
- (djm) Add flow_get/flow_put and expiry_get/expiry_put functions to
allocate and deallocate flows and expiry events, instead of calling
malloc/free directly. Right now these functions just call malloc/free
anyway, but they will soon be used to implemented pooled flow/expiry
allocations.
commit 1592c1b3e60ce45e434d0dee6b4605ea42d8180b
Author: djm <devnull@localhost>
Date: Tue Jul 24 23:50:35 2007 +0000
- (djm) openlog with LOG_NDELAY so socket is connected before privdrop -
patch from Florian Weimer
commit 38967c4173206bef65f26c784934024de98f326a
Author: djm <devnull@localhost>
Date: Tue Jul 24 23:49:43 2007 +0000
- (djm) Correctly exit from mainloop on signal - patch from Florian Weimer
commit 82477a6cfbc31c74d2f0940369e97bb0a007284e
Author: djm <devnull@localhost>
Date: Tue Jul 24 23:48:58 2007 +0000
- (djm) KNF
commit d76684d20fd1a1673b55e4659d009a353b0544c1
Author: djm <devnull@localhost>
Date: Fri Jan 5 05:00:34 2007 +0000
better place
commit 3e21cd3e73cc511ea867cecf3a964c89825df7eb
Author: djm <devnull@localhost>
Date: Fri Jan 5 04:56:29 2007 +0000
another
commit f2cdbff13df68b60c644d0e324d1575420a3d2ab
Author: djm <devnull@localhost>
Date: Fri Jan 5 04:54:44 2007 +0000
newline at EOF
commit 6800ff1fa886c4ff25079c667e95931505a57ffe
Author: djm <devnull@localhost>
Date: Thu Nov 2 22:50:01 2006 +0000
- (djm) Document -v option and close Ed in manpage; from Nino Jogun
nino80 AT gmail.com
commit aea9b2557d226afedeafdc516c00902d3f0f06c7
Author: djm <devnull@localhost>
Date: Thu Nov 2 06:36:16 2006 +0000
prep for release
commit b934962bb7e52e21649dacdcf82167936dfba456
Author: djm <devnull@localhost>
Date: Thu Nov 2 06:34:18 2006 +0000
mention LICENSE
commit 2dfbcf16d4980d9b045547a1ff9aef1f60862594
Author: djm <devnull@localhost>
Date: Thu Nov 2 06:29:40 2006 +0000
- (djm) Sync sys-tree.h
commit 88c78fd672fc545cbad98839c0309638cf5e2b00
Author: djm <devnull@localhost>
Date: Thu Nov 2 06:29:33 2006 +0000
more
commit a45adcfce6d50edadd6525e0060d58e286149a31
Author: djm <devnull@localhost>
Date: Thu Nov 2 06:23:29 2006 +0000
- (djm) malloc(x*y) -> calloc(x, y)
commit 7d1ddaad792e975d1fd802805f59cf74d61b7c52
Author: djm <devnull@localhost>
Date: Thu Nov 2 00:15:48 2006 +0000
- (djm) Collect licenses into LICENSE file
commit 7ec91dc3af1d4f665bf430d8ce2dbccdfb5792e3
Author: djm <devnull@localhost>
Date: Thu Mar 16 08:24:19 2006 +0000
- (djm) Add "send-template" softflowctl command to resend a NetFlow 9
template record immediately
commit c055b70addfa0463b69224c252fa471b8a38bfb0
Author: djm <devnull@localhost>
Date: Thu Mar 16 08:23:13 2006 +0000
- (djm) Add "send-template" softflowctl command to resend a NetFlow 9
template record immediately
commit d4242f6b645e7634527804faa987afef9a263b2b
Author: djm <devnull@localhost>
Date: Tue Mar 14 23:15:41 2006 +0000
- (djm) Add RPM packaging files from ssnodgra AT pheran.com
commit 1ab0c942ec56ae1095578acf9b51483bf43299b1
Author: djm <devnull@localhost>
Date: Tue Mar 14 23:14:23 2006 +0000
- (djm) Crank version number to 0.9.8
commit 1ca6e61046d4362039c46725763131f1b4ed39a4
Author: djm <devnull@localhost>
Date: Tue Mar 14 23:06:10 2006 +0000
- (djm) Encode ICMP type and code into port numbers (apparently this is
what Cisco exporters do), patch from ssnodgra AT pheran.com slightly
tweaked by me
commit 685cfdf9b99f388e6e5a5b2fdfdd7da9ffe1780d
Author: djm <devnull@localhost>
Date: Tue Mar 14 22:55:41 2006 +0000
- (djm) Support ${DESTDIR} in Makefile install target, from
ssnodgra AT pheran.com
commit 4fa859d3abccc05c43a00d9de10a88235c607af7
Author: djm <devnull@localhost>
Date: Tue Mar 14 22:51:48 2006 +0000
- (djm) Fix DLT_RAW support, from jhanna AT shaw.ca
commit 5aca81ee9db65063b9e1e493e57769bedb6845a0
Author: djm <devnull@localhost>
Date: Mon Feb 13 20:48:15 2006 +0000
- (djm) Add missing getopt() bit for flowtrack mode
commit 0bf0fe4260234f53ec226e6d31002efe3b43d3d5
Author: djm <devnull@localhost>
Date: Sat Feb 11 11:27:38 2006 +0000
- (djm) Add option to ignore port and protocol information from flows,
allowing flows from the same IP addresses to be automatically
coalesced
commit 970c294671e89569270a2239b754957c25f9f42f
Author: djm <devnull@localhost>
Date: Wed Jan 25 23:25:04 2006 +0000
- (djm) Correctly expire quiescent flows when they hit maximum_lifetime;
bug noticed and patch tested by andreas.brillisauer AT hetzner.de
commit 205988967ff8096c412efc52f0f2a4e43647535d
Author: djm <devnull@localhost>
Date: Thu Dec 22 02:23:41 2005 +0000
- (djm) Make sure installation directories exist, spotted by
alshu AT tut.by
commit d2a71f153ed22b1fd973a3f5ddd884841faf680f
Author: djm <devnull@localhost>
Date: Fri Nov 18 05:19:12 2005 +0000
- (djm) Support Linux "cooked socket" datalink type, from Tony Lewis
gnutered AT yahoo.com.au
commit 78874c4809fe0282c855a9d79ef146c493991806
Author: djm <devnull@localhost>
Date: Fri Nov 18 05:17:10 2005 +0000
- (djm) Some extra paranoia and verbosity on malloc failures
commit 86fbc4bda72904df200693bb9bfc7386df22a9dc
Author: djm <devnull@localhost>
Date: Sat Oct 1 00:14:21 2005 +0000
- (djm) Fix typo, from rbreathe AT brookes.ac.uk
commit 60ab28b7a359d2fcd75c80489b34b8cdca0b36ba
Author: djm <devnull@localhost>
Date: Sat May 14 06:47:46 2005 +0000
- (djm) Fix reversed NetFlow v.9 first_switched and last_switched times
commit 966578170f1dd4f41c93a2ba80489442f0e15ac7
Author: djm <devnull@localhost>
Date: Sat May 14 06:47:16 2005 +0000
- (djm) Fix time printing bug in debug mode
commit 81ac51ceb7627853382eb4117a669ecd9ae137a3
Author: djm <devnull@localhost>
Date: Sat May 14 06:17:18 2005 +0000
more
commit 3b655023c6aa46d022bcf1bff53a9196c9537113
Author: djm <devnull@localhost>
Date: Thu May 5 03:32:57 2005 +0000
- (djm) Report pcap stats in statistics display
commit 9bb3c79f9f197c4034a0fad9b1774a987bb8e45d
Author: djm <devnull@localhost>