Merge pull request #659 from bdrung/master

Fix typo programm -> program

docs/MANUAL_INSTALL.md

@@ -68,7 +68,7 @@ echo "/opt/pf_ring/lib" > /etc/ld.so.conf.d/pf_ring.conf
 ldconfig -v
 ```
 
-It's REQUIRED to add all your networks in CIDR form to file /etc/networks_list if form when one subnet on one line. Please aggregate your networks because long networks list will significatly slow down programm. And please change REDIS_SUPPORT = yes to no in Makefile if you do not need traffic counting feature. When you running this software in OpenVZ node you may did not specify networks explicitly, we can read it from file /proc/vz/veip.
+It's REQUIRED to add all your networks in CIDR form to file /etc/networks_list if form when one subnet on one line. Please aggregate your networks because long networks list will significatly slow down program. And please change REDIS_SUPPORT = yes to no in Makefile if you do not need traffic counting feature. When you running this software in OpenVZ node you may did not specify networks explicitly, we can read it from file /proc/vz/veip.
 
 You can add whitelist subnets in similar form to /etc/networks_whitelist (CIDR masks too).
 
@@ -82,12 +82,12 @@ Start it:
 ./fastnetmon eth1,eth2
 ```
 
-Enable programm start on server startup, please add to /etc/rc.local this lines:
+Enable program start on server startup, please add to /etc/rc.local this lines:
 ```bash
 screen -S fastnetmon -d -m /root/fastnetmon/fastnetmon
 ```
 
-When incoming or outgoing attack arrives programm call bash script (when it exists): /usr/local/bin/notify_about_attack.sh two times. First time when threshold exceed (at this step we know IP, direction and power of attack). Second when we collect 100 packets for detailed audit what did happens.
+When incoming or outgoing attack arrives program call bash script (when it exists): /usr/local/bin/notify_about_attack.sh two times. First time when threshold exceed (at this step we know IP, direction and power of attack). Second when we collect 100 packets for detailed audit what did happens.
 
 
 ==Command Line Reference 

src/afpacket_plugin/afpacket_collector.cpp

@@ -43,10 +43,10 @@
 #include <linux/if_packet.h>
 #include <net/ethernet.h> /* the L2 protocols */
 
-// Get log4cpp logger from main programm
+// Get log4cpp logger from main program
 extern log4cpp::Category& logger;
 
-// Pass unparsed packets number to main programm
+// Pass unparsed packets number to main program
 extern uint64_t total_unparsed_packets;
 
 // Global configuration map

src/example_plugin/example_collector.cpp

@@ -22,7 +22,7 @@
 
 #include "example_collector.h"
 
-// Get log4cpp logger from main programm
+// Get log4cpp logger from main program
 extern log4cpp::Category& logger;
 
 // Global configuration map

src/fastnetmon.cpp

@@ -315,7 +315,7 @@ bool print_average_traffic_counts = true;
 // Key used for sorting clients in output.  Allowed sort params: packets/bytes/flows
 std::string sort_parameter = "packets";
 
-// Number of lines in programm output
+// Number of lines in program output
 unsigned int max_ips_in_list = 7;
 
 // Number of lines for sending ben attack details to email
@@ -458,7 +458,7 @@ std::string print_ddos_attack_details();
 void recalculate_speed();
 std::string print_channel_speed(std::string traffic_type, direction packet_direction);
 void process_packet(simple_packet& current_packet);
-void traffic_draw_programm();
+void traffic_draw_program();
 void interruption_signal_handler(int signal_number);
 
 #ifdef FASTNETMON_API
@@ -625,7 +625,7 @@ void sigpipe_handler_for_popen(int signo) {
 bool exec_with_stdin_params(std::string cmd, std::string params) {
     FILE* pipe = popen(cmd.c_str(), "w");
     if (!pipe) {
-        logger << log4cpp::Priority::ERROR << "Can't execute programm " << cmd
+        logger << log4cpp::Priority::ERROR << "Can't execute program " << cmd
                << " error code: " << errno << " error text: " << strerror(errno);
         return false;
     }
@@ -636,7 +636,7 @@ bool exec_with_stdin_params(std::string cmd, std::string params) {
         pclose(pipe);
         return true;
     } else {
-        logger << log4cpp::Priority::ERROR << "Can't pass data to stdin of programm " << cmd;
+        logger << log4cpp::Priority::ERROR << "Can't pass data to stdin of program " << cmd;
         pclose(pipe);
         return false;
     }
@@ -2051,7 +2051,7 @@ void screen_draw_thread() {
         // Available only from boost 1.54: boost::this_thread::sleep_for(
         // boost::chrono::seconds(check_period) );
         boost::this_thread::sleep(boost::posix_time::seconds(check_period));
-        traffic_draw_programm();
+        traffic_draw_program();
     }
 }
 
@@ -2107,7 +2107,7 @@ void recalculate_speed() {
     double time_difference = difftime(start_time, last_call_of_traffic_recalculation);
 
     if (time_difference < 1) {
-        // It could occur on programm start
+        // It could occur on program start
         logger << log4cpp::Priority::INFO
                << "We skip one iteration of speed_calc because it runs so early!";
         return;
@@ -2313,11 +2313,11 @@ void print_screen_contents_into_file(std::string screen_data_stats_param) {
         screen_data_file << screen_data_stats_param;
         screen_data_file.close();
     } else {
-        logger << log4cpp::Priority::ERROR << "Can't print programm screen into file";
+        logger << log4cpp::Priority::ERROR << "Can't print program screen into file";
     }
 }
 
-void traffic_draw_programm() {
+void traffic_draw_program() {
     std::stringstream output_buffer;
 
     // logger<<log4cpp::Priority::INFO<<"Draw table call";
@@ -2550,7 +2550,7 @@ int do_fork() {
         break;
     default:
         // We should close master process with _exit(0)
-        // We should not call exit() because it will destroy all global variables for programm
+        // We should not call exit() because it will destroy all global variables for program
         _exit(0);
     }
 
@@ -2865,7 +2865,7 @@ void free_up_all_resources() {
     Destroy_Patricia(whitelist_tree_ipv6, (void_fn_t)0);
 }
 
-// For correct programm shutdown by CTRL+C
+// For correct program shutdown by CTRL+C
 void interruption_signal_handler(int signal_number) {
      
     logger << log4cpp::Priority::INFO << "SIGNAL captured, prepare toolkit shutdown";
@@ -3755,7 +3755,7 @@ void produce_dpi_dump_for_pcap_dump(std::string pcap_file_path, std::stringstrea
             - and maybe some protocol/port based statistics could be used to filter new/unknown attacks...
         */
 
-        logger << log4cpp::Priority::ERROR << "We can't detect attack type with DPI it's not so criticial, only for your information";
+        logger << log4cpp::Priority::ERROR << "We can't detect attack type with DPI. It's not so critical, only for your information";
     }
 }
 

src/fastnetmon_actions.h

@@ -9,7 +9,7 @@
 
 #include "fast_library.h"
 
-// Get log4cpp logger from main programm
+// Get log4cpp logger from main program
 extern log4cpp::Category& logger;
 
 // Global configuration map

src/netflow_plugin/netflow_collector.cpp

@@ -38,7 +38,7 @@ bool lua_hooks_enabled = false;
 std::string lua_hooks_path = "/usr/src/fastnetmon/src/netflow_hooks.lua";
 #endif
 
-// Get it from main programm
+// Get it from main program
 extern log4cpp::Category& logger;
 
 // Global configuration map

src/netmap_plugin/netmap_collector.cpp

@@ -62,10 +62,10 @@ uint32_t netmap_sampling_ratio = 1;
 void netmap_thread(struct nm_desc* netmap_descriptor, int netmap_thread);
 void consume_pkt(u_char* buffer, int len, int thread_number);
 
-// Get log4cpp logger from main programm
+// Get log4cpp logger from main program
 extern log4cpp::Category& logger;
 
-// Pass unparsed packets number to main programm
+// Pass unparsed packets number to main program
 extern uint64_t total_unparsed_packets;
 
 // Global configuration map

src/pfring_plugin/pfring_collector.cpp

@@ -37,7 +37,7 @@
 
 uint32_t pfring_sampling_ratio = 1; 
 
-// Get log4cpp logger from main programm
+// Get log4cpp logger from main program
 extern log4cpp::Category& logger;
 
 extern uint64_t total_unparsed_packets;
@@ -286,7 +286,7 @@ void pfring_main_packet_process_task() {
 
     if (!pf_ring_init_result) {
         // Internal error in PF_RING
-        logger << log4cpp::Priority::ERROR << "PF_RING initilization failed, exit from programm";
+        logger << log4cpp::Priority::ERROR << "PF_RING initilization failed, exit from program";
         exit(1);
     }
 }
@@ -739,7 +739,7 @@ bool pf_ring_main_loop(const char* dev) {
 
     if (pfring_set_application_name_result != 0) {
         logger << log4cpp::Priority::ERROR
-               << "Can't set programm name for PF_RING: pfring_set_application_name";
+               << "Can't set program name for PF_RING: pfring_set_application_name";
     }
 
     pfring_version(pf_ring_descr, &version);

src/sflow_plugin/sflow_collector.cpp

@@ -46,7 +46,7 @@ std::string sflow_lua_hooks_path = "/usr/src/fastnetmon/src/sflow_hooks.lua";
 std::string plugin_name = "sflow";
 std::string plugin_log_prefix = plugin_name + ": ";
 
-// Get logger from main programm
+// Get logger from main program
 extern log4cpp::Category& logger;
 
 // Global configuration map

src/snabbswitch_plugin/snabbswitch_collector.cpp

@@ -44,10 +44,10 @@ int start_snabb_switch(int snabb_argc, const char **snabb_argv);
 }
 #endif
 
-// Get log4cpp logger from main programm
+// Get log4cpp logger from main program
 extern log4cpp::Category& logger;
 
-// Pass unparsed packets number to main programm
+// Pass unparsed packets number to main program
 extern uint64_t total_unparsed_packets;
 
 // Global configuration map

src/tests/patch_for_libcuckoo_as_flow_tracking_structure.patch

@@ -26,7 +26,7 @@ index 5308244..cd9e9dc 100644
 --- a/src/fastnetmon.cpp
 +++ b/src/fastnetmon.cpp
 @@ -268,6 +268,8 @@ void process_packet(simple_packet& current_packet);
- void traffic_draw_programm();
+ void traffic_draw_program();
  void interruption_signal_handler(int signal_number);
  
 +cuckoohash_map<std::string, map_element, CityHasher<std::string> > flow_tracking_table_new_generation;

src/tests/pfring_parser_zc_issue.c

@@ -59,7 +59,7 @@ int main() {
     pfring_set_application_name(pf_ring_descr, (char*)"fastnetmon");
 
     if (pfring_set_application_name_result != 0) {
-        std::cout << "Can't set programm name for PF_RING: pfring_set_application_name";
+        std::cout << "Can't set program name for PF_RING: pfring_set_application_name";
     }
 
     pfring_version(pf_ring_descr, &version);