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

circuit(.h): fix indent (and add modelines) 

Change-Id: I71bb0a8eaf9f5bd34395a4182e4158abaca4ace2
Reviewed-on: https://code.wireshark.org/review/16144
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Alexis La Goutte 2016-06-26 17:19:56 +02:00 committed by Michael Mann
parent 4f2c3ad787
commit 28048a9793
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
epan/circuit.h
View File

@ -39,14 +39,14 @@ typedef struct circuit_key {
} circuit_key; } circuit_key;
typedef struct circuit { typedef struct circuit {
struct circuit *next; /**< pointer to next circuit with given circuit ID */ struct circuit *next; /**< pointer to next circuit with given circuit ID */
guint32 first_frame; /**< # of first frame for that circuit */ guint32 first_frame; /**< # of first frame for that circuit */
guint32 last_frame; /**< # of last frame for that circuit */ guint32 last_frame; /**< # of last frame for that circuit */
guint32 circuit_index; /**< unique ID for circuit */ guint32 circuit_index; /**< unique ID for circuit */
GSList *data_list; /**< list of data associated with circuit */ GSList *data_list; /**< list of data associated with circuit */
dissector_handle_t dissector_handle; /**< handle for protocol dissector client associated with circuit */ dissector_handle_t dissector_handle; /**< handle for protocol dissector client associated with circuit */
guint options; /**< wildcard flags */ guint options; /**< wildcard flags */
circuit_key *key_ptr; /**< pointer to the key for this circuit */ circuit_key *key_ptr; /**< pointer to the key for this circuit */
} circuit_t; } circuit_t;
/** /**
@ -64,16 +64,14 @@ extern void circuit_init(void);
* Given a circuit type and circuit ID for a packet, create a new circuit * Given a circuit type and circuit ID for a packet, create a new circuit
* to contain packets for that circuit. * to contain packets for that circuit.
*/ */
WS_DLL_PUBLIC circuit_t *circuit_new(circuit_type ctype, guint32 circuit_id, WS_DLL_PUBLIC circuit_t *circuit_new(circuit_type ctype, guint32 circuit_id, guint32 first_frame);
guint32 first_frame);
/** /**
* Given a circuit type and ID, and a frame number, search for a circuit with * Given a circuit type and ID, and a frame number, search for a circuit with
* that type and ID whose range of frames includes that frame number. * that type and ID whose range of frames includes that frame number.
* Returns NULL if not found. * Returns NULL if not found.
*/ */
WS_DLL_PUBLIC circuit_t *find_circuit(circuit_type ctype, guint32 circuit_id, WS_DLL_PUBLIC circuit_t *find_circuit(circuit_type ctype, guint32 circuit_id, guint32 frame);
guint32 frame);
/** /**
* Set the last frame of a circuit, if it's not already known, * Set the last frame of a circuit, if it's not already known,
@ -81,13 +79,11 @@ WS_DLL_PUBLIC circuit_t *find_circuit(circuit_type ctype, guint32 circuit_id,
*/ */
extern void close_circuit(circuit_t *circuit, guint32 last_frame); extern void close_circuit(circuit_t *circuit, guint32 last_frame);
WS_DLL_PUBLIC void circuit_add_proto_data(circuit_t *conv, int proto, WS_DLL_PUBLIC void circuit_add_proto_data(circuit_t *conv, int proto, void *proto_data);
void *proto_data);
WS_DLL_PUBLIC void *circuit_get_proto_data(circuit_t *conv, int proto); WS_DLL_PUBLIC void *circuit_get_proto_data(circuit_t *conv, int proto);
void circuit_delete_proto_data(circuit_t *conv, int proto); void circuit_delete_proto_data(circuit_t *conv, int proto);
extern void circuit_set_dissector(circuit_t *circuit, extern void circuit_set_dissector(circuit_t *circuit, dissector_handle_t handle);
dissector_handle_t handle);
extern dissector_handle_t circuit_get_dissector(circuit_t *circuit); extern dissector_handle_t circuit_get_dissector(circuit_t *circuit);
/** /**
@ -96,11 +92,23 @@ extern dissector_handle_t circuit_get_dissector(circuit_t *circuit);
* call that dissector and return TRUE, otherwise return FALSE. * call that dissector and return TRUE, otherwise return FALSE.
*/ */
extern gboolean extern gboolean
try_circuit_dissector(circuit_type ctype, guint32 circuit_id, guint32 frame, try_circuit_dissector(circuit_type ctype, guint32 circuit_id, guint32 frame, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data);
tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* circuit.h */ #endif /* circuit.h */
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 8
* tab-width: 8
* indent-tabs-mode: t
* End:
*
* vi: set shiftwidth=8 tabstop=8 noexpandtab:
* :indentSize=8:tabSize=8:noTabs=false:
*/