diff options
| -rw-r--r-- | epan/dissectors/packet-exported_pdu.c | 4 | ||||
| -rw-r--r-- | ui/gtk/export_pdu_dlg.c | 16 | ||||
| -rw-r--r-- | wiretap/pcap-common.c | 4 | ||||
| -rw-r--r-- | wiretap/wtap.c | 6 | ||||
| -rw-r--r-- | wiretap/wtap.h | 2 |
5 files changed, 19 insertions, 13 deletions
diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c index 47c1f0e0e8..6245c8d111 100644 --- a/epan/dissectors/packet-exported_pdu.c +++ b/epan/dissectors/packet-exported_pdu.c @@ -337,16 +337,14 @@ proto_register_exported_pdu(void) void proto_reg_handoff_exported_pdu(void) { -#if 0 static gboolean initialized = FALSE; static dissector_handle_t exported_pdu_handle; if (!initialized) { exported_pdu_handle = find_dissector("exported_pdu"); + dissector_add_uint("wtap_encap", WTAP_ENCAP_WIRESHARK_UPPER_PDU, exported_pdu_handle); initialized = TRUE; - } -#endif } diff --git a/ui/gtk/export_pdu_dlg.c b/ui/gtk/export_pdu_dlg.c index f3e334434c..4dbd167e5c 100644 --- a/ui/gtk/export_pdu_dlg.c +++ b/ui/gtk/export_pdu_dlg.c @@ -164,9 +164,9 @@ exp_pdu_file_open(exp_pdu_t *exp_pdu_tap_data) idb_inf->interface_data = g_array_new(FALSE, FALSE, sizeof(wtapng_if_descr_t)); /* create the fake interface data */ - int_data.wtap_encap = WTAP_ENCAP_USER10; + int_data.wtap_encap = WTAP_ENCAP_WIRESHARK_UPPER_PDU; int_data.time_units_per_second = 1000000; /* default microsecond resolution */ - int_data.link_type = wtap_wtap_encap_to_pcap_encap(WTAP_ENCAP_USER10); + int_data.link_type = wtap_wtap_encap_to_pcap_encap(WTAP_ENCAP_WIRESHARK_UPPER_PDU); int_data.snap_len = WTAP_MAX_PACKET_SIZE; int_data.if_name = g_strdup("Fake IF, PDU->Export"); int_data.opt_comment = NULL; @@ -183,7 +183,7 @@ exp_pdu_file_open(exp_pdu_t *exp_pdu_tap_data) g_array_append_val(idb_inf->interface_data, int_data); - exp_pdu_tap_data->wdh = wtap_dump_fdopen_ng(import_file_fd, WTAP_FILE_PCAPNG, WTAP_ENCAP_USER10, WTAP_MAX_PACKET_SIZE, FALSE, shb_hdr, idb_inf, &err); + exp_pdu_tap_data->wdh = wtap_dump_fdopen_ng(import_file_fd, WTAP_FILE_PCAPNG, WTAP_ENCAP_WIRESHARK_UPPER_PDU, WTAP_MAX_PACKET_SIZE, FALSE, shb_hdr, idb_inf, &err); if (exp_pdu_tap_data->wdh == NULL) { open_failure_alert_box(capfile_name, err, TRUE); goto end; @@ -275,7 +275,7 @@ export_pdu_show_cb(GtkWidget *w _U_, gpointer d _U_) { GtkWidget *main_vb, *bbox, *close_bt, *ok_bt; - GtkWidget *grid, *label, *filter_bt; + GtkWidget *grid, *filter_bt; exp_pdu_t *exp_pdu_tap_data; const char *filter = NULL; guint row; @@ -294,7 +294,7 @@ export_pdu_show_cb(GtkWidget *w _U_, gpointer d _U_) } exp_pdu_tap_data = (exp_pdu_t *)g_malloc(sizeof(exp_pdu_t)); - exp_pdu_tap_data->pkt_encap = wtap_wtap_encap_to_pcap_encap(WTAP_ENCAP_USER10); + exp_pdu_tap_data->pkt_encap = wtap_wtap_encap_to_pcap_encap(WTAP_ENCAP_WIRESHARK_UPPER_PDU); export_pdu_dlg = window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Export PDU:s to pcap-ng file"); @@ -305,17 +305,13 @@ export_pdu_show_cb(GtkWidget *w _U_, gpointer d _U_) gtk_container_set_border_width(GTK_CONTAINER(main_vb), 3); gtk_container_add(GTK_CONTAINER(export_pdu_dlg), main_vb); - /* grid (Replace by a dropdown box to select USER DLT:s*/ + /* grid */ grid = ws_gtk_grid_new(); ws_gtk_grid_set_column_spacing(GTK_GRID(grid), 6); ws_gtk_grid_set_row_spacing(GTK_GRID(grid), 3); gtk_box_pack_start(GTK_BOX(main_vb), grid, TRUE, TRUE, 0); row = 0; - label = gtk_label_new("Add a drop-down list to select USER_DLT, currently hardcoded to USER10"); - ws_gtk_grid_attach_defaults(GTK_GRID(grid), label, 0, row, 2, 1); - row++; - /* Filter button */ filter_bt=gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); g_signal_connect(filter_bt, "clicked", G_CALLBACK(display_filter_construct_cb), &args); diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index cfd090c60d..eda0eb5b10 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -399,6 +399,10 @@ static const struct { { 249, WTAP_ENCAP_USBPCAP}, /* RTAC SERIAL */ { 250, WTAP_ENCAP_RTAC_SERIAL}, + /* Bluetooth Low Energy Link Layer */ + { 251, WTAP_ENCAP_BLUETOOTH_LE_LL}, + /* Wireshark Upper PDU export */ + { 252, WTAP_ENCAP_WIRESHARK_UPPER_PDU}, /* * To repeat: diff --git a/wiretap/wtap.c b/wiretap/wtap.c index ecff10b716..181a110711 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -611,6 +611,12 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_RTAC_SERIAL */ { "RTAC serial-line", "rtac-serial" }, + + /* WTAP_ENCAP_BLUETOOTH_LE_LL */ + { "Bluetooth Low Energy Link Layer", "bluetooth-le-ll" }, + + /* WTAP_ENCAP_WIRESHARK_UPPER_PDU */ + { "Wireshark Upper PDU export", "wireshark-upper-pdu" }, }; WS_DLL_LOCAL diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 90e3cf0404..b4238d7a79 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -246,6 +246,8 @@ extern "C" { #define WTAP_ENCAP_JUNIPER_SVCS 152 #define WTAP_ENCAP_USBPCAP 153 #define WTAP_ENCAP_RTAC_SERIAL 154 +#define WTAP_ENCAP_BLUETOOTH_LE_LL 155 +#define WTAP_ENCAP_WIRESHARK_UPPER_PDU 156 #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |