Merge branch 'master' into tests

Author: aymaneelmaini

.clang-format

@@ -0,0 +1,17 @@
+BasedOnStyle: LLVM
+IndentWidth: 4
+TabWidth: 4
+UseTab: Never
+ColumnLimit: 0
+AllowShortIfStatementsOnASingleLine: false
+BreakBeforeBraces: Allman
+SpacesInParentheses: false
+SpaceAfterCStyleCast: true
+SpaceBeforeParens: ControlStatements
+PointerAlignment: Left
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: true
+SortIncludes: true
+IncludeBlocks: Preserve
+Cpp11BracedListStyle: true
+Standard: Cpp11

include/Common.h

@@ -2,10 +2,12 @@
 #define COMMON_H
 
 #include <string>
+using namespace std;
 
-struct PortResult {
-  int port;
-  std::string service;
+struct PortResult
+{
+    int    port;
+    string service;
 };
 
 #define START_PORT 1

include/Printer.h

@@ -6,17 +6,19 @@
 
 using namespace std;
 
-struct UserInput {
-  string ip;
-  int start_port;
-  int end_port;
+struct UserInput
+{
+    string ip;
+    int    start_port;
+    int    end_port;
 };
 
-class Printer {
- public:
-  static int getTerminalWidth();
-  static void printCentered(const vector<string>& art, int terminalWidth);
-  static void printHeader();
-  static void clearScreen();
+class Printer
+{
+  public:
+    static int  getTerminalWidth();
+    static void printCentered(const vector<string>& art, int terminalWidth);
+    static void printHeader();
+    static void clearScreen();
 };
-#endif  // !PRINTER_H
+#endif // !PRINTER_H

include/Scanner.h

@@ -9,20 +9,21 @@
 
 using namespace std;
 
-class Scanner {
- public:
-  // constructor
-  Scanner(std::string ip, int threads);
-  void scanRange(int start, int end);
-  std::vector<PortResult> getResults();
+class Scanner
+{
+  public:
+    // constructor
+    Scanner(string ip, int threads);
+    void                    scanRange(int start, int end);
+    std::vector<PortResult> getResults();
 
- private:
-  void scanPort(int port);
+  private:
+    void scanPort(int port);
 
-  std::string target_ip;
-  int max_threads;
-  std::vector<PortResult> results;
-  std::mutex result_mutex;
+    string             target_ip;
+    int                max_threads;
+    vector<PortResult> results;
+    mutex              result_mutex;
 };
 
 #endif

src/Printer.cpp

@@ -8,54 +8,61 @@
 
 using namespace std;
 
-int Printer::getTerminalWidth() {
-  // Instantiate a window size struct
-  struct winsize w;
-  // Setting some magic numbers for file descriptor and request. and passing the window size struct
-  ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
-  // Returning the width columns
-  return w.ws_col;
+int Printer::getTerminalWidth()
+{
+    // Instantiate a window size struct
+    struct winsize w;
+    // Setting some magic numbers for file descriptor and request. and passing the window size struct
+    ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
+    // Returning the width columns
+    return w.ws_col;
 }
 
-void Printer::clearScreen() {
-  // \033[2J clears the screen, \033[H moves cursor to top
-  std::cout << "\033[2J\033[H";
+void Printer::clearScreen()
+{
+    // \033[2J clears the screen, \033[H moves cursor to top
+    std::cout << "\033[2J\033[H";
 }
 
-void Printer::printHeader() {
-  Printer::clearScreen();
-
-  std::vector<std::string> myArt = {
-      "****************************************************",
-      "*              ╻ ╻┏━┓   ┏━┓┏━╸┏━┓┏┓╻               *",
-      "*              ┏╋┛┣━┛   ┗━┓┃  ┣━┫┃┗┫               *",
-      "*              ╹ ╹╹     ┗━┛┗━╸╹ ╹╹ ╹               *",
-      "*   --------------------------------------------   *",
-      "*   01101000 01110101 01101101 01100001 01101110   *",
-      "*   --------------------------------------------   *",
-      "****************************************************\n\n",
-  };
-
-  int width = Printer::getTerminalWidth();
-  Printer::printCentered(myArt, width);
+void Printer::printHeader()
+{
+    Printer::clearScreen();
+
+    std::vector<std::string> myArt = {
+        "****************************************************",
+        "*              ╻ ╻┏━┓   ┏━┓┏━╸┏━┓┏┓╻               *",
+        "*              ┏╋┛┣━┛   ┗━┓┃  ┣━┫┃┗┫               *",
+        "*              ╹ ╹╹     ┗━┛┗━╸╹ ╹╹ ╹               *",
+        "*   --------------------------------------------   *",
+        "*   01101000 01110101 01101101 01100001 01101110   *",
+        "*   --------------------------------------------   *",
+        "****************************************************\n\n",
+    };
+
+    int width = Printer::getTerminalWidth();
+    Printer::printCentered(myArt, width);
 }
 
-void Printer::printCentered(const vector<string>& art, int terminalWidth) {
-  size_t maxWidth = 0;
-  const std::string COLOR = "\033[33m";
-  const std::string RESET = "\033[0m";
+void Printer::printCentered(const vector<string>& art, int terminalWidth)
+{
+    size_t            maxWidth = 0;
+    const std::string COLOR    = "\033[33m";
+    const std::string RESET    = "\033[0m";
 
-  // Step 1: Find the widest line in the art
-  for (const std::string& line : art) {
-    maxWidth = std::max(maxWidth, line.length());
-  }
+    // Step 1: Find the widest line in the art
+    for (const std::string& line : art)
+    {
+        maxWidth = std::max(maxWidth, line.length());
+    }
 
-  // Step 2: Calculate padding based on the widest line
-  int padding = (terminalWidth - (int)maxWidth) / 2;
-  if (padding < 0) padding = 0;  // Prevent errors if terminal is too narrow
+    // Step 2: Calculate padding based on the widest line
+    int padding = (terminalWidth - (int) maxWidth) / 2;
+    if (padding < 0)
+        padding = 0; // Prevent errors if terminal is too narrow
 
-  // Step 3: Print every line using the SAME padding
-  for (const std::string& line : art) {
-    std::cout << std::string(padding, ' ') << COLOR << line << RESET << std::endl;
-  }
+    // Step 3: Print every line using the SAME padding
+    for (const std::string& line : art)
+    {
+        std::cout << std::string(padding, ' ') << COLOR << line << RESET << std::endl;
+    }
 }

src/Scanner.cpp

@@ -11,62 +11,71 @@
 
 Scanner::Scanner(std::string ip, int threads) : target_ip(ip), max_threads(threads) {}
 
-void Scanner::scanPort(int port) {
-  int sock = socket(AF_INET, SOCK_STREAM, 0);
-  if (sock < 0) return;
+void Scanner::scanPort(int port)
+{
+    int sock = socket(AF_INET, SOCK_STREAM, 0);
+    if (sock < 0)
+        return;
 
-  // Set to Non-Blocking mode
-  fcntl(sock, F_SETFL, O_NONBLOCK);
+    // Set to Non-Blocking mode
+    fcntl(sock, F_SETFL, O_NONBLOCK);
 
-  struct sockaddr_in addr;
-  addr.sin_family = AF_INET;
-  addr.sin_port = htons(port);
-  inet_pton(AF_INET, target_ip.c_str(), &addr.sin_addr);
+    struct sockaddr_in addr;
+    addr.sin_family = AF_INET;
+    addr.sin_port   = htons(port);
+    inet_pton(AF_INET, target_ip.c_str(), &addr.sin_addr);
 
-  // In a non blocking context, the return of connect() is neglicted
-  // In this case stored to a variable to avoid unexpected behavior
-  int connect_output = connect(sock, (struct sockaddr*)&addr, sizeof(addr));
+    // In a non blocking context, the return of connect() is neglicted
+    // In this case stored to a variable to avoid unexpected behavior
+    int connect_output = connect(sock, (struct sockaddr*) &addr, sizeof(addr));
 
-  // Use select to wait exactly 500ms
-  fd_set fdset;
-  FD_ZERO(&fdset);
-  FD_SET(sock, &fdset);
-  struct timeval tv;
-  tv.tv_sec = 0;
-  // 500ms timeout
-  tv.tv_usec = 500000;
+    // Use select to wait exactly 500ms
+    fd_set fdset;
+    FD_ZERO(&fdset);
+    FD_SET(sock, &fdset);
+    struct timeval tv;
+    tv.tv_sec = 0;
+    // 500ms timeout
+    tv.tv_usec = 500000;
 
-  if (select(sock + 1, NULL, &fdset, NULL, &tv) == 1) {
-    int so_error;
-    socklen_t len = sizeof(so_error);
-    getsockopt(sock, SOL_SOCKET, SO_ERROR, &so_error, &len);
+    if (select(sock + 1, NULL, &fdset, NULL, &tv) == 1)
+    {
+        int       so_error;
+        socklen_t len = sizeof(so_error);
+        getsockopt(sock, SOL_SOCKET, SO_ERROR, &so_error, &len);
 
-    if (so_error == 0) {
-      struct servent* serv = getservbyport(htons(port), "tcp");
-      std::string s_name = (serv) ? serv->s_name : "unknown";
+        if (so_error == 0)
+        {
+            struct servent* serv   = getservbyport(htons(port), "tcp");
+            std::string     s_name = (serv) ? serv->s_name : "unknown";
 
-      std::lock_guard<std::mutex> lock(result_mutex);
-      results.push_back({port, s_name});
-      std::cout << "\r\033[K\033[32m[+] Port " << port << " OPEN (" << s_name << ")\033[0m" << std::endl;
+            std::lock_guard<std::mutex> lock(result_mutex);
+            results.push_back({port, s_name});
+            std::cout << "\r\033[K\033[32m[+] Port " << port << " OPEN (" << s_name << ")\033[0m" << std::endl;
+        }
     }
-  }
-  close(sock);
+    close(sock);
 }
 
-void Scanner::scanRange(int start, int end) {
-  std::vector<std::thread> pool;
-  for (int p = start; p <= end; ++p) {
-    pool.emplace_back(&Scanner::scanPort, this, p);
+void Scanner::scanRange(int start, int end)
+{
+    std::vector<std::thread> pool;
+    for (int p = start; p <= end; ++p)
+    {
+        pool.emplace_back(&Scanner::scanPort, this, p);
 
-    if (pool.size() >= max_threads) {
-      for (auto& t : pool)
-        if (t.joinable()) t.join();
-      pool.clear();
-      std::cout << "\r\033[33m[*] Scanning: " << p << "/" << end << "...\033[0m" << std::flush;
+        if (pool.size() >= max_threads)
+        {
+            for (auto& t : pool)
+                if (t.joinable())
+                    t.join();
+            pool.clear();
+            std::cout << "\r\033[33m[*] Scanning: " << p << "/" << end << "...\033[0m" << std::flush;
+        }
     }
-  }
-  for (auto& t : pool)
-    if (t.joinable()) t.join();
+    for (auto& t : pool)
+        if (t.joinable())
+            t.join();
 }
 
 std::vector<PortResult> Scanner::getResults() { return results; }