Add clang-format

Author: seladb

.clang-format

@@ -0,0 +1,2 @@
+BasedOnStyle: llvm
+IndentWidth: 4

.github/workflows/builtAndTest.yml

@@ -9,7 +9,7 @@ env:
   PCAPPLUSPLUS_LATEST_VERSION: 24.09
 
 jobs:
-  build-and-test:
+  build-and-test-client:
     strategy:
       matrix:
         api-level: [30, 35]
@@ -111,3 +111,18 @@ jobs:
           cd server/linux
           cmake -S . -B build
           cmake --build build
+
+  cpp-lint-format:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          submodules: true
+
+      - name: Run clang-format
+        uses: jidicula/clang-format-action@v4.14.0
+        with:
+          clang-format-version: "19"
+          exclude-regex: "(^|/)(app/libs|server/linux/libs)/"

app/src/main/cpp/PacketAnalyzer.cpp

@@ -1,34 +1,37 @@
-#include <jni.h>
-#include <RawPacket.h>
 #include <DnsLayer.h>
-#include <SSLLayer.h>
-#include <PacketUtils.h>
 #include <Packet.h>
+#include <PacketUtils.h>
+#include <RawPacket.h>
+#include <SSLLayer.h>
+#include <android/log.h>
+#include <iomanip>
 #include <iostream>
-#include <vector>
-#include <string>
+#include <jni.h>
 #include <sstream>
-#include <iomanip>
-#include <android/log.h>
+#include <string>
+#include <vector>
 
 #define LOG_TAG "ToyVpnNativeCode"
 
 #define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
 
-void analyzeDnsPacket(const pcpp::Packet& packet, std::ostringstream& jsonStream) {
+void analyzeDnsPacket(const pcpp::Packet &packet,
+                      std::ostringstream &jsonStream) {
     auto dnsLayer = packet.getLayerOfType<pcpp::DnsLayer>();
 
     if (dnsLayer == nullptr) {
         return;
     }
 
-    if (dnsLayer->getDnsHeader()->queryOrResponse == 0 && dnsLayer->getQueryCount() > 0) {
+    if (dnsLayer->getDnsHeader()->queryOrResponse == 0 &&
+        dnsLayer->getQueryCount() > 0) {
         auto dnsQuery = dnsLayer->getFirstQuery();
         jsonStream << R"("dnsQuery":")" << dnsQuery->getName() << "\",";
     }
 }
 
-void analyzeTlsPacket(const pcpp::Packet& packet, std::ostringstream& jsonStream) {
+void analyzeTlsPacket(const pcpp::Packet &packet,
+                      std::ostringstream &jsonStream) {
     auto tlsLayer = packet.getLayerOfType<pcpp::SSLLayer>();
 
     if (tlsLayer == nullptr) {
@@ -39,55 +42,62 @@ void analyzeTlsPacket(const pcpp::Packet& packet, std::ostringstream& jsonStream
         return;
     }
 
-    auto handshakeLayer = dynamic_cast<pcpp::SSLHandshakeLayer*>(tlsLayer);
+    auto handshakeLayer = dynamic_cast<pcpp::SSLHandshakeLayer *>(tlsLayer);
     if (handshakeLayer == nullptr) {
         return;
     }
 
     auto clientHelloMessage =
-            handshakeLayer->getHandshakeMessageOfType<pcpp::SSLClientHelloMessage>();
+        handshakeLayer
+            ->getHandshakeMessageOfType<pcpp::SSLClientHelloMessage>();
 
-    if (clientHelloMessage != nullptr)
-    {
+    if (clientHelloMessage != nullptr) {
         auto sniExt =
-                clientHelloMessage->getExtensionOfType<pcpp::SSLServerNameIndicationExtension>();
+            clientHelloMessage
+                ->getExtensionOfType<pcpp::SSLServerNameIndicationExtension>();
         if (sniExt != nullptr) {
-            jsonStream << R"("tlsServerName":")" << sniExt->getHostName() << "\",";
+            jsonStream << R"("tlsServerName":")" << sniExt->getHostName()
+                       << "\",";
         }
     }
 
     auto serverHelloMessage =
-        handshakeLayer->getHandshakeMessageOfType<pcpp::SSLServerHelloMessage>();
+        handshakeLayer
+            ->getHandshakeMessageOfType<pcpp::SSLServerHelloMessage>();
 
-    if (serverHelloMessage != nullptr)
-    {
-        jsonStream << "\"tlsVersion\":" << serverHelloMessage->getHandshakeVersion().asUInt() << ",";
+    if (serverHelloMessage != nullptr) {
+        jsonStream << "\"tlsVersion\":"
+                   << serverHelloMessage->getHandshakeVersion().asUInt() << ",";
     }
 }
 
 extern "C" {
 JNIEXPORT jbyteArray JNICALL
-Java_com_pcapplusplus_toyvpn_pcapplusplus_PcapPlusPlusInterface_analyzePacketNative(JNIEnv *env, jobject obj, jbyteArray packetData) {
+Java_com_pcapplusplus_toyvpn_pcapplusplus_PcapPlusPlusInterface_analyzePacketNative(
+    JNIEnv *env, jobject obj, jbyteArray packetData) {
     jsize length = env->GetArrayLength(packetData);
     jbyte *rawPacketData = env->GetByteArrayElements(packetData, nullptr);
 
     std::vector<uint8_t> packetVector(rawPacketData, rawPacketData + length);
 
-    // TODO: Check if there's a better way to get the time now and convert to timespec
+    // TODO: Check if there's a better way to get the time now and convert to
+    // timespec
     auto now = std::chrono::system_clock::now();
     auto duration = now.time_since_epoch();
     auto seconds = std::chrono::duration_cast<std::chrono::seconds>(duration);
-    auto nanoseconds = std::chrono::duration_cast<std::chrono::nanoseconds>(duration) - seconds;
+    auto nanoseconds =
+        std::chrono::duration_cast<std::chrono::nanoseconds>(duration) -
+        seconds;
     struct timespec ts{};
     ts.tv_sec = seconds.count();
     ts.tv_nsec = nanoseconds.count();
 
-    pcpp::RawPacket rawPacket(packetVector.data(), packetVector.size(), ts, false,
-                              pcpp::LINKTYPE_DLT_RAW1);
+    pcpp::RawPacket rawPacket(packetVector.data(), packetVector.size(), ts,
+                              false, pcpp::LINKTYPE_DLT_RAW1);
 
     pcpp::Packet packet(&rawPacket);
 
-//    LOGW("%s", packet.toString().c_str());
+    //    LOGW("%s", packet.toString().c_str());
 
     std::ostringstream jsonStream;
     jsonStream << "{";
@@ -135,7 +145,9 @@ Java_com_pcapplusplus_toyvpn_pcapplusplus_PcapPlusPlusInterface_analyzePacketNat
 
     jbyteArray result = env->NewByteArray(jsonString.length());
 
-    env->SetByteArrayRegion(result, 0, jsonString.length(), reinterpret_cast<const jbyte*>(jsonString.c_str()));
+    env->SetByteArrayRegion(
+        result, 0, jsonString.length(),
+        reinterpret_cast<const jbyte *>(jsonString.c_str()));
 
     env->ReleaseByteArrayElements(packetData, rawPacketData, 0);