Skip to content

Commit 961641f

Browse files
committed
Release v2.5
- Update lincese name to be more explicit. - Update version. - Update copyright year of changed files. - Apply codespell (v1.16.0) typo fixes.
1 parent 1fb56cf commit 961641f

File tree

9 files changed

+17
-11
lines changed

9 files changed

+17
-11
lines changed

CREDITS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
License is GPL v2, is the same as of Linux kernel:
1+
License is GPL-2.0-only, is the same as of Linux kernel:
22

33
This program is free software: you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by

IPT-NETFLOW-MIB.my

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ iptNetflowMIB MODULE-IDENTITY
2929

3030
Copyright (c) 2014 <abc at telekom.ru>.
3131

32-
License: GPL"
32+
License: GPL-2.0-only"
3333

3434
REVISION "201409110000Z"
3535
DESCRIPTION "Initial revision."

NEWS

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
ipt-netflow NEWS
22
================
33

4+
2.5 (2020-04-24)
5+
* Minor maintenance release.
6+
- Compilation compatibility with kernels up to 5.6.
7+
- Performance improvements by Vadim Fedorenko.
8+
- Small code fixes and typo corrections.
9+
410
2.4 (2019-06-23)
511
* Minor maintenance release.
612
- Compilation compatibility with kernels up to 5.2.

README

+2-2
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ ipt_NETFLOW linux 2.6.x-5.x kernel module by <[email protected]> -- 2008-2019.
463463
For NetFlow v5 protocol meaning of fields in dummy flows are such:
464464
Src IP, Src Port is Pre-nat source address.
465465
Dst IP, Dst Port is Post-nat destination address.
466-
- These two fields made equal to data flows catched in FORWARD chain.
466+
- These two fields made equal to data flows caught in FORWARD chain.
467467
Nexthop, Src AS is Post-nat source address for SNAT. Or,
468468
Nexthop, Dst AS is Pre-nat destination address for DNAT.
469469
TCP Flags is SYN+SCK for start event, RST+FIN for stop event.
@@ -472,7 +472,7 @@ ipt_NETFLOW linux 2.6.x-5.x kernel module by <[email protected]> -- 2008-2019.
472472
Natevents are compilation disabled by default, to enable you will need to
473473
add --enable-natevents option to ./configure script.
474474

475-
For techical description of NAT Events see:
475+
For technical description of NAT Events see:
476476
http://tools.ietf.org/html/draft-ietf-behave-ipfix-nat-logging-04
477477

478478
inactive_timeout=15

compat.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* This code is derived from the Linux Kernel sources intended
22
* to maintain compatibility with different Kernel versions.
33
* Copyright of original source is of respective Linux Kernel authors.
4-
* License is GPLv2.
4+
* License is GPL-2.0-only.
55
*/
66

77
#ifndef COMPAT_NETFLOW_H

gen_compat_def

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Generate defines based on kernel having
55
# some symbols declared
66
#
7-
# Copyright (C) 2019 <[email protected]>
7+
# Copyright (C) 2019,2020 <[email protected]>
88
#
99

1010
export LANG=C

ipt_NETFLOW.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This is NetFlow exporting module (NETFLOW target) for linux
3-
* (c) 2008-2019 <[email protected]>
3+
* (c) 2008-2020 <[email protected]>
44
*
55
*
66
* This program is free software: you can redistribute it and/or modify
@@ -92,7 +92,7 @@
9292
# endif
9393
#endif
9494

95-
#define IPT_NETFLOW_VERSION "2.4" /* Note that if you are using git, you
95+
#define IPT_NETFLOW_VERSION "2.5" /* Note that if you are using git, you
9696
will see version in other format. */
9797
#include "version.h"
9898
#ifdef GITVERSION

irqtop

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/ruby
2-
# Obeserve irq and softirq in top fashion
2+
# Observe irq and softirq in top fashion
33
# (c) 2014 <[email protected]>
4-
# License: GPL.
4+
# License: GPL-2.0-only.
55

66
require 'getoptlong'
77
require 'curses'

openwrt/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PKG_NAME:=ipt-netflow
55
PKG_RELEASE:=2
66

77
PKG_SOURCE_URL:=https://github.com/aabc/$(PKG_NAME).git
8-
PKG_VERSION:=2.4
8+
PKG_VERSION:=2.5
99
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
1010

1111
#TO BUILD development version uncomment 2 rows below and remove patches

0 commit comments

Comments
 (0)