From 800b26edbe34e135cc9be1d4395db2c13ae1213f Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sat, 11 Nov 2017 17:16:13 -0500 Subject: Remove circuit API Replace with conversation API that limits the "endpoint" to a single uint32 value. The intention is to eventually have "layered" endpoints, because circuit_id was used in cases where src/dest port have already been populated (and are used for layers above). Those src/dest ports should just be treated as just another endpoint, but we currently only have support for one. Change-Id: Ic6aa7ef0241275aa4dfde9459194369b48c72960 Reviewed-on: https://code.wireshark.org/review/24369 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/wslua/wslua_pinfo.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'epan/wslua') diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c index 3ce89e75be..7e96f4a223 100644 --- a/epan/wslua/wslua_pinfo.c +++ b/epan/wslua/wslua_pinfo.c @@ -238,10 +238,6 @@ WSLUA_ATTRIBUTE_BLOCK_NUMBER_GETTER(Pinfo,delta_ts,lua_delta_nstime_to_sec(obj, /* WSLUA_ATTRIBUTE Pinfo_delta_dis_ts RO Number of seconds passed since the last displayed packet. */ WSLUA_ATTRIBUTE_BLOCK_NUMBER_GETTER(Pinfo,delta_dis_ts,lua_delta_nstime_to_sec(obj, obj->ws_pinfo->fd, obj->ws_pinfo->fd->prev_dis_num)); -/* WSLUA_ATTRIBUTE Pinfo_circuit_id RW For circuit based protocols. */ -PINFO_NUMBER_GETTER(circuit_id); -PINFO_NUMBER_SETTER(circuit_id,guint32); - /* WSLUA_ATTRIBUTE Pinfo_curr_proto RO Which Protocol are we dissecting. */ WSLUA_ATTRIBUTE_NAMED_STRING_GETTER(Pinfo,curr_proto,ws_pinfo->current_proto); @@ -456,7 +452,6 @@ WSLUA_ATTRIBUTES Pinfo_attributes[] = { WSLUA_ATTRIBUTE_ROREG(Pinfo,port_type), WSLUA_ATTRIBUTE_RWREG(Pinfo,src_port), WSLUA_ATTRIBUTE_RWREG(Pinfo,dst_port), - WSLUA_ATTRIBUTE_RWREG(Pinfo,circuit_id), WSLUA_ATTRIBUTE_ROREG(Pinfo,match), WSLUA_ATTRIBUTE_ROREG(Pinfo,curr_proto), WSLUA_ATTRIBUTE_ROREG(Pinfo,columns), -- cgit v1.2.3