diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-05-10 13:13:50 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-05-10 13:13:50 +0000 |
| commit | 914099a5a9b0dc2dea9ab00c7ccd27952f636832 (patch) | |
| tree | f5e50ed8b409dfc89de3ec01489acc84adabff03 /ui/gtk/export_pdu_dlg.c | |
| parent | 27816067e88e5cff07129ee193e2ebc42a20fc3f (diff) | |
| download | wireshark-914099a5a9b0dc2dea9ab00c7ccd27952f636832.tar.gz | |
Fix a few bugs related to PDU export feature:
- tag length is wrong if proto name was a multiple of 4 bytes
- tag length is wrong in case no IP address is available in packet_info structwhile tag is requested
- endianness issue when dumping the port number
- overlapping tag IPv4 Dst address and IPv6 Src address
- do not call dissector when it is not found
- typo errors
Enhancements:
- add a subtree for tag content
- display IPv6 Src/Dst address
svn path=/trunk/; revision=49232
Diffstat (limited to 'ui/gtk/export_pdu_dlg.c')
| -rw-r--r-- | ui/gtk/export_pdu_dlg.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ui/gtk/export_pdu_dlg.c b/ui/gtk/export_pdu_dlg.c index 35af7bfaa5..2cade36e91 100644 --- a/ui/gtk/export_pdu_dlg.c +++ b/ui/gtk/export_pdu_dlg.c @@ -78,11 +78,11 @@ export_pdu_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, co pkthdr.pkt_encap = exp_pdu_tap_data->pkt_encap; pkthdr.interface_id = 0; pkthdr.presence_flags = 0; - if(pinfo->fd->opt_comment == NULL){ - pkthdr.opt_comment = NULL; - }else{ - pkthdr.opt_comment = g_strdup(pinfo->fd->opt_comment); - } + if(pinfo->fd->opt_comment == NULL){ + pkthdr.opt_comment = NULL; + }else{ + pkthdr.opt_comment = g_strdup(pinfo->fd->opt_comment); + } pkthdr.drop_count = 0; pkthdr.pack_flags = 0; pkthdr.presence_flags = WTAP_HAS_CAP_LEN|WTAP_HAS_INTERFACE_ID|WTAP_HAS_TS|WTAP_HAS_PACK_FLAGS; @@ -90,7 +90,7 @@ export_pdu_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, co wtap_dump(exp_pdu_tap_data->wdh, &pkthdr, packet_buf, &err); g_free(packet_buf); - g_free(pkthdr.opt_comment); + g_free(pkthdr.opt_comment); return FALSE; /* Do not redraw */ } @@ -270,7 +270,7 @@ export_pdu_show_cb(GtkWidget *w _U_, gpointer d _U_) gtk_box_pack_start(GTK_BOX(main_vb), grid, TRUE, TRUE, 0); row = 0; - label = gtk_label_new("Add a droptown list to select USER_DLT, currently hardcoded to USER10"); + 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, 1, 1); /* Setup the button row */ |