Port latest upstream master

Signed-off-by: Anestis Bechtsoudis <anestis@census-labs.com>
anestisb · Dec 24, 2019 · 67b2949 · 67b2949
1 parent 40d1349
commit 67b2949
Show file tree

Hide file tree

Showing 6 changed files with 7,323 additions and 6,601 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,7 @@
+Changes in 0.6
+ - added pcapng awareness (thanks to Alberto Zaccagni and Guglielmo Fachini of Nozomi Networks)
+ - automatic uniqueness filter catches most duplicates (-C flag)
+ - added UDP output
 Changes in 0.5
  - %s in output path is the suffix of the main sample file used, if applicable, based on commit by Ditmar Wendt
  - added --seek to seek a specific testcase

diff --git a/README.md b/README.md
diff --git a/README.orig.md b/README.orig.md
diff --git a/jni/Android.mk b/jni/Android.mk
@@ -3,7 +3,7 @@
 #
 #   Anestis Bechtsoudis <anestis@census-labs.com>
 #
-#   Copyright 2014 - 2015 by Census SA. All Rights Reserved.
+#   Copyright 2014 - 2019 by Census SA. All Rights Reserved.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.

diff --git a/jni/Application.mk b/jni/Application.mk
@@ -1,2 +1,2 @@
-APP_PLATFORM := android-21
+APP_PLATFORM := android-28
 APP_ABI := armeabi-v7a arm64-v8a x86 x86_64