vrr/nfstream
2
0
Fork 0
mirror of https://github.com/nfstream/nfstream.git synced 2026-05-19 07:54:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Windows fixes (https://github.com/nfstream/nfstream/issues/127).

Browse source
This commit is contained in:
aouinizied 2022-08-10 17:12:06 +02:00
parent fc94e134d9
commit e164b9d36c
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev_requirements.txt
View file

@ -1,4 +1,4 @@
cffi>=1.15.0
cffi>=1.15.1
psutil>=5.8.0
numpy>=1.19.5
pandas>=1.1.5; platform.python_implementation == 'CPython'

6
nfstream/engine/lib_engine.c
View file

@ -889,8 +889,8 @@ static void flow_bidirectional_dissection_collect_info(struct ndpi_detection_mod
}
// HTTP: UserAgent and ContentType. With server name this is sufficient. (at least for now)
else if (flow_is_ndpi_proto(flow, NDPI_PROTOCOL_HTTP)) {
memcpy(flow->content_type, flow->ndpi_flow->http.content_type ? flow->ndpi_flow->http.content_type : "", sizeof(flow->content_type));
memcpy(flow->user_agent, flow->ndpi_flow->http.user_agent ? flow->ndpi_flow->http.user_agent : "", sizeof(flow->user_agent));
ndpi_snprintf(flow->content_type, sizeof(flow->content_type), "%s", flow->ndpi_flow->http.content_type ? flow->ndpi_flow->http.content_type : "");
ndpi_snprintf(flow->user_agent, sizeof(flow->user_agent), "%s", (flow->ndpi_flow->http.user_agent ? flow->ndpi_flow->http.user_agent : ""));
// SSH: https://github.com/salesforce/hassh
// We extract both client and server fingerprints hassh fingerprints for SSH.
} else if (flow_is_ndpi_proto(flow, NDPI_PROTOCOL_SSH)) {
@ -906,7 +906,7 @@ static void flow_bidirectional_dissection_collect_info(struct ndpi_detection_mod
flow_is_ndpi_proto(flow, NDPI_PROTOCOL_MAIL_SMTPS) || flow_is_ndpi_proto(flow, NDPI_PROTOCOL_MAIL_IMAPS) ||
flow_is_ndpi_proto(flow, NDPI_PROTOCOL_MAIL_POPS) || flow_is_ndpi_proto(flow, NDPI_PROTOCOL_QUIC)) {
memcpy(flow->requested_server_name, flow->ndpi_flow->host_server_name, sizeof(flow->requested_server_name));
memcpy(flow->user_agent, flow->ndpi_flow->http.user_agent ? flow->ndpi_flow->http.user_agent : "", sizeof(flow->user_agent));
ndpi_snprintf(flow->user_agent, sizeof(flow->user_agent), "%s", (flow->ndpi_flow->http.user_agent ? flow->ndpi_flow->http.user_agent : ""));
memcpy(flow->c_hash, flow->ndpi_flow->protos.tls_quic.ja3_client, sizeof(flow->c_hash));
memcpy(flow->s_hash, flow->ndpi_flow->protos.tls_quic.ja3_server, sizeof(flow->s_hash));
}

2
requirements.txt
View file

@ -1,4 +1,4 @@
cffi>=1.15.0
cffi>=1.15.1
psutil>=5.8.0
numpy>=1.19.5
pandas>=1.1.5; platform.python_implementation == 'CPython'

2
setup.py
View file

@ -27,7 +27,7 @@ THIS_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
with open(os.path.join(THIS_DIRECTORY, 'README.md'), encoding='utf-8') as f:
long_description = f.read()
install_requires = ['cffi>=1.15.0',
install_requires = ['cffi>=1.15.1',
'psutil>=5.8.0',
'dpkt>=1.9.7',
'numpy>=1.19.5']