Move all code to src folder

2015-03-22 13:36:58 +03:00 · 2015-03-22 13:36:58 +03:00 · d8c2e4888b
parent 918033cc68
commit d8c2e4888b
54 changed files with 3 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -13,6 +13,7 @@ before_script:
  - sudo apt-get install -y build-essential bison flex libnuma-dev wget tar make
  - cd PF_RING-6.0.2; sudo cp kernel/linux/pf_ring.h /usr/include/linux; cd userland/lib; ./configure --prefix=/opt/pf_ring; make; sudo make install
  - cd `cat /tmp/old_current_path`
  - cd src
 script: mkdir -p build; cd build; cmake ..; make
 notifications:
  email:
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@ -1,6 +1,6 @@
 For Debian 6, 7 and CentOS 6 and 7 you should use the automatic installer:
 ```bash
-wget https://raw.githubusercontent.com/FastVPSEestiOu/fastnetmon/master/fastnetmon_install.pl
+wget https://raw.githubusercontent.com/FastVPSEestiOu/fastnetmon/master/src/fastnetmon_install.pl
 perl fastnetmon_install.pl
 ```
 If you want to use netmap module, please install it: [netmap install](NETMAP_INSTALL.md) 
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
--- a/src/asn_geoip_update.sh
+++ b/src/asn_geoip_update.sh
--- a/src/build_plugin_tester.sh
+++ b/src/build_plugin_tester.sh
--- a/src/example_plugin/example_collector.cpp
+++ b/src/example_plugin/example_collector.cpp
--- a/src/example_plugin/example_collector.h
+++ b/src/example_plugin/example_collector.h
--- a/src/fast_library.cpp
+++ b/src/fast_library.cpp
--- a/src/fast_library.h
+++ b/src/fast_library.h
--- a/src/fast_priority_queue.cpp
+++ b/src/fast_priority_queue.cpp
--- a/src/fast_priority_queue.h
+++ b/src/fast_priority_queue.h
--- a/src/fastnetmon.cpp
+++ b/src/fastnetmon.cpp
--- a/src/fastnetmon_client.cpp
+++ b/src/fastnetmon_client.cpp
--- a/src/fastnetmon_install.pl
+++ b/src/fastnetmon_install.pl
@ -150,7 +150,7 @@ sub install {
    print "Clone FastNetMon repo\n";
    chdir "/usr/src";
-    my $fastnetmon_code_dir = "/usr/src/fastnetmon";
+    my $fastnetmon_code_dir = "/usr/src/fastnetmon/src";
    if (-e $fastnetmon_code_dir) {
        # Code already downloaded
--- a/src/fastnetmon_packet_parser.c
+++ b/src/fastnetmon_packet_parser.c
--- a/src/fastnetmon_packet_parser.h
+++ b/src/fastnetmon_packet_parser.h
--- a/src/fastnetmon_types.h
+++ b/src/fastnetmon_types.h
--- a/src/ipfix_csv_processor.pl
+++ b/src/ipfix_csv_processor.pl
--- a/src/libpatricia/copyright
+++ b/src/libpatricia/copyright
--- a/src/libpatricia/credits.txt
+++ b/src/libpatricia/credits.txt
--- a/src/libpatricia/patricia.c
+++ b/src/libpatricia/patricia.c
--- a/src/libpatricia/patricia.h
+++ b/src/libpatricia/patricia.h
--- a/src/netflow_plugin/netflow.h
+++ b/src/netflow_plugin/netflow.h
--- a/src/netflow_plugin/netflow_collector.cpp
+++ b/src/netflow_plugin/netflow_collector.cpp
--- a/src/netflow_plugin/netflow_collector.h
+++ b/src/netflow_plugin/netflow_collector.h
--- a/src/netmap_plugin/netmap_collector.cpp
+++ b/src/netmap_plugin/netmap_collector.cpp
--- a/src/netmap_plugin/netmap_collector.h
+++ b/src/netmap_plugin/netmap_collector.h
--- a/src/netmap_plugin/netmap_includes/net/netmap.h
+++ b/src/netmap_plugin/netmap_includes/net/netmap.h
--- a/src/netmap_plugin/netmap_includes/net/netmap_user.h
+++ b/src/netmap_plugin/netmap_includes/net/netmap_user.h
--- a/src/pcap_plugin/pcap_collector.cpp
+++ b/src/pcap_plugin/pcap_collector.cpp
--- a/src/pcap_plugin/pcap_collector.h
+++ b/src/pcap_plugin/pcap_collector.h
--- a/src/pfring_plugin/pfring_collector.cpp
+++ b/src/pfring_plugin/pfring_collector.cpp
--- a/src/pfring_plugin/pfring_collector.h
+++ b/src/pfring_plugin/pfring_collector.h
--- a/src/plugin_runner.cpp
+++ b/src/plugin_runner.cpp
--- a/src/sflow_plugin/sflow.h
+++ b/src/sflow_plugin/sflow.h
--- a/src/sflow_plugin/sflow_collector.cpp
+++ b/src/sflow_plugin/sflow_collector.cpp
--- a/src/sflow_plugin/sflow_collector.h
+++ b/src/sflow_plugin/sflow_collector.h
--- a/src/tests/DATA_STRUCTURES.md
+++ b/src/tests/DATA_STRUCTURES.md
--- a/src/tests/build_lpm_test.bash
+++ b/src/tests/build_lpm_test.bash
--- a/src/tests/build_netmap.bash
+++ b/src/tests/build_netmap.bash
--- a/src/tests/build_pcap_reader.sh
+++ b/src/tests/build_pcap_reader.sh
--- a/src/tests/ip_lookup.cpp
+++ b/src/tests/ip_lookup.cpp
--- a/src/tests/long_prefix_match_unused_code.cpp
+++ b/src/tests/long_prefix_match_unused_code.cpp
--- a/src/tests/lpm_performance_tests.cpp
+++ b/src/tests/lpm_performance_tests.cpp
--- a/src/tests/lru_cache/README
+++ b/src/tests/lru_cache/README
--- a/src/tests/lru_cache/lru_cache.cpp
+++ b/src/tests/lru_cache/lru_cache.cpp
--- a/src/tests/lru_cache/lru_cache.h
+++ b/src/tests/lru_cache/lru_cache.h
--- a/src/tests/lru_cache/lru_cache.h.gch
+++ b/src/tests/lru_cache/lru_cache.h.gch
--- a/src/tests/netmap.cpp
+++ b/src/tests/netmap.cpp
--- a/src/tests/pcap_reader.cpp
+++ b/src/tests/pcap_reader.cpp
--- a/src/tests/pfring_parser_zc_issue.c
+++ b/src/tests/pfring_parser_zc_issue.c
--- a/src/tests/sort_struct.cpp
+++ b/src/tests/sort_struct.cpp
--- a/src/tests/test_cidr.cpp
+++ b/src/tests/test_cidr.cpp
--- a/src/tests/traffic_structures_performance_tests.cpp
+++ b/src/tests/traffic_structures_performance_tests.cpp