Update for release softflowd-v1.1.0

- Update NEWS - Updtae ChangeLog - Update PROGVER from "1.0.0" to "1.1.0" in common.h - Update AC_INIT from "1.0.0" to "1.1.0" in configure.ac - Update Version from "1.0.0" to "1.1.0" in softflowd.spec - Update configure.ac by autoupdate
irino · Sep 20, 2022 · 433fbb7 · 433fbb7
1 parent 1d5ca1c
commit 433fbb7
Show file tree

Hide file tree

Showing 5 changed files with 278 additions and 14 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,259 @@
+commit 1d5ca1ca6423a96a0065dd493e8280e73d09d7bc
+Author: Hitoshi Irino <[email protected]>
+Date:   Mon Sep 19 14:11:53 2022 +0000
+
+    solve warnings
+
+commit fb015b413b9b5d9708db8c5468b62c47284b497a
+Author: Hitoshi Irino <[email protected]>
+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 <[email protected]>
+Date:   Sat Aug 13 02:23:00 2022 +0000
+
+    Add -x option for supporting MPLS packet.
+
+commit 52eab7bd3c786a406fbf0e96c76b03accf5cc9b6
+Merge: c96ad14 2fe941e
+Author: Hitoshi Irino <[email protected]>
+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 <[email protected]>
+Date:   Thu Dec 17 08:44:32 2020 +0000
+
+    Travis-ci:added support for ppc64le
+
+commit c96ad14fcab93d9c79e22cacc41cb149cfce7e19
+Author: Hitoshi Irino <[email protected]>
+Date:   Sun Sep 20 05:58:47 2020 +0900
+
+    Add markdown files generated from manpages
+
+commit a305d9151e75939dae251ab17a7c7f999b0f9e5c
+Merge: b9bacb0 e3eff52
+Author: Hitoshi Irino <[email protected]>
+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ä <[email protected]>
+Date:   Wed Jul 29 13:28:08 2020 +0300
+
+    Add option for setting libpcap buffer size
+
+commit b9bacb0c64e1a3adb45600706f160f9f0f5c3419
+Merge: a86b5e3 f19307b
+Author: Hitoshi Irino <[email protected]>
+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 <[email protected]>
+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 <[email protected]>
+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 <[email protected]>
+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 <[email protected]>
+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 <[email protected]>
+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 <[email protected]>
+Date:   Sat Jul 11 15:32:40 2020 +0900
+
+    Fix sequence in Netflow v9 header.
+
+commit 986358392821934f4629f3a306563f9206a13368
+Merge: c8cc54a ab9faac
+Author: Hitoshi Irino <[email protected]>
+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 <[email protected]>
+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 <[email protected]>
+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 <[email protected]>
+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 <[email protected]>
+Date:   Sat May 9 20:44:15 2020 +0900
+
+    fix code to avoid gcc warnings about buffer overflow.
+
+commit 1c038e107469821da906192065139d5df48c5d74
+Author: Hitoshi Irino <[email protected]>
+Date:   Sat May 9 19:52:45 2020 +0900
+
+    remove autogenerated file
+
+commit f690df8166341b543e86cd65d39841d08b9c3721
+Author: Hitoshi Irino <[email protected]>
+Date:   Sat May 9 19:50:57 2020 +0900
+
+    update README
+
+commit ead968d2843019dfb9e686f1c114833be761b32c
+Author: Hitoshi Irino <[email protected]>
+Date:   Sun Apr 26 15:09:03 2020 +0900
+
+    Add flowDirection and flowEndReason in IPFIX and NetFlow v9
+
+commit f1223c3e81dd0191f30edb05cee8cdcb0fc7162d
+Author: Hitoshi Irino <[email protected]>
+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 <[email protected]>
+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 <[email protected]>
+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 <[email protected]>
+
+commit f5109693f76dd608c2ce40f51b039c68023dc6a7
+Merge: 178c5ff 020dd2a
+Author: Hitoshi Irino <[email protected]>
+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 <[email protected]>
+Date:   Sat Mar 28 17:20:00 2020 -0700
+
+    fix compilation with musl
+
+    __uid_t is a glibc type.
+
+commit 178c5ff522308a20986184306ae04ec1c276f33d
+Author: Hitoshi Irino <[email protected]>
+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 <[email protected]>
+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 <[email protected]>

diff --git a/NEWS b/NEWS
@@ -1,3 +1,14 @@
+Fri Sep 20 2022
+Softflowd 1.1.0
+This release contains some new features and some bug fix by community.
+
+Details
+This release contains the following new features:
+Add -x option which means number of MPLS shim label header for decoding and exporting MPLS packet.
+Add -B option for specifying Libpcap buffer size.
+Add exporting interface name with --enable-ifname configure option.
+
+
 Fri Aug 16 2019
 Softflowd 1.0.0
 This release contains some new features.
@@ -27,4 +38,4 @@ Fix logging from reduced-privileged child
 Many manpage typo, consistency and formatting fixes
 The softflow statistics command now displays the time at which softflowd was started
 Avoid spurious exit from mainloop while listening on "any" interface
-Correct broken IPv6 Netflow v.9 flows
+Correct broken IPv6 Netflow v.9 flows
diff --git a/common.h b/common.h
@@ -83,7 +83,7 @@
 #define PROGNAME		"softflowd"
 
 /* The name of the program */
-#define PROGVER			"1.0.0"
+#define PROGVER			"1.1.0"
 
 /* Default pidfile */
 #define DEFAULT_PIDFILE		"/var/run/" PROGNAME ".pid"

diff --git a/configure.ac b/configure.ac
@@ -12,11 +12,11 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-AC_INIT([softflowd], [1.0.0])
+AC_INIT([softflowd],[1.1.0])
 AC_CONFIG_SRCDIR([softflowd.c])
 AM_INIT_AUTOMAKE
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AC_PROG_CC
 AC_PROG_INSTALL
 
@@ -33,26 +33,23 @@ AC_ARG_ENABLE(gcc-warnings,
 	[ if test "x$enableval" = "xyes" ; then CFLAGS="$CFLAGS $WFLAGS"; fi ]
 )
 AC_ARG_ENABLE(legacy,
-              AC_HELP_STRING([--enable-legacy],
-                             [enable legacy NetFlow implementation (default NO)]),
+              AS_HELP_STRING([--enable-legacy],[enable legacy NetFlow implementation (default NO)]),
               [legacy=yes],[legacy=no])
 AC_ARG_ENABLE(pthread,
-              AC_HELP_STRING([--enable-pthread], [enable pthread (default NO) (experimental, unstable)]),
+              AS_HELP_STRING([--enable-pthread],[enable pthread (default NO) (experimental, unstable)]),
               [pthread=yes],[pthread=no])
 AC_ARG_ENABLE(ntopng,
-              AC_HELP_STRING([--enable-ntopng], [enable flow sending to ntopng with zeromq (default NO)]),
+              AS_HELP_STRING([--enable-ntopng],[enable flow sending to ntopng with zeromq (default NO)]),
               [ntopng=yes],[ntopng=no])
 AC_ARG_ENABLE(ifname,
-              AC_HELP_STRING([--enable-ifname], [enable flow reporting iface name in normal data of v9 and IPFIX (default NO)]),
+              AS_HELP_STRING([--enable-ifname],[enable flow reporting iface name in normal data of v9 and IPFIX (default NO)]),
               [ifname=yes],[ifname=no])
 AC_ARG_ENABLE(flow-spray,
-              AC_HELP_STRING([--enable-flow-spray],
-                             [enable spray as flow tree type(default is RB)]),
+              AS_HELP_STRING([--enable-flow-spray],[enable spray as flow tree type(default is RB)]),
               AC_DEFINE([FLOW_SPRAY], 1, [enable spray as flow tree type]),
 	      AC_DEFINE([FLOW_RB], 1, [enable RB(red-black) as flow tree type]))
 AC_ARG_ENABLE(expiry-spray,
-              AC_HELP_STRING([--enable-expiry-spray],
-                             [enable spray as expiry tree type (default is RB)]),
+              AS_HELP_STRING([--enable-expiry-spray],[enable spray as expiry tree type (default is RB)]),
               AC_DEFINE([EXPIRY_SPRAY], 1, [enable spray as flow tree type]),
 	      AC_DEFINE([EXPIRY_RB], 1, [enable RB(red-black) as flow tree type]))
 

diff --git a/softflowd.spec b/softflowd.spec
@@ -3,7 +3,7 @@
 
 Name: softflowd
 Summary: Network traffic analyser capable of Cisco NetFlow data export
-Version: 1.0.0
+Version: 1.1.0
 Release: 1.%{_RHTAG}
 Source: softflowd-%{version}.tar.gz
 Group: System/Utilities