osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Added Manual IP address resolve functions. 

This can later be extended with ethernet and probably other addresses.

svn path=/trunk/; revision=32571
This commit is contained in:
Stig Bjørlykke 2010-04-27 06:51:16 +00:00
parent 78509bdf7f
commit 32ce531601
11 changed files with 311 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
epan/addr_resolv.c
View File

@ -2013,6 +2013,38 @@ read_hosts_file (const char *hostspath)
return TRUE;
} /* read_hosts_file */
gboolean
add_ip_name_from_string (const char *address, const char *name)
{
guint32 host_addr[4]; /* IPv4 */
struct e_in6_addr ip6_addr; /* IPv6 */
gboolean is_ipv6;
int ret;
ret = inet_pton(AF_INET6, address, &ip6_addr);
if (ret == -1)
/* Error parsing address */
return FALSE;
if (ret == 1) {
/* Valid IPv6 */
is_ipv6 = TRUE;
} else {
/* Not valid IPv6 - valid IPv4? */
if (inet_pton(AF_INET, address, &host_addr) != 1)
return FALSE; /* no */
is_ipv6 = FALSE;
}
if (is_ipv6) {
add_ipv6_name(&ip6_addr, name);
} else {
add_ipv4_name(host_addr[0], name);
}
return TRUE;
} /* read_hosts_file */
/* Read in a list of subnet definition - name pairs.
* <line> = <comment> | <entry> | <whitespace>

3
epan/addr_resolv.h
View File

@ -176,6 +176,9 @@ extern void add_ipv4_name(const guint addr, const gchar *name);
/* adds a hostname/IPv6 in the hash table */
extern void add_ipv6_name(const struct e_in6_addr *addr, const gchar *name);
/* adds a hostname in the hash table */
extern gboolean add_ip_name_from_string (const char *address, const char *name);
/* add ethernet address / name corresponding to IP address */
extern void add_ether_byip(const guint ip, const guint8 *eth);

1
gtk/CMakeLists.txt
View File

@ -74,6 +74,7 @@ set(WIRESHARK_GTK_SRC
main_statusbar.c
main_toolbar.c
main_welcome.c
manual_addr_resolv.c
mcast_stream.c
new_packet_list.c
packet_history.c

2
gtk/Makefile.common
View File

@ -80,6 +80,7 @@ WIRESHARK_GTK_SRC = \
main.c \
main_airpcap_toolbar.c \
main_filter_toolbar.c \
manual_addr_resolv.c \
menus.c \
main_packet_list.c \
main_proto_draw.c \
@ -272,6 +273,7 @@ noinst_HEADERS = \
main_statusbar_private.h \
main_toolbar.h \
main_welcome.h \
manual_addr_resolv.h \
mcast_stream.h \
mcast_stream_dlg.h \
mtp3_stat.h \

3
gtk/help_dlg.c
View File

@ -238,6 +238,9 @@ topic_action(topic_action_e action)
case(HELP_CONFIG_PROFILES_DIALOG):
help_topic_html("ChCustConfigProfilesSection.html");
break;
case (HELP_MANUAL_ADDR_RESOLVE_DIALOG):
help_topic_html("ChManualAddressResolveSection.html");
break;
case(HELP_PRINT_DIALOG):
help_topic_html("ChIOPrintSection.html");
break;

1
gtk/help_dlg.h
View File

@ -64,6 +64,7 @@ typedef enum {
HELP_DISPLAY_FILTERS_DIALOG,
HELP_COLORING_RULES_DIALOG,
HELP_CONFIG_PROFILES_DIALOG,
HELP_MANUAL_ADDR_RESOLVE_DIALOG,
HELP_PRINT_DIALOG,
HELP_FIND_DIALOG,
HELP_FILESET_DIALOG,

67
gtk/main.c
View File

@ -499,6 +499,73 @@ selected_ptree_ref_cb(GtkWidget *widget _U_, gpointer data _U_)
}
}
static gboolean
is_address_column (gint column)
{
if (((cfile.cinfo.col_fmt[column] == COL_DEF_SRC) ||
(cfile.cinfo.col_fmt[column] == COL_RES_SRC) ||
(cfile.cinfo.col_fmt[column] == COL_DEF_DST) ||
(cfile.cinfo.col_fmt[column] == COL_RES_DST)) &&
strlen(cfile.cinfo.col_expr.col_expr_val[column]))
{
return TRUE;
}
return FALSE;
}
GList *
get_ip_address_list_from_packet_list_row(gpointer data)
{
gint row = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(data), E_MPACKET_LIST_ROW_KEY));
gint column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(data), E_MPACKET_LIST_COL_KEY));
gint col;
frame_data *fdata;
GList *addr_list = NULL;
int err;
gchar *err_info;
#ifdef NEW_PACKET_LIST
fdata = (frame_data *) new_packet_list_get_row_data(row);
#else
fdata = (frame_data *) packet_list_get_row_data(row);
#endif
if (fdata != NULL) {
epan_dissect_t edt;
if (!wtap_seek_read(cfile.wth, fdata->file_off, &cfile.pseudo_header,
cfile.pd, fdata->cap_len, &err, &err_info))
{
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
cf_read_error_message(err, err_info), cfile.filename);
return NULL;
}
epan_dissect_init(&edt, FALSE, FALSE);
col_custom_prime_edt(&edt, &cfile.cinfo);
epan_dissect_run(&edt, &cfile.pseudo_header, cfile.pd, fdata, &cfile.cinfo);
epan_dissect_fill_in_columns(&edt, TRUE, TRUE);
/* First check selected column */
if (is_address_column (column)) {
addr_list = g_list_append (addr_list, se_strdup_printf("%s", cfile.cinfo.col_expr.col_expr_val[column]));
}
for (col = 0; col < cfile.cinfo.num_cols; col++) {
/* Then check all columns except the selected */
if ((col != column) && (is_address_column (col))) {
addr_list = g_list_append (addr_list, se_strdup_printf("%s", cfile.cinfo.col_expr.col_expr_val[col]));
}
}
epan_dissect_cleanup(&edt);
}
return addr_list;
}
static gchar *
get_filter_from_packet_list_row_and_column(gpointer data)
{

3
gtk/main.h
View File

@ -351,6 +351,9 @@ extern void change_configuration_profile(const gchar *profile_name);
/** redissect packets and update UI */
extern void redissect_packets(void);
/** Fetch all IP addresses from selected row */
extern GList *get_ip_address_list_from_packet_list_row(gpointer data);
extern GtkWidget *pkt_scrollw;
#endif /* __MAIN_H__ */

168
gtk/manual_addr_resolv.c Normal file
View File

@ -0,0 +1,168 @@
/* manual_addr_resolv.c
* Dialog box for manual address resolve
* Copyright 2010 Stig Bjorlykke <stig@bjorlykke.org>
*
* $Id$
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <string.h>
#include <gtk/gtk.h>
#include "epan/addr_resolv.h"
#include "../simple_dialog.h"
#include "gtk/dlg_utils.h"
#include "gtk/gui_utils.h"
#include "gtk/help_dlg.h"
#include "gtk/main.h"
#include "gtk/menus.h"
GtkWidget *man_addr_resolv_dlg = NULL;
static void
man_addr_ill_addr_cb (gpointer dialog _U_, gint btn _U_, gpointer data _U_)
{
gtk_window_present (GTK_WINDOW(man_addr_resolv_dlg));
}
static void
man_addr_resolv_ok (GtkWidget *w _U_, gpointer data _U_)
{
GtkWidget *addr_te, *name_te, *resolv_cb;
const gchar *addr, *name;
gboolean active, redissect = FALSE;
addr_te = g_object_get_data (G_OBJECT(man_addr_resolv_dlg), "address");
name_te = g_object_get_data (G_OBJECT(man_addr_resolv_dlg), "name");
addr = gtk_entry_get_text (GTK_ENTRY (addr_te));
name = gtk_entry_get_text (GTK_ENTRY (name_te));
if (strlen (addr) && strlen (name)) {
if (!add_ip_name_from_string (addr, name)) {
GtkWidget *dialog = simple_dialog (ESD_TYPE_ERROR, ESD_BTN_OK,
"Illegal IP address: \"%s\".", addr);
simple_dialog_set_cb (dialog, man_addr_ill_addr_cb, NULL);
return;
} else {
redissect = TRUE;
}
}
resolv_cb = g_object_get_data (G_OBJECT(man_addr_resolv_dlg), "resolv");
active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resolv_cb));
if (!(g_resolv_flags & RESOLV_NETWORK) && active) {
/* Name resolution for Network Layer activated */
g_resolv_flags |= RESOLV_NETWORK;
menu_name_resolution_changed ();
redissect = TRUE;
}
if (redissect) {
redissect_packets ();
}
window_destroy (man_addr_resolv_dlg);
man_addr_resolv_dlg = NULL;
}
void
manual_addr_resolv_dlg (GtkWidget *w _U_, gpointer data)
{
GtkWidget *vbox, *bbox, *table, *sep;
GtkWidget *ok_bt, *close_bt, *help_bt;
GtkWidget *addr_lb, *addr_cm, *addr_te;
GtkWidget *name_lb, *name_te, *resolv_cb;
GList *addr_list = NULL;
GtkTooltips *tooltips = gtk_tooltips_new();
man_addr_resolv_dlg = dlg_window_new ("Manual Address Resolve");
gtk_window_set_default_size (GTK_WINDOW(man_addr_resolv_dlg), 310, 80);
vbox = gtk_vbox_new (FALSE, 3);
gtk_container_add(GTK_CONTAINER(man_addr_resolv_dlg), vbox);
gtk_container_set_border_width (GTK_CONTAINER(vbox), 6);
table = gtk_table_new (2, 2, FALSE);
gtk_container_add(GTK_CONTAINER(vbox), table);
addr_lb = gtk_label_new("Address:");
gtk_table_attach_defaults (GTK_TABLE (table), addr_lb, 0, 1, 0, 1);
addr_cm = gtk_combo_new();
gtk_combo_disable_activate(GTK_COMBO(addr_cm));
addr_te = GTK_COMBO(addr_cm)->entry;
if (data) {
addr_list = get_ip_address_list_from_packet_list_row(data);
gtk_combo_set_popdown_strings(GTK_COMBO(addr_cm), addr_list);
}
gtk_table_attach_defaults (GTK_TABLE (table), addr_cm, 1, 2, 0, 1);
g_object_set_data (G_OBJECT(man_addr_resolv_dlg), "address", addr_te);
name_lb = gtk_label_new("Name:");
gtk_table_attach_defaults (GTK_TABLE (table), name_lb, 0, 1, 1, 2);
name_te = gtk_entry_new ();
gtk_table_attach_defaults (GTK_TABLE (table), name_te, 1, 2, 1, 2);
g_object_set_data (G_OBJECT(man_addr_resolv_dlg), "name", name_te);
sep = gtk_hseparator_new ();
gtk_container_add (GTK_CONTAINER(vbox), sep);
resolv_cb = gtk_check_button_new_with_mnemonic ("Enable network name resolution");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(resolv_cb), g_resolv_flags & RESOLV_NETWORK);
gtk_widget_set_sensitive (resolv_cb, !(g_resolv_flags & RESOLV_NETWORK));
gtk_tooltips_set_tip (tooltips, resolv_cb, "Perform network layer name resolution.", NULL);
g_object_set_data (G_OBJECT(man_addr_resolv_dlg), "resolv", resolv_cb);
gtk_container_add (GTK_CONTAINER(vbox), resolv_cb);
/* Button row. */
bbox = dlg_button_row_new (GTK_STOCK_OK, GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
gtk_box_pack_end (GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
ok_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_OK);
g_signal_connect (ok_bt, "clicked", G_CALLBACK(man_addr_resolv_ok), NULL);
dlg_set_activate(addr_te, ok_bt);
dlg_set_activate(name_te, ok_bt);
close_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button (man_addr_resolv_dlg, close_bt, window_cancel_button_cb);
help_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_HELP);
g_signal_connect (help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_MANUAL_ADDR_RESOLVE_DIALOG);
gtk_widget_grab_default (ok_bt);
g_signal_connect (man_addr_resolv_dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
if (addr_list) {
/* We have column data, activate name box */
gtk_widget_grab_focus (name_te);
}
gtk_widget_show_all (man_addr_resolv_dlg);
window_present (man_addr_resolv_dlg);
}

26
gtk/manual_addr_resolv.h Normal file
View File

@ -0,0 +1,26 @@
/* manual_addr_resolv.h
* Dialog box for manual address resolve
* Copyright 2010 Stig Bjorlykke <stig@bjorlykke.org>
*
* $Id$
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
void manual_addr_resolv_dlg (GtkWidget *w _U_, gpointer data);

5
gtk/menus.c
View File

@ -93,6 +93,7 @@
#include "gtk/main_welcome.h"
#include "gtk/uat_gui.h"
#include "gtk/gui_utils.h"
#include "gtk/manual_addr_resolv.h"
#ifdef NEW_PACKET_LIST
#include "gtk/new_packet_list.h"
@ -834,6 +835,8 @@ static GtkItemFactoryEntry packet_list_menu_items[] =
#endif /* NEW_PACKET_LIST */
{"/Set Time Reference (toggle)", NULL, GTK_MENU_FUNC(reftime_frame_cb), REFTIME_TOGGLE, "<StockItem>", WIRESHARK_STOCK_TIME,},
{"/<separator>", NULL, NULL, 0, "<Separator>", NULL,},
{"/Manually Resolve Address", NULL, GTK_MENU_FUNC(manual_addr_resolv_dlg), 0, NULL, NULL,},
{"/<separator>", NULL, NULL, 0, "<Separator>", NULL,},
{"/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL,},
@ -2769,6 +2772,8 @@ set_menus_for_selected_packet(capture_file *cf)
cf->current_frame != NULL);
set_menu_sensitivity(packet_list_menu_factory, "/Show Packet in New Window",
cf->current_frame != NULL);
set_menu_sensitivity(packet_list_menu_factory, "/Manually Resolve Address",
cf->current_frame != NULL ? ((cf->edt->pi.ethertype == ETHERTYPE_IP)||(cf->edt->pi.ethertype == ETHERTYPE_IPv6)) : FALSE);
set_menu_sensitivity(packet_list_menu_factory, "/SCTP",
cf->current_frame != NULL ? (cf->edt->pi.ipproto == IP_PROTO_SCTP) : FALSE);
set_menu_sensitivity(main_menu_factory, "/Analyze/Follow TCP Stream",