Refactor: Fixed coding style in QUIC and TLS process plugins, parsers

Author: hynekkar

process/quic.cpp

@@ -42,22 +42,25 @@
  */
 
 #ifdef WITH_NEMEA
-#include <unirec/unirec.h>
+# include <unirec/unirec.h>
 #endif
 
 
 #include "quic.hpp"
 
 namespace ipxp {
-
 int RecordExtQUIC::REGISTERED_ID = -1;
 
 __attribute__((constructor)) static void register_this_plugin()
 {
-   static PluginRecord rec = PluginRecord("quic", [](){return new QUICPlugin();});
+   static PluginRecord rec = PluginRecord("quic", [](){
+         return new QUICPlugin();
+      });
+
    register_plugin(&rec);
    RecordExtQUIC::REGISTERED_ID = register_extension();
 }
+
 QUICPlugin::QUICPlugin()
 {
    quic_ptr = nullptr;
@@ -69,8 +72,7 @@ QUICPlugin::~QUICPlugin()
 }
 
 void QUICPlugin::init(const char *params)
-{
-}
+{ }
 
 void QUICPlugin::close()
 {
@@ -87,15 +89,11 @@ ProcessPlugin *QUICPlugin::copy()
 
 bool QUICPlugin::process_quic(RecordExtQUIC *quic_data, const Packet &pkt)
 {
-   
    QUICParser process_quic;
 
-   if (!process_quic.quic_start(pkt))
-   {
+   if (!process_quic.quic_start(pkt)) {
       return false;
-   }
-   else
-   {
+   } else   {
       process_quic.quic_get_sni(quic_data->sni);
       process_quic.quic_get_user_agent(quic_data->user_agent);
       process_quic.quic_get_version(quic_data->quic_version);
@@ -104,7 +102,7 @@ bool QUICPlugin::process_quic(RecordExtQUIC *quic_data, const Packet &pkt)
 } // QUICPlugin::process_quic
 
 int QUICPlugin::pre_create(Packet &pkt)
-{  
+{
    return 0;
 }
 
@@ -150,5 +148,4 @@ void QUICPlugin::finish(bool print_stats)
       std::cout << "   Parsed SNI: " << parsed_initial << std::endl;
    }
 }
-
 }

process/quic.hpp

@@ -45,9 +45,8 @@
 #define IPXP_PROCESS_QUIC_HPP
 
 
-
 #ifdef WITH_NEMEA
-#include "fields.h"
+# include "fields.h"
 #endif
 
 
@@ -58,7 +57,6 @@
 
 
 namespace ipxp {
-
 #define QUIC_UNIREC_TEMPLATE "QUIC_SNI,QUIC_USER_AGENT,QUIC_VERSION"
 UR_FIELDS(
    string QUIC_SNI,
@@ -71,15 +69,15 @@ UR_FIELDS(
  */
 struct RecordExtQUIC : public RecordExt {
    static int REGISTERED_ID;
-   char sni[BUFF_SIZE]  = { 0 };
-   char user_agent[BUFF_SIZE]  = { 0 };
-   uint32_t quic_version;
+   char       sni[BUFF_SIZE]        = { 0 };
+   char       user_agent[BUFF_SIZE] = { 0 };
+   uint32_t   quic_version;
 
    RecordExtQUIC() : RecordExt(REGISTERED_ID)
    {
-      sni[0] = 0;
+      sni[0]        = 0;
       user_agent[0] = 0;
-      quic_version = 0;
+      quic_version  = 0;
    }
 
    #ifdef WITH_NEMEA
@@ -94,22 +92,23 @@ struct RecordExtQUIC : public RecordExt {
    {
       return QUIC_UNIREC_TEMPLATE;
    }
-   #endif
+
+   #endif // ifdef WITH_NEMEA
 
    virtual int fill_ipfix(uint8_t *buffer, int size)
    {
-      uint16_t len_sni = strlen(sni);
+      uint16_t len_sni        = strlen(sni);
       uint16_t len_user_agent = strlen(user_agent);
-      uint16_t len_version = sizeof(quic_version);
+      uint16_t len_version    = sizeof(quic_version);
       int pos = 0;
 
       if ((len_sni + 3) + (len_user_agent + 3) + len_version > size) {
          return -1;
       }
 
-      pos += variable2ipfix_buffer(buffer + pos, (uint8_t*) sni, len_sni);
-      pos += variable2ipfix_buffer(buffer + pos, (uint8_t*) user_agent, len_user_agent);
-      *(uint32_t *)(buffer + pos) = htonl(quic_version);
+      pos += variable2ipfix_buffer(buffer + pos, (uint8_t *) sni, len_sni);
+      pos += variable2ipfix_buffer(buffer + pos, (uint8_t *) user_agent, len_user_agent);
+      *(uint32_t *) (buffer + pos) = htonl(quic_version);
       pos += len_version;
       return pos;
    }
@@ -120,13 +119,16 @@ struct RecordExtQUIC : public RecordExt {
          IPFIX_QUIC_TEMPLATE(IPFIX_FIELD_NAMES)
          nullptr
       };
+
       return ipfix_template;
    }
 
    std::string get_text() const
    {
       std::ostringstream out;
-      out << "quicsni=\"" << sni << "\"" << "quicuseragent=\"" << user_agent << "\"" << "quicversion=\"" << quic_version << "\"";
+
+      out << "quicsni=\"" << sni << "\"" << "quicuseragent=\"" << user_agent << "\"" << "quicversion=\"" <<
+           quic_version << "\"";
       return out.str();
    }
 };
@@ -142,8 +144,11 @@ class QUICPlugin : public ProcessPlugin
    void init(const char *params);
    void close();
    RecordExt *get_ext() const { return new RecordExtQUIC(); }
+
    OptionsParser *get_parser() const { return new OptionsParser("quic", "Parse QUIC traffic"); }
+
    std::string get_name() const { return "quic"; }
+
    ProcessPlugin *copy();
 
    int pre_create(Packet &pkt);
@@ -158,6 +163,5 @@ class QUICPlugin : public ProcessPlugin
    int parsed_initial;
    RecordExtQUIC *quic_ptr;
 };
-
 }
 #endif /* IPXP_PROCESS_QUIC_HPP */