Skip to content

Commit 8e931d7

Browse files
hynekkarPavel Siska
authored andcommitted
Refactor: NEW class TLS parser for QUIC and TLS plugins
TLS: tls parser added into tls plugin QUIC: Removed old implementation files update
1 parent c9ef184 commit 8e931d7

File tree

9 files changed

+1475
-1457
lines changed

9 files changed

+1475
-1457
lines changed

Makefile.am

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ ipfixprobe_process_src=\
8989
process/sip.hpp \
9090
process/tls.cpp \
9191
process/tls.hpp \
92+
process/tls_parser.cpp \
93+
process/tls_parser.hpp \
9294
process/smtp.cpp \
9395
process/smtp.hpp \
9496
process/dns-utils.hpp \
@@ -128,8 +130,9 @@ if WITH_QUIC
128130
ipfixprobe_process_src+=\
129131
process/quic.hpp \
130132
process/quic.cpp \
131-
process/quic_implementation.cpp \
132-
process/quic_implementation.hpp
133+
process/quic_parser.cpp \
134+
process/quic_parser.hpp
135+
133136
endif
134137

135138
if WITH_FLEXPROBE

process/quic.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ ProcessPlugin *QUICPlugin::copy()
8888
bool QUICPlugin::process_quic(RecordExtQUIC *quic_data, const Packet &pkt)
8989
{
9090

91-
QUIC process_quic;
91+
QUICParser process_quic;
9292

9393
if (!process_quic.quic_start(pkt))
9494
{
@@ -138,7 +138,6 @@ void QUICPlugin::add_quic(Flow &rec, const Packet &pkt)
138138
}
139139

140140
if (process_quic(quic_ptr, pkt)) {
141-
//std::cout << quic_ptr->sni << std::endl;
142141
rec.add_extension(quic_ptr);
143142
quic_ptr = nullptr;
144143
}

process/quic.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,21 @@
5151
#endif
5252

5353

54-
#include "quic_implementation.hpp"
54+
#include "quic_parser.hpp"
55+
#include <ipfixprobe/utils.hpp>
56+
#include <ipfixprobe/ipfix-elements.hpp>
57+
#include <sstream>
5558

5659

5760
namespace ipxp {
5861

5962
#define QUIC_UNIREC_TEMPLATE "QUIC_SNI,QUIC_USER_AGENT,QUIC_VERSION"
60-
61-
6263
UR_FIELDS(
6364
string QUIC_SNI,
6465
string QUIC_USER_AGENT,
6566
uint32 QUIC_VERSION
6667
)
6768

68-
6969
/**
7070
* \brief Flow record extension header for storing parsed QUIC packets.
7171
*/

0 commit comments

Comments
 (0)