From 2ab0496a7204c1bb149bd95bdb0644a565ec5270 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Mon, 20 Jun 2005 20:14:22 +0000 Subject: From Mike Duigou: In order to get filtering of conversations and > endpoints to work from the endpoints and conversations windows I found > it necessary to add a new AT_URI address type and a SAT_JXTA. This also > necessitated a change to to_str.c to avoid a buffer overflow problem. > Please review these changes carefully. > > Also includes some changes to the jxta dissector to fix filtering on > generated fields and some changes to the types used for ints/unsigned ints. > > Fixes a bug with the processing of messages containing namespaces. svn path=/trunk/; revision=14714 --- gtk/conversations_table.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gtk/conversations_table.c') diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c index 624ebfbdaa..acf82cf01c 100644 --- a/gtk/conversations_table.c +++ b/gtk/conversations_table.c @@ -114,7 +114,10 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam return "fddi.src"; case SAT_TOKENRING: return "tr.src"; + default: + ; } + break; case AT_IPv4: return "ip.src"; case AT_IPv6: @@ -123,9 +126,18 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam return "ipx.src"; case AT_FC: return "fc.s_id"; + case AT_URI: + switch(specific_addr_type){ + case SAT_JXTA: + return "jxta.message.src"; + default: + ; + } + break; default: ; } + break; case FN_DST_ADDRESS: switch(addr->type){ case AT_ETHER: @@ -136,7 +148,10 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam return "fddi.dst"; case SAT_TOKENRING: return "tr.dst"; + default: + ; } + break; case AT_IPv4: return "ip.dst"; case AT_IPv6: @@ -145,9 +160,18 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam return "ipx.dst"; case AT_FC: return "fc.d_id"; + case AT_URI: + switch(specific_addr_type){ + case SAT_JXTA: + return "jxta.message.dst"; + default: + ; + } + break; default: ; } + break; case FN_ANY_ADDRESS: switch(addr->type){ case AT_ETHER: @@ -158,7 +182,10 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam return "fddi.addr"; case SAT_TOKENRING: return "tr.addr"; + default: + break; } + break; case AT_IPv4: return "ip.addr"; case AT_IPv6: @@ -167,15 +194,26 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam return "ipx.addr"; case AT_FC: return "fc.id"; + case AT_URI: + switch(specific_addr_type){ + case SAT_JXTA: + return "jxta.message.address"; + default: + ; + } + break; default: ; } + break; case FN_SRC_PORT: switch(port_type){ case PT_TCP: return "tcp.srcport"; case PT_UDP: return "udp.srcport"; + default: + ; } break; case FN_DST_PORT: @@ -184,6 +222,8 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam return "tcp.dstport"; case PT_UDP: return "udp.dstport"; + default: + ; } break; case FN_ANY_PORT: @@ -192,6 +232,8 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam return "tcp.port"; case PT_UDP: return "udp.port"; + default: + ; } break; } -- cgit v1.2.3