epan/dissectors/packet-dcerpc.c fix warnings
authorStefan Metzmacher <metze@samba.org>
Fri, 20 Sep 2013 01:51:56 +0000 (03:51 +0200)
committerStefan Metzmacher <metze@samba.org>
Wed, 29 Jan 2014 08:18:27 +0000 (09:18 +0100)
epan/dissectors/packet-dcerpc.c

index 6e126bbab348b59ff4c7982fc499e49871ac7785..10c3753051a66a78a8f2e9c53a8372b7aaddd4c8 100644 (file)
@@ -2938,7 +2938,7 @@ dissect_sec_vt_header(proto_tree *tree, tvbuff_t *tvb, int offset)
 
 //??? dissect_dcerpc_uint16
        opnum = tvb_get_letohs(tvb, offset); //??? dcerpc_tvb_get_ntohs
-       proto_tree_add_uint(tr, hf_dcerpc_opnum, tvb, offset, 2, cont_id);
+       proto_tree_add_uint(tr, hf_dcerpc_opnum, tvb, offset, 2, opnum);
        offset += 2;
 
        proto_item_set_end(ti, tvb, offset);
@@ -2994,11 +2994,11 @@ dissect_verification_trailer(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
                proto_item *ti;
                proto_tree *tr;
-               cmd = tvb_get_letohs(tvb, offset);
+               cmd = (sec_vt_command)tvb_get_letohs(tvb, offset);
                len = tvb_get_letohs(tvb, offset + 2);
                cmd_end = cmd & SEC_VT_COMMAND_END;
                cmd_must = cmd & SEC_VT_MUST_PROCESS_COMMAND;
-               cmd &= SEC_VT_COMMAND_MASK;
+               cmd = (sec_vt_command)(cmd & SEC_VT_COMMAND_MASK);
 
                ti = proto_tree_add_text(tree, tvb, offset, -1, "Command: %s",
                                                     val_to_str(cmd, sec_vt_command_cmd_vals,