test: add ek + raw test to outputformats.

Ping-Bug: 16187
Change-Id: Ie8d6dd1a8ff203bd6270dcfcbbeda953d57733f3
Reviewed-on: https://code.wireshark.org/review/35046
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

2 files changed, 12 insertions, 0 deletions

diff --git a/test/baseline/dhcp-raw.ek b/test/baseline/dhcp-raw.ek
new file mode 100644
index 0000000000..e67bf73979
--- /dev/null
+++ b/test/baseline/dhcp-raw.ek
@@ -0,0 +1,8 @@
+{"index":{"_index":"packets-2004-12-05","_type":"doc"}}
+{"timestamp":"1102274184317","layers":{"frame_raw":"ffffffffffff000b8201fc4208004500012ca8360000fa11178b00000000ffffffff004400430118591f0101060000003d1d0000000000000000000000000000000000000000000b8201fc4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000638253633501013d0701000b8201fc4232040000000037040103062aff00000000000000","frame":{"frame_frame_encap_type":"1","frame_frame_time":"2004-12-05T19:16:24.317453000Z","frame_frame_offset_shift":"0.000000000","frame_frame_time_epoch":"1102274184.317453000","frame_frame_time_delta":"0.000000000","frame_frame_time_delta_displayed":"0.000000000","frame_frame_time_relative":"0.000000000","frame_frame_number":"1","frame_frame_len":"314","frame_frame_cap_len":"314","frame_frame_marked":false,"frame_frame_ignored":false,"frame_frame_protocols":"eth:ethertype:ip:udp:dhcp"},"eth_raw":"ffffffffffff000b8201fc420800","eth":{"eth_eth_dst_raw":"ffffffffffff","eth_eth_dst":"ff:ff:ff:ff:ff:ff","eth_eth_dst_resolved_raw":"ffffffffffff","eth_eth_dst_resolved":"Broadcast","eth_eth_dst_oui_raw":"ffffff","eth_eth_dst_oui":"16777215","eth_eth_addr_raw":"ffffffffffff","eth_eth_addr":"ff:ff:ff:ff:ff:ff","eth_eth_addr_resolved_raw":"ffffffffffff","eth_eth_addr_resolved":"Broadcast","eth_eth_addr_oui_raw":"ffffff","eth_eth_addr_oui":"16777215","eth_eth_dst_lg_raw":"1","eth_eth_dst_lg":true,"eth_eth_lg_raw":"1","eth_eth_lg":true,"eth_eth_dst_ig_raw":"1","eth_eth_dst_ig":true,"eth_eth_ig_raw":"1","eth_eth_ig":true,"eth_eth_src_raw":"000b8201fc42","eth_eth_src":"00:0b:82:01:fc:42","eth_eth_src_resolved_raw":"000b8201fc42","eth_eth_src_resolved":"Grandstr_01:fc:42","eth_eth_src_oui_raw":"000b82","eth_eth_src_oui":"2946","eth_eth_src_oui_resolved_raw":"000b8201fc42","eth_eth_src_oui_resolved":"Grandstream Networks, Inc.","eth_eth_addr_raw":"000b8201fc42","eth_eth_addr":"00:0b:82:01:fc:42","eth_eth_addr_resolved_raw":"000b8201fc42","eth_eth_addr_resolved":"Grandstr_01:fc:42","eth_eth_addr_oui_raw":"000b82","eth_eth_addr_oui":"2946","eth_eth_addr_oui_resolved_raw":"000b8201fc42","eth_eth_addr_oui_resolved":"Grandstream Networks, Inc.","eth_eth_src_lg_raw":"0","eth_eth_src_lg":false,"eth_eth_lg_raw":"0","eth_eth_lg":false,"eth_eth_src_ig_raw":"0","eth_eth_src_ig":false,"eth_eth_ig_raw":"0","eth_eth_ig":false,"eth_eth_type_raw":"0800","eth_eth_type":"0x00000800"},"ip_raw":"4500012ca8360000fa11178b00000000ffffffff","ip":{"ip_ip_version_raw":"4","ip_ip_version":"4","ip_ip_hdr_len_raw":"45","ip_ip_hdr_len":"20","ip_ip_dsfield_raw":"00","ip_ip_dsfield":"0x00000000","ip_ip_dsfield_dscp_raw":"0","ip_ip_dsfield_dscp":"0","ip_ip_dsfield_ecn_raw":"0","ip_ip_dsfield_ecn":"0","ip_ip_len_raw":"012c","ip_ip_len":"300","ip_ip_id_raw":"a836","ip_ip_id":"0x0000a836","ip_ip_flags_raw":"0000","ip_ip_flags":"0x00000000","ip_ip_flags_rb_raw":"0","ip_ip_flags_rb":false,"ip_ip_flags_df_raw":"0","ip_ip_flags_df":false,"ip_ip_flags_mf_raw":"0","ip_ip_flags_mf":false,"ip_ip_frag_offset_raw":"0","ip_ip_frag_offset":"0","ip_ip_ttl_raw":"fa","ip_ip_ttl":"250","ip_ip_proto_raw":"11","ip_ip_proto":"17","ip_ip_checksum_raw":"178b","ip_ip_checksum":"0x0000178b","ip_ip_checksum_status":"2","ip_ip_src_raw":"00000000","ip_ip_src":"0.0.0.0","ip_ip_addr_raw":["00000000","ffffffff"],"ip_ip_addr":["0.0.0.0","255.255.255.255"],"ip_ip_src_host_raw":"00000000","ip_ip_src_host":"0.0.0.0","ip_ip_host_raw":["00000000","ffffffff"],"ip_ip_host":["0.0.0.0","255.255.255.255"],"ip_ip_dst_raw":"ffffffff","ip_ip_dst":"255.255.255.255","ip_ip_dst_host_raw":"ffffffff","ip_ip_dst_host":"255.255.255.255"},"udp_raw":"004400430118591f","udp":{"udp_udp_srcport_raw":"0044","udp_udp_srcport":"68","udp_udp_dstport_raw":"0043","udp_udp_dstport":"67","udp_udp_port_raw":["0044","0043"],"udp_udp_port":["68","67"],"udp_udp_length_raw":"0118","udp_udp_length":"280","udp_udp_checksum_raw":"591f","udp_udp_checksum":"0x0000591f","udp_udp_checksum_status":"2","udp_udp_stream":"0","text":"Timestamps","udp_udp_time_relative":"0.000000000","udp_udp_time_delta":"0.000000000"},"dhcp_raw":"0101060000003d1d0000000000000000000000000000000000000000000b8201fc4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000638253633501013d0701000b8201fc4232040000000037040103062aff00000000000000","dhcp":{"dhcp_dhcp_type_raw":"01","dhcp_dhcp_type":"1","dhcp_dhcp_hw_type_raw":"01","dhcp_dhcp_hw_type":"0x00000001","dhcp_dhcp_hw_len_raw":"06","dhcp_dhcp_hw_len":"6","dhcp_dhcp_hops_raw":"00","dhcp_dhcp_hops":"0","dhcp_dhcp_id_raw":"00003d1d","dhcp_dhcp_id":"0x00003d1d","dhcp_dhcp_secs_raw":"0000","dhcp_dhcp_secs":"0","dhcp_dhcp_flags_raw":"0000","dhcp_dhcp_flags":"0x00000000","dhcp_dhcp_flags_bc_raw":"0","dhcp_dhcp_flags_bc":false,"dhcp_dhcp_flags_reserved_raw":"0","dhcp_dhcp_flags_reserved":"0x00000000","dhcp_dhcp_ip_client_raw":"00000000","dhcp_dhcp_ip_client":"0.0.0.0","dhcp_dhcp_ip_your_raw":"00000000","dhcp_dhcp_ip_your":"0.0.0.0","dhcp_dhcp_ip_server_raw":"00000000","dhcp_dhcp_ip_server":"0.0.0.0","dhcp_dhcp_ip_relay_raw":"00000000","dhcp_dhcp_ip_relay":"0.0.0.0","dhcp_dhcp_hw_mac_addr_raw":"000b8201fc42","dhcp_dhcp_hw_mac_addr":"00:0b:82:01:fc:42","dhcp_dhcp_hw_addr_padding_raw":"00000000000000000000","dhcp_dhcp_hw_addr_padding":"00:00:00:00:00:00:00:00:00:00","dhcp_dhcp_server_raw":"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","dhcp_dhcp_server":"","dhcp_dhcp_file_raw":"0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","dhcp_dhcp_file":"","dhcp_dhcp_cookie_raw":"63825363","dhcp_dhcp_cookie":"99.130.83.99","dhcp_dhcp_option_type_raw":["350101","3d0701000b8201fc42","320400000000","37040103062a","ff"],"dhcp_dhcp_option_type":["53","61","50","55","0"],"dhcp_dhcp_option_length_raw":["01","07","04","04"],"dhcp_dhcp_option_length":["1","7","4","4"],"dhcp_dhcp_option_value_raw":["01","01000b8201fc42","00000000","0103062a"],"dhcp_dhcp_option_value":["01","01:00:0b:82:01:fc:42","00:00:00:00","01:03:06:2a"],"dhcp_dhcp_option_dhcp_raw":"01","dhcp_dhcp_option_dhcp":"1","dhcp_dhcp_hw_type_raw":"01","dhcp_dhcp_hw_type":"0x00000001","dhcp_dhcp_hw_mac_addr_raw":"000b8201fc42","dhcp_dhcp_hw_mac_addr":"00:0b:82:01:fc:42","dhcp_dhcp_option_requested_ip_address_raw":"00000000","dhcp_dhcp_option_requested_ip_address":"0.0.0.0","dhcp_dhcp_option_request_list_item_raw":["01","03","06","2a"],"dhcp_dhcp_option_request_list_item":["1","3","6","42"],"dhcp_dhcp_option_end_raw":"ff","dhcp_dhcp_option_end":"255","dhcp_dhcp_option_padding_raw":"00000000000000","dhcp_dhcp_option_padding":"00:00:00:00:00:00:00"}}}
+{"index":{"_index":"packets-2004-12-05","_type":"doc"}}
+{"timestamp":"1102274184317","layers":{"frame_raw":"000b8201fc42000874adf19b0800450001480445000080110000c0a80001c0a8000a00430044013422330201060000003d1d0000000000000000c0a8000ac0a8000100000000000b8201fc4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000638253633501020104ffffff003a04000007083b0400000c4e330400000e103604c0a80001ff0000000000000000000000000000000000000000000000000000","frame":{"frame_frame_encap_type":"1","frame_frame_time":"2004-12-05T19:16:24.317748000Z","frame_frame_offset_shift":"0.000000000","frame_frame_time_epoch":"1102274184.317748000","frame_frame_time_delta":"0.000295000","frame_frame_time_delta_displayed":"0.000295000","frame_frame_time_relative":"0.000295000","frame_frame_number":"2","frame_frame_len":"342","frame_frame_cap_len":"342","frame_frame_marked":false,"frame_frame_ignored":false,"frame_frame_protocols":"eth:ethertype:ip:udp:dhcp"},"eth_raw":"000b8201fc42000874adf19b0800","eth":{"eth_eth_dst_raw":"000b8201fc42","eth_eth_dst":"00:0b:82:01:fc:42","eth_eth_dst_resolved_raw":"000b8201fc42","eth_eth_dst_resolved":"Grandstr_01:fc:42","eth_eth_dst_oui_raw":"000b82","eth_eth_dst_oui":"2946","eth_eth_dst_oui_resolved_raw":"000b8201fc42","eth_eth_dst_oui_resolved":"Grandstream Networks, Inc.","eth_eth_addr_raw":"000b8201fc42","eth_eth_addr":"00:0b:82:01:fc:42","eth_eth_addr_resolved_raw":"000b8201fc42","eth_eth_addr_resolved":"Grandstr_01:fc:42","eth_eth_addr_oui_raw":"000b82","eth_eth_addr_oui":"2946","eth_eth_addr_oui_resolved_raw":"000b8201fc42","eth_eth_addr_oui_resolved":"Grandstream Networks, Inc.","eth_eth_dst_lg_raw":"0","eth_eth_dst_lg":false,"eth_eth_lg_raw":"0","eth_eth_lg":false,"eth_eth_dst_ig_raw":"0","eth_eth_dst_ig":false,"eth_eth_ig_raw":"0","eth_eth_ig":false,"eth_eth_src_raw":"000874adf19b","eth_eth_src":"00:08:74:ad:f1:9b","eth_eth_src_resolved_raw":"000874adf19b","eth_eth_src_resolved":"Dell_ad:f1:9b","eth_eth_src_oui_raw":"000874","eth_eth_src_oui":"2164","eth_eth_src_oui_resolved_raw":"000874adf19b","eth_eth_src_oui_resolved":"Dell Inc.","eth_eth_addr_raw":"000874adf19b","eth_eth_addr":"00:08:74:ad:f1:9b","eth_eth_addr_resolved_raw":"000874adf19b","eth_eth_addr_resolved":"Dell_ad:f1:9b","eth_eth_addr_oui_raw":"000874","eth_eth_addr_oui":"2164","eth_eth_addr_oui_resolved_raw":"000874adf19b","eth_eth_addr_oui_resolved":"Dell Inc.","eth_eth_src_lg_raw":"0","eth_eth_src_lg":false,"eth_eth_lg_raw":"0","eth_eth_lg":false,"eth_eth_src_ig_raw":"0","eth_eth_src_ig":false,"eth_eth_ig_raw":"0","eth_eth_ig":false,"eth_eth_type_raw":"0800","eth_eth_type":"0x00000800"},"ip_raw":"450001480445000080110000c0a80001c0a8000a","ip":{"ip_ip_version_raw":"4","ip_ip_version":"4","ip_ip_hdr_len_raw":"45","ip_ip_hdr_len":"20","ip_ip_dsfield_raw":"00","ip_ip_dsfield":"0x00000000","ip_ip_dsfield_dscp_raw":"0","ip_ip_dsfield_dscp":"0","ip_ip_dsfield_ecn_raw":"0","ip_ip_dsfield_ecn":"0","ip_ip_len_raw":"0148","ip_ip_len":"328","ip_ip_id_raw":"0445","ip_ip_id":"0x00000445","ip_ip_flags_raw":"0000","ip_ip_flags":"0x00000000","ip_ip_flags_rb_raw":"0","ip_ip_flags_rb":false,"ip_ip_flags_df_raw":"0","ip_ip_flags_df":false,"ip_ip_flags_mf_raw":"0","ip_ip_flags_mf":false,"ip_ip_frag_offset_raw":"0","ip_ip_frag_offset":"0","ip_ip_ttl_raw":"80","ip_ip_ttl":"128","ip_ip_proto_raw":"11","ip_ip_proto":"17","ip_ip_checksum_raw":"0000","ip_ip_checksum":"0x00000000","ip_ip_checksum_status":"2","ip_ip_src_raw":"c0a80001","ip_ip_src":"192.168.0.1","ip_ip_addr_raw":["c0a80001","c0a8000a"],"ip_ip_addr":["192.168.0.1","192.168.0.10"],"ip_ip_src_host_raw":"c0a80001","ip_ip_src_host":"192.168.0.1","ip_ip_host_raw":["c0a80001","c0a8000a"],"ip_ip_host":["192.168.0.1","192.168.0.10"],"ip_ip_dst_raw":"c0a8000a","ip_ip_dst":"192.168.0.10","ip_ip_dst_host_raw":"c0a8000a","ip_ip_dst_host":"192.168.0.10"},"udp_raw":"0043004401342233","udp":{"udp_udp_srcport_raw":"0043","udp_udp_srcport":"67","udp_udp_dstport_raw":"0044","udp_udp_dstport":"68","udp_udp_port_raw":["0043","0044"],"udp_udp_port":["67","68"],"udp_udp_length_raw":"0134","udp_udp_length":"308","udp_udp_checksum_raw":"2233","udp_udp_checksum":"0x00002233","udp_udp_checksum_status":"2","udp_udp_stream":"1","text":"Timestamps","udp_udp_time_relative":"0.000000000","udp_udp_time_delta":"0.000000000"},"dhcp_raw":"0201060000003d1d0000000000000000c0a8000ac0a8000100000000000b8201fc4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000638253633501020104ffffff003a04000007083b0400000c4e330400000e103604c0a80001ff0000000000000000000000000000000000000000000000000000","dhcp":{"dhcp_dhcp_type_raw":"02","dhcp_dhcp_type":"2","dhcp_dhcp_hw_type_raw":"01","dhcp_dhcp_hw_type":"0x00000001","dhcp_dhcp_hw_len_raw":"06","dhcp_dhcp_hw_len":"6","dhcp_dhcp_hops_raw":"00","dhcp_dhcp_hops":"0","dhcp_dhcp_id_raw":"00003d1d","dhcp_dhcp_id":"0x00003d1d","dhcp_dhcp_secs_raw":"0000","dhcp_dhcp_secs":"0","dhcp_dhcp_flags_raw":"0000","dhcp_dhcp_flags":"0x00000000","dhcp_dhcp_flags_bc_raw":"0","dhcp_dhcp_flags_bc":false,"dhcp_dhcp_flags_reserved_raw":"0","dhcp_dhcp_flags_reserved":"0x00000000","dhcp_dhcp_ip_client_raw":"00000000","dhcp_dhcp_ip_client":"0.0.0.0","dhcp_dhcp_ip_your_raw":"c0a8000a","dhcp_dhcp_ip_your":"192.168.0.10","dhcp_dhcp_ip_server_raw":"c0a80001","dhcp_dhcp_ip_server":"192.168.0.1","dhcp_dhcp_ip_relay_raw":"00000000","dhcp_dhcp_ip_relay":"0.0.0.0","dhcp_dhcp_hw_mac_addr_raw":"000b8201fc42","dhcp_dhcp_hw_mac_addr":"00:0b:82:01:fc:42","dhcp_dhcp_hw_addr_padding_raw":"00000000000000000000","dhcp_dhcp_hw_addr_padding":"00:00:00:00:00:00:00:00:00:00","dhcp_dhcp_server_raw":"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","dhcp_dhcp_server":"","dhcp_dhcp_file_raw":"0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","dhcp_dhcp_file":"","dhcp_dhcp_cookie_raw":"63825363","dhcp_dhcp_cookie":"99.130.83.99","dhcp_dhcp_option_type_raw":["350102","0104ffffff00","3a0400000708","3b0400000c4e","330400000e10","3604c0a80001","ff"],"dhcp_dhcp_option_type":["53","1","58","59","51","54","0"],"dhcp_dhcp_option_length_raw":["01","04","04","04","04","04"],"dhcp_dhcp_option_length":["1","4","4","4","4","4"],"dhcp_dhcp_option_value_raw":["02","ffffff00","00000708","00000c4e","00000e10","c0a80001"],"dhcp_dhcp_option_value":["02","ff:ff:ff:00","00:00:07:08","00:00:0c:4e","00:00:0e:10","c0:a8:00:01"],"dhcp_dhcp_option_dhcp_raw":"02","dhcp_dhcp_option_dhcp":"2","dhcp_dhcp_option_subnet_mask_raw":"ffffff00","dhcp_dhcp_option_subnet_mask":"255.255.255.0","dhcp_dhcp_option_renewal_time_value_raw":"00000708","dhcp_dhcp_option_renewal_time_value":"1800","dhcp_dhcp_option_rebinding_time_value_raw":"00000c4e","dhcp_dhcp_option_rebinding_time_value":"3150","dhcp_dhcp_option_ip_address_lease_time_raw":"00000e10","dhcp_dhcp_option_ip_address_lease_time":"3600","dhcp_dhcp_option_dhcp_server_id_raw":"c0a80001","dhcp_dhcp_option_dhcp_server_id":"192.168.0.1","dhcp_dhcp_option_end_raw":"ff","dhcp_dhcp_option_end":"255","dhcp_dhcp_option_padding_raw":"0000000000000000000000000000000000000000000000000000","dhcp_dhcp_option_padding":"00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00"}}}
+{"index":{"_index":"packets-2004-12-05","_type":"doc"}}
+{"timestamp":"1102274184387","layers":{"frame_raw":"ffffffffffff000b8201fc4208004500012ca8370000fa11178a00000000ffffffff0044004301189fbd0101060000003d1e0000000000000000000000000000000000000000000b8201fc4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000638253633501033d0701000b8201fc423204c0a8000a3604c0a8000137040103062aff00","frame":{"frame_frame_encap_type":"1","frame_frame_time":"2004-12-05T19:16:24.387484000Z","frame_frame_offset_shift":"0.000000000","frame_frame_time_epoch":"1102274184.387484000","frame_frame_time_delta":"0.069736000","frame_frame_time_delta_displayed":"0.069736000","frame_frame_time_relative":"0.070031000","frame_frame_number":"3","frame_frame_len":"314","frame_frame_cap_len":"314","frame_frame_marked":false,"frame_frame_ignored":false,"frame_frame_protocols":"eth:ethertype:ip:udp:dhcp"},"eth_raw":"ffffffffffff000b8201fc420800","eth":{"eth_eth_dst_raw":"ffffffffffff","eth_eth_dst":"ff:ff:ff:ff:ff:ff","eth_eth_dst_resolved_raw":"ffffffffffff","eth_eth_dst_resolved":"Broadcast","eth_eth_dst_oui_raw":"ffffff","eth_eth_dst_oui":"16777215","eth_eth_addr_raw":"ffffffffffff","eth_eth_addr":"ff:ff:ff:ff:ff:ff","eth_eth_addr_resolved_raw":"ffffffffffff","eth_eth_addr_resolved":"Broadcast","eth_eth_addr_oui_raw":"ffffff","eth_eth_addr_oui":"16777215","eth_eth_dst_lg_raw":"1","eth_eth_dst_lg":true,"eth_eth_lg_raw":"1","eth_eth_lg":true,"eth_eth_dst_ig_raw":"1","eth_eth_dst_ig":true,"eth_eth_ig_raw":"1","eth_eth_ig":true,"eth_eth_src_raw":"000b8201fc42","eth_eth_src":"00:0b:82:01:fc:42","eth_eth_src_resolved_raw":"000b8201fc42","eth_eth_src_resolved":"Grandstr_01:fc:42","eth_eth_src_oui_raw":"000b82","eth_eth_src_oui":"2946","eth_eth_src_oui_resolved_raw":"000b8201fc42","eth_eth_src_oui_resolved":"Grandstream Networks, Inc.","eth_eth_addr_raw":"000b8201fc42","eth_eth_addr":"00:0b:82:01:fc:42","eth_eth_addr_resolved_raw":"000b8201fc42","eth_eth_addr_resolved":"Grandstr_01:fc:42","eth_eth_addr_oui_raw":"000b82","eth_eth_addr_oui":"2946","eth_eth_addr_oui_resolved_raw":"000b8201fc42","eth_eth_addr_oui_resolved":"Grandstream Networks, Inc.","eth_eth_src_lg_raw":"0","eth_eth_src_lg":false,"eth_eth_lg_raw":"0","eth_eth_lg":false,"eth_eth_src_ig_raw":"0","eth_eth_src_ig":false,"eth_eth_ig_raw":"0","eth_eth_ig":false,"eth_eth_type_raw":"0800","eth_eth_type":"0x00000800"},"ip_raw":"4500012ca8370000fa11178a00000000ffffffff","ip":{"ip_ip_version_raw":"4","ip_ip_version":"4","ip_ip_hdr_len_raw":"45","ip_ip_hdr_len":"20","ip_ip_dsfield_raw":"00","ip_ip_dsfield":"0x00000000","ip_ip_dsfield_dscp_raw":"0","ip_ip_dsfield_dscp":"0","ip_ip_dsfield_ecn_raw":"0","ip_ip_dsfield_ecn":"0","ip_ip_len_raw":"012c","ip_ip_len":"300","ip_ip_id_raw":"a837","ip_ip_id":"0x0000a837","ip_ip_flags_raw":"0000","ip_ip_flags":"0x00000000","ip_ip_flags_rb_raw":"0","ip_ip_flags_rb":false,"ip_ip_flags_df_raw":"0","ip_ip_flags_df":false,"ip_ip_flags_mf_raw":"0","ip_ip_flags_mf":false,"ip_ip_frag_offset_raw":"0","ip_ip_frag_offset":"0","ip_ip_ttl_raw":"fa","ip_ip_ttl":"250","ip_ip_proto_raw":"11","ip_ip_proto":"17","ip_ip_checksum_raw":"178a","ip_ip_checksum":"0x0000178a","ip_ip_checksum_status":"2","ip_ip_src_raw":"00000000","ip_ip_src":"0.0.0.0","ip_ip_addr_raw":["00000000","ffffffff"],"ip_ip_addr":["0.0.0.0","255.255.255.255"],"ip_ip_src_host_raw":"00000000","ip_ip_src_host":"0.0.0.0","ip_ip_host_raw":["00000000","ffffffff"],"ip_ip_host":["0.0.0.0","255.255.255.255"],"ip_ip_dst_raw":"ffffffff","ip_ip_dst":"255.255.255.255","ip_ip_dst_host_raw":"ffffffff","ip_ip_dst_host":"255.255.255.255"},"udp_raw":"0044004301189fbd","udp":{"udp_udp_srcport_raw":"0044","udp_udp_srcport":"68","udp_udp_dstport_raw":"0043","udp_udp_dstport":"67","udp_udp_port_raw":["0044","0043"],"udp_udp_port":["68","67"],"udp_udp_length_raw":"0118","udp_udp_length":"280","udp_udp_checksum_raw":"9fbd","udp_udp_checksum":"0x00009fbd","udp_udp_checksum_status":"2","udp_udp_stream":"0","text":"Timestamps","udp_udp_time_relative":"0.070031000","udp_udp_time_delta":"0.070031000"},"dhcp_raw":"0101060000003d1e0000000000000000000000000000000000000000000b8201fc4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000638253633501033d0701000b8201fc423204c0a8000a3604c0a8000137040103062aff00","dhcp":{"dhcp_dhcp_type_raw":"01","dhcp_dhcp_type":"1","dhcp_dhcp_hw_type_raw":"01","dhcp_dhcp_hw_type":"0x00000001","dhcp_dhcp_hw_len_raw":"06","dhcp_dhcp_hw_len":"6","dhcp_dhcp_hops_raw":"00","dhcp_dhcp_hops":"0","dhcp_dhcp_id_raw":"00003d1e","dhcp_dhcp_id":"0x00003d1e","dhcp_dhcp_secs_raw":"0000","dhcp_dhcp_secs":"0","dhcp_dhcp_flags_raw":"0000","dhcp_dhcp_flags":"0x00000000","dhcp_dhcp_flags_bc_raw":"0","dhcp_dhcp_flags_bc":false,"dhcp_dhcp_flags_reserved_raw":"0","dhcp_dhcp_flags_reserved":"0x00000000","dhcp_dhcp_ip_client_raw":"00000000","dhcp_dhcp_ip_client":"0.0.0.0","dhcp_dhcp_ip_your_raw":"00000000","dhcp_dhcp_ip_your":"0.0.0.0","dhcp_dhcp_ip_server_raw":"00000000","dhcp_dhcp_ip_server":"0.0.0.0","dhcp_dhcp_ip_relay_raw":"00000000","dhcp_dhcp_ip_relay":"0.0.0.0","dhcp_dhcp_hw_mac_addr_raw":"000b8201fc42","dhcp_dhcp_hw_mac_addr":"00:0b:82:01:fc:42","dhcp_dhcp_hw_addr_padding_raw":"00000000000000000000","dhcp_dhcp_hw_addr_padding":"00:00:00:00:00:00:00:00:00:00","dhcp_dhcp_server_raw":"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","dhcp_dhcp_server":"","dhcp_dhcp_file_raw":"0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","dhcp_dhcp_file":"","dhcp_dhcp_cookie_raw":"63825363","dhcp_dhcp_cookie":"99.130.83.99","dhcp_dhcp_option_type_raw":["350103","3d0701000b8201fc42","3204c0a8000a","3604c0a80001","37040103062a","ff"],"dhcp_dhcp_option_type":["53","61","50","54","55","0"],"dhcp_dhcp_option_length_raw":["01","07","04","04","04"],"dhcp_dhcp_option_length":["1","7","4","4","4"],"dhcp_dhcp_option_value_raw":["03","01000b8201fc42","c0a8000a","c0a80001","0103062a"],"dhcp_dhcp_option_value":["03","01:00:0b:82:01:fc:42","c0:a8:00:0a","c0:a8:00:01","01:03:06:2a"],"dhcp_dhcp_option_dhcp_raw":"03","dhcp_dhcp_option_dhcp":"3","dhcp_dhcp_hw_type_raw":"01","dhcp_dhcp_hw_type":"0x00000001","dhcp_dhcp_hw_mac_addr_raw":"000b8201fc42","dhcp_dhcp_hw_mac_addr":"00:0b:82:01:fc:42","dhcp_dhcp_option_requested_ip_address_raw":"c0a8000a","dhcp_dhcp_option_requested_ip_address":"192.168.0.10","dhcp_dhcp_option_dhcp_server_id_raw":"c0a80001","dhcp_dhcp_option_dhcp_server_id":"192.168.0.1","dhcp_dhcp_option_request_list_item_raw":["01","03","06","2a"],"dhcp_dhcp_option_request_list_item":["1","3","6","42"],"dhcp_dhcp_option_end_raw":"ff","dhcp_dhcp_option_end":"255","dhcp_dhcp_option_padding_raw":"00","dhcp_dhcp_option_padding":"00"}}}
+{"index":{"_index":"packets-2004-12-05","_type":"doc"}}
+{"timestamp":"1102274184387","layers":{"frame_raw":"000b8201fc42000874adf19b0800450001480446000080110000c0a80001c0a8000a004300440134dfdb0201060000003d1e0000000000000000c0a8000a0000000000000000000b8201fc4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000638253633501053a04000007083b0400000c4e330400000e103604c0a800010104ffffff00ff0000000000000000000000000000000000000000000000000000","frame":{"frame_frame_encap_type":"1","frame_frame_time":"2004-12-05T19:16:24.387798000Z","frame_frame_offset_shift":"0.000000000","frame_frame_time_epoch":"1102274184.387798000","frame_frame_time_delta":"0.000314000","frame_frame_time_delta_displayed":"0.000314000","frame_frame_time_relative":"0.070345000","frame_frame_number":"4","frame_frame_len":"342","frame_frame_cap_len":"342","frame_frame_marked":false,"frame_frame_ignored":false,"frame_frame_protocols":"eth:ethertype:ip:udp:dhcp"},"eth_raw":"000b8201fc42000874adf19b0800","eth":{"eth_eth_dst_raw":"000b8201fc42","eth_eth_dst":"00:0b:82:01:fc:42","eth_eth_dst_resolved_raw":"000b8201fc42","eth_eth_dst_resolved":"Grandstr_01:fc:42","eth_eth_dst_oui_raw":"000b82","eth_eth_dst_oui":"2946","eth_eth_dst_oui_resolved_raw":"000b8201fc42","eth_eth_dst_oui_resolved":"Grandstream Networks, Inc.","eth_eth_addr_raw":"000b8201fc42","eth_eth_addr":"00:0b:82:01:fc:42","eth_eth_addr_resolved_raw":"000b8201fc42","eth_eth_addr_resolved":"Grandstr_01:fc:42","eth_eth_addr_oui_raw":"000b82","eth_eth_addr_oui":"2946","eth_eth_addr_oui_resolved_raw":"000b8201fc42","eth_eth_addr_oui_resolved":"Grandstream Networks, Inc.","eth_eth_dst_lg_raw":"0","eth_eth_dst_lg":false,"eth_eth_lg_raw":"0","eth_eth_lg":false,"eth_eth_dst_ig_raw":"0","eth_eth_dst_ig":false,"eth_eth_ig_raw":"0","eth_eth_ig":false,"eth_eth_src_raw":"000874adf19b","eth_eth_src":"00:08:74:ad:f1:9b","eth_eth_src_resolved_raw":"000874adf19b","eth_eth_src_resolved":"Dell_ad:f1:9b","eth_eth_src_oui_raw":"000874","eth_eth_src_oui":"2164","eth_eth_src_oui_resolved_raw":"000874adf19b","eth_eth_src_oui_resolved":"Dell Inc.","eth_eth_addr_raw":"000874adf19b","eth_eth_addr":"00:08:74:ad:f1:9b","eth_eth_addr_resolved_raw":"000874adf19b","eth_eth_addr_resolved":"Dell_ad:f1:9b","eth_eth_addr_oui_raw":"000874","eth_eth_addr_oui":"2164","eth_eth_addr_oui_resolved_raw":"000874adf19b","eth_eth_addr_oui_resolved":"Dell Inc.","eth_eth_src_lg_raw":"0","eth_eth_src_lg":false,"eth_eth_lg_raw":"0","eth_eth_lg":false,"eth_eth_src_ig_raw":"0","eth_eth_src_ig":false,"eth_eth_ig_raw":"0","eth_eth_ig":false,"eth_eth_type_raw":"0800","eth_eth_type":"0x00000800"},"ip_raw":"450001480446000080110000c0a80001c0a8000a","ip":{"ip_ip_version_raw":"4","ip_ip_version":"4","ip_ip_hdr_len_raw":"45","ip_ip_hdr_len":"20","ip_ip_dsfield_raw":"00","ip_ip_dsfield":"0x00000000","ip_ip_dsfield_dscp_raw":"0","ip_ip_dsfield_dscp":"0","ip_ip_dsfield_ecn_raw":"0","ip_ip_dsfield_ecn":"0","ip_ip_len_raw":"0148","ip_ip_len":"328","ip_ip_id_raw":"0446","ip_ip_id":"0x00000446","ip_ip_flags_raw":"0000","ip_ip_flags":"0x00000000","ip_ip_flags_rb_raw":"0","ip_ip_flags_rb":false,"ip_ip_flags_df_raw":"0","ip_ip_flags_df":false,"ip_ip_flags_mf_raw":"0","ip_ip_flags_mf":false,"ip_ip_frag_offset_raw":"0","ip_ip_frag_offset":"0","ip_ip_ttl_raw":"80","ip_ip_ttl":"128","ip_ip_proto_raw":"11","ip_ip_proto":"17","ip_ip_checksum_raw":"0000","ip_ip_checksum":"0x00000000","ip_ip_checksum_status":"2","ip_ip_src_raw":"c0a80001","ip_ip_src":"192.168.0.1","ip_ip_addr_raw":["c0a80001","c0a8000a"],"ip_ip_addr":["192.168.0.1","192.168.0.10"],"ip_ip_src_host_raw":"c0a80001","ip_ip_src_host":"192.168.0.1","ip_ip_host_raw":["c0a80001","c0a8000a"],"ip_ip_host":["192.168.0.1","192.168.0.10"],"ip_ip_dst_raw":"c0a8000a","ip_ip_dst":"192.168.0.10","ip_ip_dst_host_raw":"c0a8000a","ip_ip_dst_host":"192.168.0.10"},"udp_raw":"004300440134dfdb","udp":{"udp_udp_srcport_raw":"0043","udp_udp_srcport":"67","udp_udp_dstport_raw":"0044","udp_udp_dstport":"68","udp_udp_port_raw":["0043","0044"],"udp_udp_port":["67","68"],"udp_udp_length_raw":"0134","udp_udp_length":"308","udp_udp_checksum_raw":"dfdb","udp_udp_checksum":"0x0000dfdb","udp_udp_checksum_status":"2","udp_udp_stream":"1","text":"Timestamps","udp_udp_time_relative":"0.070050000","udp_udp_time_delta":"0.070050000"},"dhcp_raw":"0201060000003d1e0000000000000000c0a8000a0000000000000000000b8201fc4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000638253633501053a04000007083b0400000c4e330400000e103604c0a800010104ffffff00ff0000000000000000000000000000000000000000000000000000","dhcp":{"dhcp_dhcp_type_raw":"02","dhcp_dhcp_type":"2","dhcp_dhcp_hw_type_raw":"01","dhcp_dhcp_hw_type":"0x00000001","dhcp_dhcp_hw_len_raw":"06","dhcp_dhcp_hw_len":"6","dhcp_dhcp_hops_raw":"00","dhcp_dhcp_hops":"0","dhcp_dhcp_id_raw":"00003d1e","dhcp_dhcp_id":"0x00003d1e","dhcp_dhcp_secs_raw":"0000","dhcp_dhcp_secs":"0","dhcp_dhcp_flags_raw":"0000","dhcp_dhcp_flags":"0x00000000","dhcp_dhcp_flags_bc_raw":"0","dhcp_dhcp_flags_bc":false,"dhcp_dhcp_flags_reserved_raw":"0","dhcp_dhcp_flags_reserved":"0x00000000","dhcp_dhcp_ip_client_raw":"00000000","dhcp_dhcp_ip_client":"0.0.0.0","dhcp_dhcp_ip_your_raw":"c0a8000a","dhcp_dhcp_ip_your":"192.168.0.10","dhcp_dhcp_ip_server_raw":"00000000","dhcp_dhcp_ip_server":"0.0.0.0","dhcp_dhcp_ip_relay_raw":"00000000","dhcp_dhcp_ip_relay":"0.0.0.0","dhcp_dhcp_hw_mac_addr_raw":"000b8201fc42","dhcp_dhcp_hw_mac_addr":"00:0b:82:01:fc:42","dhcp_dhcp_hw_addr_padding_raw":"00000000000000000000","dhcp_dhcp_hw_addr_padding":"00:00:00:00:00:00:00:00:00:00","dhcp_dhcp_server_raw":"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","dhcp_dhcp_server":"","dhcp_dhcp_file_raw":"0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","dhcp_dhcp_file":"","dhcp_dhcp_cookie_raw":"63825363","dhcp_dhcp_cookie":"99.130.83.99","dhcp_dhcp_option_type_raw":["350105","3a0400000708","3b0400000c4e","330400000e10","3604c0a80001","0104ffffff00","ff"],"dhcp_dhcp_option_type":["53","58","59","51","54","1","0"],"dhcp_dhcp_option_length_raw":["01","04","04","04","04","04"],"dhcp_dhcp_option_length":["1","4","4","4","4","4"],"dhcp_dhcp_option_value_raw":["05","00000708","00000c4e","00000e10","c0a80001","ffffff00"],"dhcp_dhcp_option_value":["05","00:00:07:08","00:00:0c:4e","00:00:0e:10","c0:a8:00:01","ff:ff:ff:00"],"dhcp_dhcp_option_dhcp_raw":"05","dhcp_dhcp_option_dhcp":"5","dhcp_dhcp_option_renewal_time_value_raw":"00000708","dhcp_dhcp_option_renewal_time_value":"1800","dhcp_dhcp_option_rebinding_time_value_raw":"00000c4e","dhcp_dhcp_option_rebinding_time_value":"3150","dhcp_dhcp_option_ip_address_lease_time_raw":"00000e10","dhcp_dhcp_option_ip_address_lease_time":"3600","dhcp_dhcp_option_dhcp_server_id_raw":"c0a80001","dhcp_dhcp_option_dhcp_server_id":"192.168.0.1","dhcp_dhcp_option_subnet_mask_raw":"ffffff00","dhcp_dhcp_option_subnet_mask":"255.255.255.0","dhcp_dhcp_option_end_raw":"ff","dhcp_dhcp_option_end":"255","dhcp_dhcp_option_padding_raw":"0000000000000000000000000000000000000000000000000000","dhcp_dhcp_option_padding":"00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00"}}}
diff --git a/test/suite_outputformats.py b/test/suite_outputformats.py
index 9f61b03e70..f92e20f11e 100644
--- a/test/suite_outputformats.py
+++ b/test/suite_outputformats.py
@@ -61,6 +61,10 @@ class case_outputformats(subprocesstest.SubprocessTestCase):
         '''Decode some captures into ek'''
         check_outputformat("ek", expected="dhcp.ek", multiline=True)
 
+    def test_outputformat_ek_raw(self, check_outputformat):
+        '''Decode some captures into ek, with raw data'''
+        check_outputformat("ek", expected="dhcp-raw.ek", multiline=True, extra_args=['-x'])
+
     def test_outputformat_json_select_field(self, check_outputformat):
         '''Checks that the -e option works with -Tjson.'''
         check_outputformat("json", extra_args=['-eframe.number', '-c1'], expected=[