forked from osmocom/wireshark
From Clif Bratcher:
Support for IPv6 in the Conversations window. Add IPv6 tab to the Endpoints window svn path=/trunk/; revision=31231
This commit is contained in:
Jaap Keuter
parent
1e9498cf25
commit
0209b3014d
|
|
@ -144,6 +144,7 @@ WIRESHARK_TAP_SRC = \
|
|||
conversations_fc.c \
|
||||
conversations_fddi.c \
|
||||
conversations_ip.c \
|
||||
conversations_ipv6.c \
|
||||
conversations_ipx.c \
|
||||
conversations_jxta.c \
|
||||
conversations_ncp.c \
|
||||
|
|
@ -171,6 +172,7 @@ WIRESHARK_TAP_SRC = \
|
|||
hostlist_fc.c \
|
||||
hostlist_fddi.c \
|
||||
hostlist_ip.c \
|
||||
hostlist_ipv6.c \
|
||||
hostlist_ipx.c \
|
||||
hostlist_jxta.c \
|
||||
hostlist_ncp.c \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,99 @@
|
|||
/* conversations_ipv6.c 2009 Clif Bratcher
|
||||
* Modified from conversations_ip 2003 Ronnie Sahlberg
|
||||
*
|
||||
* $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/packet.h>
|
||||
#include <epan/stat_cmd_args.h>
|
||||
#include <epan/tap.h>
|
||||
#include <epan/dissectors/packet-ipv6.h>
|
||||
|
||||
#include "../stat_menu.h"
|
||||
#include "../register.h"
|
||||
|
||||
#include "gtk/gui_stat_menu.h"
|
||||
#include "gtk/conversations_table.h"
|
||||
|
||||
|
||||
static int
|
||||
ipv6_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
|
||||
{
|
||||
const struct ip6_hdr *ip6h = vip;
|
||||
address src;
|
||||
address dst;
|
||||
|
||||
/* Addresses aren't implemented as 'address' type in struct ip6_hdr */
|
||||
src.type = dst.type = AT_IPv6;
|
||||
src.len = dst.len = sizeof(struct e_in6_addr);
|
||||
src.data = &ip6h->ip6_src;
|
||||
dst.data = &ip6h->ip6_dst;
|
||||
|
||||
add_conversation_table_data((conversations_table *)pct, &src, &dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->fd->rel_ts, SAT_NONE, PT_NONE);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
ipv6_conversation_init(const char *optarg, void *userdata _U_)
|
||||
{
|
||||
const char *filter=NULL;
|
||||
|
||||
if(!strncmp(optarg, "conv,ipv6,", 10)) {
|
||||
filter = optarg + 10;
|
||||
}
|
||||
else {
|
||||
filter = NULL;
|
||||
}
|
||||
|
||||
init_conversation_table(TRUE, "IPv6", "ipv6", filter, ipv6_conversation_packet);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
ipv6_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||
{
|
||||
ipv6_conversation_init("conv,ipv6", NULL);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
register_tap_listener_ipv6_conversation(void)
|
||||
{
|
||||
register_stat_cmd_arg("conv,ipv6", ipv6_conversation_init, NULL);
|
||||
|
||||
register_stat_menu_item("IPv6", REGISTER_STAT_GROUP_CONVERSATION_LIST,
|
||||
ipv6_endpoints_cb, NULL, NULL, NULL);
|
||||
|
||||
register_conversation_table(TRUE, "IPv6", "ipv6", NULL /*filter*/, ipv6_conversation_packet);
|
||||
}
|
||||
|
|
@ -0,0 +1,103 @@
|
|||
/* hostlist_ipv6.c 2009 Clif Bratcher
|
||||
* Modified from hostlist_ip.c 2004 Ian Schorr
|
||||
* modified from endpoint_talkers_ip.c 2003 Ronnie Sahlberg
|
||||
*
|
||||
* $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
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
# include <sys/types.h>
|
||||
#endif
|
||||
#include <string.h>
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include "epan/packet.h"
|
||||
#include <epan/stat_cmd_args.h>
|
||||
#include <epan/tap.h>
|
||||
#include <epan/dissectors/packet-ipv6.h>
|
||||
|
||||
#include "../stat_menu.h"
|
||||
#include "../register.h"
|
||||
|
||||
#include "gtk/gui_stat_menu.h"
|
||||
#include "gtk/hostlist_table.h"
|
||||
|
||||
|
||||
static int
|
||||
ipv6_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
|
||||
{
|
||||
hostlist_table *hosts = (hostlist_table *)pit;
|
||||
const struct ip6_hdr *ip6h = vip;
|
||||
address src;
|
||||
address dst;
|
||||
|
||||
/* Addresses aren't implemented as 'address' type in struct ip6_hdr */
|
||||
src.type = dst.type = AT_IPv6;
|
||||
src.len = dst.len = sizeof(struct e_in6_addr);
|
||||
src.data = &ip6h->ip6_src;
|
||||
dst.data = &ip6h->ip6_dst;
|
||||
|
||||
add_hostlist_table_data(hosts, &src, 0, TRUE, 1, pinfo->fd->pkt_len, SAT_NONE, PT_NONE);
|
||||
add_hostlist_table_data(hosts, &dst, 0, FALSE, 1, pinfo->fd->pkt_len, SAT_NONE, PT_NONE);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
gtk_ipv6_hostlist_init(const char *optarg, void* userdata _U_)
|
||||
{
|
||||
const char *filter=NULL;
|
||||
|
||||
if(!strncmp(optarg,"hosts,ipv6,",10)){
|
||||
filter = optarg + 10;
|
||||
} else {
|
||||
filter = NULL;
|
||||
}
|
||||
|
||||
init_hostlist_table(TRUE, "IPv6", "ipv6", filter, ipv6_hostlist_packet);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
gtk_ipv6_hostlist_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||
{
|
||||
gtk_ipv6_hostlist_init("hosts,ipv6", NULL);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
register_tap_listener_ipv6_hostlist(void)
|
||||
{
|
||||
register_stat_cmd_arg("hosts,ipv6", gtk_ipv6_hostlist_init, NULL);
|
||||
|
||||
register_stat_menu_item("IPv6", REGISTER_STAT_GROUP_ENDPOINT_LIST,
|
||||
gtk_ipv6_hostlist_cb, NULL, NULL, NULL);
|
||||
|
||||
register_hostlist_table(TRUE, "IPv6", "ipv6", NULL /*filter*/, ipv6_hostlist_packet);
|
||||
}
|
||||
Loading…
Reference in New Issue