aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Adell <eugene.adell@gmail.com>2017-10-01 05:21:38 -0700
committerMichael Mann <mmann78@netscape.net>2017-10-02 17:48:11 +0000
commit96c07c6471176082b8aff7ec6df650aebaaace0e (patch)
tree2138a1cd2f1873efc047e8735cb89116399c1f4c
parenta6dec130a963753bd7431f71394b0f527147006d (diff)
HTTP: fix for ICY responses which were displayed as HTTP requests
Bug: 14091 Change-Id: Ic8d37e29f02dc9751c60e827aa773d915cabc088 Reviewed-on: https://code.wireshark.org/review/23802 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/dissectors/packet-http.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index 5fbda8a..204c5bc 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -2269,7 +2269,8 @@ is_http_request_or_reply(const gchar *data, int linelen, http_type_t *type,
* From draft-ietf-dasl-protocol-00.txt, a now vanished Microsoft draft:
* SEARCH
*/
- if (linelen >= 5 && strncmp(data, "HTTP/", 5) == 0) {
+ if ((linelen >= 5 && strncmp(data, "HTTP/", 5) == 0) ||
+ (linelen >= 3 && strncmp(data, "ICY", 3) == 0)) {
*type = HTTP_RESPONSE;
isHttpRequestOrReply = TRUE; /* response */
if (reqresp_dissector)
@@ -2297,10 +2298,6 @@ is_http_request_or_reply(const gchar *data, int linelen, http_type_t *type,
*type = HTTP_REQUEST;
isHttpRequestOrReply = TRUE;
}
- else if (strncmp(data, "ICY", indx) == 0) {
- *type = HTTP_RESPONSE;
- isHttpRequestOrReply = TRUE;
- }
break;
case 4: