Improved SOAP via HTTP. (#1605)
Signed-off-by: lns <matzeton@googlemail.com>
This commit is contained in:
+1
-1
@@ -991,7 +991,7 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
|
||||
ndpi_build_default_ports(ports_a, 80, 0 /* ntop */, 0, 0, 0) /* TCP */,
|
||||
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
|
||||
ndpi_set_proto_subprotocols(ndpi_str, NDPI_PROTOCOL_HTTP,
|
||||
NDPI_PROTOCOL_AIMINI, NDPI_PROTOCOL_CROSSFIRE,
|
||||
NDPI_PROTOCOL_AIMINI, NDPI_PROTOCOL_CROSSFIRE, NDPI_PROTOCOL_SOAP,
|
||||
NDPI_PROTOCOL_BITTORRENT, NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, NDPI_PROTOCOL_GNUTELLA,
|
||||
NDPI_PROTOCOL_MAPLESTORY, NDPI_PROTOCOL_ZATTOO, NDPI_PROTOCOL_WORLDOFWARCRAFT,
|
||||
NDPI_PROTOCOL_THUNDER, NDPI_PROTOCOL_IRC,
|
||||
|
||||
@@ -27,7 +27,14 @@
|
||||
static void ndpi_int_soap_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOAP, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI);
|
||||
if (flow->guessed_host_protocol_id == NDPI_PROTOCOL_HTTP)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOAP, NDPI_PROTOCOL_HTTP,
|
||||
NDPI_CONFIDENCE_DPI);
|
||||
} else {
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, flow->guessed_host_protocol_id, NDPI_PROTOCOL_SOAP,
|
||||
NDPI_CONFIDENCE_DPI);
|
||||
}
|
||||
}
|
||||
|
||||
void ndpi_search_soap(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
@@ -37,6 +44,25 @@ void ndpi_search_soap(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
|
||||
NDPI_LOG_DBG(ndpi_struct, "search soap\n");
|
||||
|
||||
if (packet->parsed_lines == 0)
|
||||
{
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
}
|
||||
|
||||
if (packet->parsed_lines > 0)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < packet->parsed_lines && packet->line[i].len > 0; ++i)
|
||||
{
|
||||
if (LINE_STARTS(packet->line[i], "SOAPAction") != 0)
|
||||
{
|
||||
ndpi_int_soap_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (flow->packet_counter > 3)
|
||||
{
|
||||
if (flow->l4.tcp.soap_stage == 1)
|
||||
|
||||
Reference in New Issue
Block a user