From 27ce2a4cd9fd5813df7a4ee69a166212b850e959 Mon Sep 17 00:00:00 2001
From: Pavel Odintsov <pavel.odintsov@gmail.com>
Date: Sat, 23 May 2020 17:52:39 +0100
Subject: [PATCH] Added option to install modern JSON-C for installer and added
 help

---
 src/fastnetmon_install.pl | 59 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 3 deletions(-)

diff --git a/src/fastnetmon_install.pl b/src/fastnetmon_install.pl
index f1ffdd74..a5f416c0 100644
--- a/src/fastnetmon_install.pl
+++ b/src/fastnetmon_install.pl
@@ -99,17 +99,25 @@ my $make_options = '';
 # We could pass options to configure with this variable
 my $configure_options = '';
 
-welcome_message();
-
 my $use_modern_pf_ring = '';
 
+my $show_help = '';
+
 # Get options from command line
 GetOptions(
     'use-git-master' => \$we_use_code_from_master,
     'do-not-track-me' => \$do_not_track_me,
     'use-modern-pf-ring' => \$use_modern_pf_ring,
+    'help' => \$show_help,
 );
 
+if ($show_help) {
+    print "We have following options: --use-git-master, --do-not-track-me, --use-modern-pf-ring and --help\n";
+    exit (0);
+}
+
+welcome_message();
+
 # Bump PF_RING version
 if ($use_modern_pf_ring) {
     $pf_ring_version = '6.6.0';
@@ -369,7 +377,12 @@ sub main {
         install_pf_ring();
     }
 
-    install_json_c();
+    # We need to use another path for library in this case
+    if ($we_use_code_from_master) {
+	install_new_json_c();
+    } else {
+    	install_json_c();
+    }
 
     if ($we_have_ndpi_support) {
         install_ndpi();
@@ -620,6 +633,46 @@ sub install_lua_lpeg {
     exec_command("cp lpeg.so /opt/luajit_2.0.4/lib/lua/5.1");
 }
 
+sub install_new_json_c {
+    my $archive_name  = 'json-c-0.13-20171207.tar.gz';
+    my $install_path = '/opt/json-c-0.13';
+
+
+    print "Install json library\n";
+
+    chdir $temp_folder_for_building_project;
+
+    print "Download archive\n";
+
+    my $json_c_download_result = download_file("https://github.com/json-c/json-c/archive/$archive_name",
+        $archive_name,
+        '6fc7fdd11eadd5a05e882df11bb4998219615de2');
+
+    unless ($json_c_download_result) {
+        fast_die("Can't download json-c sources");
+    }
+
+    print "Uncompress it\n";
+    exec_command("tar -xf $archive_name");
+    chdir "json-c-json-c-0.13-20171207";
+
+    # Fix bugs (assigned but not used variable) which prevent code compilation
+    if ($os_type eq 'macosx' or $os_type eq 'freebsd') {
+        exec_command("sed -i -e '355 s#^#//#' json_tokener.c");
+        exec_command("sed -i -e '360 s#^#//#' json_tokener.c");
+    } else {
+        
+    }
+
+    print "Build it\n";
+    exec_command("./configure --prefix=$install_path");
+
+    print "Install it\n";
+    exec_command("make $make_options install");
+
+    put_library_path_to_ld_so("/etc/ld.so.conf.d/json-c.conf", "$install_path/lib");
+}
+
 sub install_json_c {
     my $archive_name  = 'json-c-0.12-20140410.tar.gz';
     my $install_path = '/opt/json-c-0.12';