osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

HTTP2: fix test failure on Solaris SPARC 

Do not make any assumption on the endianness: not all hosts running Wireshark are little endian

Change-Id: I8792904f7000b4f2b9e44ffe41f350ba8b4932d4
Reviewed-on: https://code.wireshark.org/review/6693
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2015-01-20 22:20:54 +01:00
parent 74ed8b5648
commit 160af3ccf3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
epan/dissectors/packet-http2.c
View File

@ -47,6 +47,8 @@
#include "packet-tcp.h"
#include "wsutil/pint.h"
#define http2_header_repr_type_VALUE_STRING_LIST(XXX) \
XXX(HTTP2_HD_NONE, 0x00, "") \
XXX(HTTP2_HD_INDEXED, 0x01, "Indexed Header Field") \
@ -690,11 +692,11 @@ inflate_http2_header_block(tvbuff_t *tvb, packet_info *pinfo, guint offset,
to get length in 4 bytes, we have to copy it to
guint32. */
len = (guint32)nv.namelen;
memcpy(&str[0], (char *)&len, sizeof(len));
phton32(&str[0], len);
memcpy(&str[4], nv.name, nv.namelen);
len = (guint32)nv.valuelen;
memcpy(&str[4 + nv.namelen], (char *)&len, sizeof(len));
phton32(&str[4 + nv.namelen], len);
memcpy(&str[4 + nv.namelen + 4], nv.value, nv.valuelen);
out->table.data.data = str;
@ -783,7 +785,7 @@ inflate_http2_header_block(tvbuff_t *tvb, packet_info *pinfo, guint offset,
header_tree = proto_item_add_subtree(header, ett_http2_headers);
/* header value length */
header_name_length = tvb_get_letohl(header_tvb, hoffset);
header_name_length = tvb_get_ntohl(header_tvb, hoffset);
proto_tree_add_uint(header_tree, hf_http2_header_name_length, tvb, offset, in->length, header_name_length);
hoffset += 4;
@ -793,7 +795,7 @@ inflate_http2_header_block(tvbuff_t *tvb, packet_info *pinfo, guint offset,
hoffset += header_name_length;
/* header value length */
header_value_length = tvb_get_letohl(header_tvb, hoffset);
header_value_length = tvb_get_ntohl(header_tvb, hoffset);
proto_tree_add_uint(header_tree, hf_http2_header_value_length, tvb, offset, in->length, header_value_length);
hoffset += 4;