diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2012-04-20 18:10:15 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2012-04-20 18:10:15 +0000 |
| commit | b3e42281ffe8514f7bedf7eb9031d5170b48ff82 (patch) | |
| tree | 5159c8efc41952669c03b51aea9a7236fd7e5aee /epan/dissectors/packet-websocket.c | |
| parent | 048833b933d326c93e20349a4f30f480932ffebe (diff) | |
Fix compilation.
While there, remove trailing whitespaces.
svn path=/trunk/; revision=42168
Diffstat (limited to 'epan/dissectors/packet-websocket.c')
| -rw-r--r-- | epan/dissectors/packet-websocket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-websocket.c b/epan/dissectors/packet-websocket.c index 1611572b85..cef018f18f 100644 --- a/epan/dissectors/packet-websocket.c +++ b/epan/dissectors/packet-websocket.c @@ -136,7 +136,7 @@ tvb_unmasked(tvbuff_t *tvb, const int offset, guint64 payload_length, const guin return tvb_unmask; } -static int +static int dissect_websocket_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ws_tree, guint8 opcode, guint64 payload_length, guint8 mask, const guint8* masking_key) { int offset = 0; @@ -147,8 +147,8 @@ dissect_websocket_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ws_tree /* Wireshark does not handle packets larger than 2^31-1 bytes. */ payload_length_32bit = (int)payload_length; - if (payload_length != payload_length_32bit) { - proto_tree_add_text(ws_tree, tvb, offset, -1, "Payload length %" G_GINT64_MODIFIER "u" is too large to dissect", + if (payload_length != (guint64)payload_length_32bit) { + proto_tree_add_text(ws_tree, tvb, offset, -1, "Payload length %" G_GINT64_MODIFIER "u is too large to dissect", payload_length); return tvb_length(tvb); } @@ -174,7 +174,7 @@ dissect_websocket_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ws_tree /* TODO: Add Fragmentation support... */ break; - case WS_TEXT: /* Text */ + case WS_TEXT: /* Text */ if(mask){ proto_tree_add_item(pl_tree, hf_ws_payload_text_mask, tvb, offset, payload_length_32bit, ENC_NA); |