osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Export some more conversation functions. 

They're used by built-in dissectors; I see no reason whatsoever to
forbid plugins from using them.

See

    https://ask.wireshark.org/question/4366/compile-plugin-with-call-to-conversation_set_port2/

Change-Id: I6a04df961c164a09b88abd8f46a1fe3420a21661
Reviewed-on: https://code.wireshark.org/review/28906
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-07-31 14:44:49 -07:00
parent d950b14f26
commit 137bbb2d14
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/libwireshark0.symbols vendored
View File

@ -167,6 +167,8 @@ libwireshark.so.0 libwireshark0 #MINVER#
conversation_pt_to_endpoint_type@Base 2.5.0
conversation_set_dissector@Base 1.9.1
conversation_set_dissector_from_frame_number@Base 2.0.0
conversation_set_port2@Base 2.6.3
conversation_set_addr2@Base 2.6.3
conversation_table_get_num@Base 1.99.0
conversation_table_iterate_tables@Base 1.99.0
conversation_table_set_gui_info@Base 1.99.0
@ -1612,6 +1614,8 @@ libwireshark.so.0 libwireshark0 #MINVER#
tree_expanded@Base 1.12.0~rc1
tree_expanded_set@Base 1.12.0~rc1
try_capture_dissector@Base 2.1.0
try_conversation_dissector@Base 2.6.3
try_conversation_dissector_by_id@Base 2.6.3
try_bytesprefix_to_str@Base 2.3.0
try_bytesval_to_str@Base 2.3.0
try_enterprises_lookup@Base 2.5.0

10
epan/conversation.h
View File

@ -227,19 +227,21 @@ WS_DLL_PUBLIC guint32 conversation_get_endpoint_by_id(struct _packet_info *pinfo
* Our caller is responsible to call the data dissector explicitly in case
* this function returns FALSE.
*/
extern gboolean
WS_DLL_PUBLIC gboolean
try_conversation_dissector(const address *addr_a, const address *addr_b, const endpoint_type etype,
const guint32 port_a, const guint32 port_b, tvbuff_t *tvb, packet_info *pinfo,
proto_tree *tree, void* data, const guint options);
extern gboolean
WS_DLL_PUBLIC gboolean
try_conversation_dissector_by_id(const endpoint_type etype, const guint32 id, tvbuff_t *tvb,
packet_info *pinfo, proto_tree *tree, void* data);
/* These routines are used to set undefined values for a conversation */
extern void conversation_set_port2(conversation_t *conv, const guint32 port);
extern void conversation_set_addr2(conversation_t *conv, const address *addr);
WS_DLL_PUBLIC
void conversation_set_port2(conversation_t *conv, const guint32 port);
WS_DLL_PUBLIC
void conversation_set_addr2(conversation_t *conv, const address *addr);
WS_DLL_PUBLIC
wmem_map_t *get_conversation_hashtable_exact(void);