diff options
| author | Luca Deri <deri@ntop.org> | 2021-01-06 18:28:24 +0100 |
|---|---|---|
| committer | Luca Deri <deri@ntop.org> | 2021-01-06 18:28:24 +0100 |
| commit | eb37f8f1fbf62fce7e8997a24408b998f895d07b (patch) | |
| tree | d56b4cc326b9f8f3a6d3aa31741702bab017bb51 /src/lib/protocols/http.c | |
| parent | cd21f0d31647444d93536bed2516ddc175e09b25 (diff) | |
Split HTTP request from response Content-Type. Request Content-Type should be present with POSTs and not with other methods such as GET
Diffstat (limited to 'src/lib/protocols/http.c')
| -rw-r--r-- | src/lib/protocols/http.c | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/src/lib/protocols/http.c b/src/lib/protocols/http.c index 63f68a0f4..4e1d60d4a 100644 --- a/src/lib/protocols/http.c +++ b/src/lib/protocols/http.c @@ -631,19 +631,34 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_ NDPI_LOG_DBG2(ndpi_struct, "Content Type line found %.*s\n", packet->content_line.len, packet->content_line.ptr); - if((flow->http.content_type == NULL) && (packet->content_line.len > 0)) { - int len = packet->content_line.len + 1; - - flow->http.content_type = ndpi_malloc(len); - if(flow->http.content_type) { - strncpy(flow->http.content_type, (char*)packet->content_line.ptr, - packet->content_line.len); - flow->http.content_type[packet->content_line.len] = '\0'; - - flow->guessed_category = flow->category = ndpi_http_check_content(ndpi_struct, flow); + if(flow->http.response_status_code == 0) { + /* Request */ + if((flow->http.request_content_type == NULL) && (packet->content_line.len > 0)) { + int len = packet->content_line.len + 1; + + flow->http.request_content_type = ndpi_malloc(len); + if(flow->http.request_content_type) { + strncpy(flow->http.request_content_type, (char*)packet->content_line.ptr, + packet->content_line.len); + flow->http.request_content_type[packet->content_line.len] = '\0'; + } } - } - + } else { + /* Response */ + if((flow->http.content_type == NULL) && (packet->content_line.len > 0)) { + int len = packet->content_line.len + 1; + + flow->http.content_type = ndpi_malloc(len); + if(flow->http.content_type) { + strncpy(flow->http.content_type, (char*)packet->content_line.ptr, + packet->content_line.len); + flow->http.content_type[packet->content_line.len] = '\0'; + + flow->guessed_category = flow->category = ndpi_http_check_content(ndpi_struct, flow); + } + } + } + if(flow->http_detected) { ndpi_protocol_match_result ret_match; |