Update default timeout and scan values

The changes update default parameter values in constants.h and centralize them there instead of having hard-coded values scattered across the codebase. I'd write:

Update default values and fix memory leaks

This commit:
- Centralizes default parameter values in constants.h
- Fixes memory leaks in scan methods and JSON handling
- Updates ping loop retry logic
- Improves thread index access in scanning module
- Adds more future features to docs

Author: Alfredsson418

CONTRIBUTING.md

@@ -18,7 +18,7 @@
 </ol>
 
 <h1 id="how-to-contribute">How to find someting to contribute</h1>
-<p>Head over to the <a href="https://github.com/Alfredsson418/hawkeyes/issues">Issues</a> tab and find something you can help with!
+<p>Head over to the <a href="https://github.com/Alfredsson418/hawkeyes/issues">Issues</a> tab or <a href="docs/FUTURE_IDEAS.md">FUTURE_IDEAS.md</a> and find something you can help with!
 You could also create your own Issues with the given templates. <b>Just make sure that you get the go-ahead on the issue before creating your pull request</b>.</p>
 
 <h1>Coding format</h1>

data/version/pre-commit

@@ -2,6 +2,8 @@
 
 # Add this file to ./git/hooks/ to auto increase the version number pre commit
 
+
+echo "Updating patch"
 ./data/version/increase.sh 0 0 1
 
 # Because he files change, we need to add it again before the commit

docs/FUTURE_IDEAS.md

@@ -1,5 +1,9 @@
 # Future implementetion ideas
 - Mobile network support
-- Target enumeration
+- Target enumeration (Network discovery)
   - Hostname
   - MAC Adress
+  - etc
+- Test cases
+- Install script
+- Convert port files to json format

docs/USAGE.md

@@ -147,25 +147,6 @@ This works mostly on older firewalls because modern firewalls will not responde
 </table>
 
 
-<h2>Timeout</h2>
-<table>
-    <tr>
-      <th>Short Option</th>
-      <th>Long Option</th>
-      <th>Description</th>
-      <th>Default Value</th>
-      <th>Possible values</th>
-    </tr>
-    <tr>
-      <td>-w TIME</td>
-      <td>--timeout TIME</td>
-      <td>This is the time (in SECONDS) before a port is declared as closed.</td>
-      <td>3 seconds</td>
-      <td>Any positive integer between 0 and MAX_INT</td>
-    </tr>
-</table>
-
-
 <h2>Workers</h2>
 <table>
     <tr>

include/constans.h

@@ -1,5 +1,22 @@
 #pragma once
 
+/*
+	================================
+		DEFAULT PARAMETER VALUES
+	================================
+*/
+
+#define DEFAULT_TIMEOUT		   3
+#define DEFAULT_NO_PING		   false
+#define DEFAULT_THREAD_WORKERS 3
+#define DEFAULT_PORT_INTERVAL  "1-1000"
+
+/*
+	================================
+		DEFAULT PROGRAM VALUES
+	================================
+*/
+
 #define RESULT_PORT_LEN	   10 // 65535 + /tcp or /udp or other
 #define RESULT_SERVICE_LEN PORT_SERVICE_LEN
 #define RESULT_METHOD_LEN  20

include/other/ip/range.h

@@ -23,9 +23,10 @@ int main(int argc, char *argv[]) {
 	memset(arguments.interface, '\0', INTERFACE_LEN);
 	memset(arguments.ports_format, '\0', PORTS_FORMAT_LEN);
 	memset(&arguments.scan_info, 0, sizeof(scan_func_t));
-	arguments.timeout		 = 3;
-	arguments.no_ping		 = false;
-	arguments.thread_workers = 3;
+	arguments.timeout		 = DEFAULT_TIMEOUT;
+	arguments.no_ping		 = DEFAULT_NO_PING;
+	arguments.thread_workers = DEFAULT_THREAD_WORKERS;
+	strncpy(arguments.ports_format, DEFAULT_PORT_INTERVAL, PORTS_FORMAT_LEN);
 
 	unsigned short closed_ports		  = 0;
 	unsigned short error_ports		  = 0;
@@ -104,17 +105,11 @@ int main(int argc, char *argv[]) {
 
 	VERBOSE_MESSAGE("Network interface: %s\n", interface.name);
 
-	if (arguments.ports_format[0] == '\0') {
-		strncpy(arguments.ports_format, "1-1000", INTERFACE_LEN);
-		VERBOSE_MESSAGE("Port range was not set, using default %s \n",
-						arguments.ports_format);
-	}
-
 	/*
 		===========================================================
 	*/
 	unsigned short *ports;
-	unsigned int	port_len = parse_ports(arguments.ports_format, &(ports));
+	unsigned int	port_len = parse_ports(arguments.ports_format, &ports);
 	if (port_len == 0) {
 		ERR_PRINT("Failed to parse ports\n");
 		return -1;

src/hawkeyes.c

@@ -1,9 +1,10 @@
 #include "../../include/other/network_interface.h"
 
 int _ping(struct ifaddrs *ifa, struct sockaddr_storage ip_addr) {
+	int tries = 2;
 	int respone;
 	VERBOSE_MESSAGE("PING REQUEST: Trying on '%s': ", ifa->ifa_name);
-	for (int i = 1; i <= 2; i++) {
+	for (int i = 0; i < tries; i++) {
 		respone = ping(ip_addr, ifa->ifa_name);
 		if (respone > 0) {
 			VERBOSE_MESSAGE("SUCCESSFULL\n");

src/other/ip/range.c

@@ -98,11 +98,13 @@ net_packet *next_best_packet(next_best_args *in_args) {
 	// Start scanning for matching packages
 	pcap_dispatch(package_handle, 1, (pcap_handler)loop_back,
 				  (unsigned char *)return_arg);
-	pcap_close(package_handle);
 
 	pthread_cancel(thread_id);
 	// This it to make sure the "sleep" thread exists as expected
 	// pthread_join(thread_id, NULL);
 
+	pcap_freecode(&pcap_filter);
+	pcap_close(package_handle);
+
 	return return_arg;
 }