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

Add PI_DEPRECATED expert info group 

Change-Id: Ibc43b1976d5827e8c40252a5200852fbcd00b70c
Reviewed-on: https://code.wireshark.org/review/16763
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde 2016-07-29 15:00:56 +01:00 committed by João Valverde
parent be16ff5f12
commit 917d34c4de
5 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-ipv6.c
View File

@ -3387,7 +3387,7 @@ proto_register_ipv6(void)
"Wrong options extension header for type", EXPFILL }
},
{ &ei_ipv6_opt_deprecated,
{ "ipv6.opt.deprecated", PI_PROTOCOL, PI_NOTE,
{ "ipv6.opt.deprecated", PI_DEPRECATED, PI_NOTE,
"Option type is deprecated", EXPFILL }
}
};
@ -3445,7 +3445,7 @@ proto_register_ipv6(void)
"Undecoded IPv6 routing header field", EXPFILL }
},
{ &ei_ipv6_routing_deprecated,
{ "ipv6.routing.deprecated", PI_PROTOCOL, PI_NOTE,
{ "ipv6.routing.deprecated", PI_DEPRECATED, PI_NOTE,
"Routing header type is deprecated", EXPFILL }
}
};

1
epan/expert.c
View File

@ -87,6 +87,7 @@ const value_string expert_group_vals[] = {
{ PI_COMMENTS_GROUP, "Comment" },
{ PI_DECRYPTION, "Decryption" },
{ PI_ASSUMPTION, "Assumption" },
{ PI_DEPRECATED, "Deprecated" },
{ 0, NULL }
};

2
epan/proto.h
View File

@ -763,6 +763,8 @@ typedef proto_node proto_item;
#define PI_DECRYPTION 0x0c000000
/** The protocol field has incomplete data, decode based on assumed value */
#define PI_ASSUMPTION 0x0d000000
/** The protocol field has been deprecated, usually PI_NOTE severity */
#define PI_DEPRECATED 0x0e000000
/* add more, see https://wiki.wireshark.org/Development/ExpertInfo */

12
epan/wslua/init_wslua.c
View File

@ -129,6 +129,12 @@ static expert_field ei_lua_proto_comments_note = EI_INIT;
static expert_field ei_lua_proto_comments_warn = EI_INIT;
static expert_field ei_lua_proto_comments_error = EI_INIT;
static expert_field ei_lua_proto_deprecated_comment = EI_INIT;
static expert_field ei_lua_proto_deprecated_chat = EI_INIT;
static expert_field ei_lua_proto_deprecated_note = EI_INIT;
static expert_field ei_lua_proto_deprecated_warn = EI_INIT;
static expert_field ei_lua_proto_deprecated_error = EI_INIT;
dissector_handle_t lua_data_handle;
static gboolean
@ -821,6 +827,12 @@ void wslua_init(register_cb cb, gpointer client_data) {
{ &ei_lua_proto_comments_warn, { "_ws.lua.proto.warning", PI_COMMENTS_GROUP, PI_WARN ,"Protocol Warning", EXPFILL }},
{ &ei_lua_proto_comments_error, { "_ws.lua.proto.error", PI_COMMENTS_GROUP, PI_ERROR ,"Protocol Error", EXPFILL }},
{ &ei_lua_proto_deprecated_comment, { "_ws.lua.proto.comment", PI_DEPRECATED, PI_COMMENT ,"Protocol Comment", EXPFILL }},
{ &ei_lua_proto_deprecated_chat, { "_ws.lua.proto.chat", PI_DEPRECATED, PI_CHAT ,"Protocol Chat", EXPFILL }},
{ &ei_lua_proto_deprecated_note, { "_ws.lua.proto.note", PI_DEPRECATED, PI_NOTE ,"Protocol Note", EXPFILL }},
{ &ei_lua_proto_deprecated_warn, { "_ws.lua.proto.warning", PI_DEPRECATED, PI_WARN ,"Protocol Warning", EXPFILL }},
{ &ei_lua_proto_deprecated_error, { "_ws.lua.proto.error", PI_DEPRECATED, PI_ERROR ,"Protocol Error", EXPFILL }},
/* this one is for reporting errors executing Lua code */
{ &ei_lua_error, { "_ws.lua.error", PI_UNDECODED, PI_ERROR ,"Lua Error", EXPFILL }},
};

1
epan/wslua/wslua_proto_expert.c
View File

@ -95,6 +95,7 @@ WSLUA_CONSTRUCTOR ProtoExpert_new(lua_State* L) {
case PI_SECURITY:
case PI_COMMENTS_GROUP:
case PI_DECRYPTION:
case PI_DEPRECATED:
break;
default:
luaL_argerror(L, WSLUA_ARG_ProtoExpert_new_GROUP, "Group must be one of expert.group.*");