UDP: Fix indentation and convert to 4-space
This commit is contained in:
João Valverde
parent
3d369c01cc
commit
95b7c4fd28
|
|
@ -2074,9 +2074,6 @@ indent_size = tab
|
|||
indent_style = tab
|
||||
indent_size = tab
|
||||
|
||||
[packet-udp.[ch]]
|
||||
indent_size = 2
|
||||
|
||||
[packet-udt.[ch]]
|
||||
indent_style = tab
|
||||
indent_size = tab
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -21,66 +21,66 @@ extern "C" {
|
|||
|
||||
/* UDP structs and definitions */
|
||||
typedef struct _e_udphdr {
|
||||
guint16 uh_sport;
|
||||
guint16 uh_dport;
|
||||
guint32 uh_ulen;
|
||||
guint32 uh_sum_cov;
|
||||
guint16 uh_sum;
|
||||
guint32 uh_stream; /* this stream index field is included to help differentiate when address/port pairs are reused */
|
||||
address ip_src;
|
||||
address ip_dst;
|
||||
guint16 uh_sport;
|
||||
guint16 uh_dport;
|
||||
guint32 uh_ulen;
|
||||
guint32 uh_sum_cov;
|
||||
guint16 uh_sum;
|
||||
guint32 uh_stream; /* this stream index field is included to help differentiate when address/port pairs are reused */
|
||||
address ip_src;
|
||||
address ip_dst;
|
||||
} e_udphdr;
|
||||
|
||||
/* Conversation and process structures originally copied from packet-tcp.c */
|
||||
typedef struct _udp_flow_t {
|
||||
/* Process info, currently discovered via IPFIX */
|
||||
guint32 process_uid; /* UID of local process */
|
||||
guint32 process_pid; /* PID of local process */
|
||||
gchar *username; /* Username of the local process */
|
||||
gchar *command; /* Local process name + path + args */
|
||||
/* Process info, currently discovered via IPFIX */
|
||||
guint32 process_uid; /* UID of local process */
|
||||
guint32 process_pid; /* PID of local process */
|
||||
gchar *username; /* Username of the local process */
|
||||
gchar *command; /* Local process name + path + args */
|
||||
} udp_flow_t;
|
||||
|
||||
struct udp_analysis {
|
||||
/* These two structs are managed based on comparing the source
|
||||
* and destination addresses and, if they're equal, comparing
|
||||
* the source and destination ports.
|
||||
*
|
||||
* If the source is greater than the destination, then stuff
|
||||
* sent from src is in ual1.
|
||||
*
|
||||
* If the source is less than the destination, then stuff
|
||||
* sent from src is in ual2.
|
||||
*
|
||||
* XXX - if the addresses and ports are equal, we don't guarantee
|
||||
* the behavior.
|
||||
*/
|
||||
udp_flow_t flow1;
|
||||
udp_flow_t flow2;
|
||||
/* These two structs are managed based on comparing the source
|
||||
* and destination addresses and, if they're equal, comparing
|
||||
* the source and destination ports.
|
||||
*
|
||||
* If the source is greater than the destination, then stuff
|
||||
* sent from src is in ual1.
|
||||
*
|
||||
* If the source is less than the destination, then stuff
|
||||
* sent from src is in ual2.
|
||||
*
|
||||
* XXX - if the addresses and ports are equal, we don't guarantee
|
||||
* the behavior.
|
||||
*/
|
||||
udp_flow_t flow1;
|
||||
udp_flow_t flow2;
|
||||
|
||||
/* These pointers are set by get_udp_conversation_data()
|
||||
* fwd point in the same direction as the current packet
|
||||
* and rev in the reverse direction
|
||||
*/
|
||||
udp_flow_t *fwd;
|
||||
udp_flow_t *rev;
|
||||
/* These pointers are set by get_udp_conversation_data()
|
||||
* fwd point in the same direction as the current packet
|
||||
* and rev in the reverse direction
|
||||
*/
|
||||
udp_flow_t *fwd;
|
||||
udp_flow_t *rev;
|
||||
|
||||
/* Keep track of udp stream numbers instead of using the conversation
|
||||
* index (as how it was done before). This prevents gaps in the
|
||||
* stream index numbering
|
||||
*/
|
||||
guint32 stream;
|
||||
/* Keep track of udp stream numbers instead of using the conversation
|
||||
* index (as how it was done before). This prevents gaps in the
|
||||
* stream index numbering
|
||||
*/
|
||||
guint32 stream;
|
||||
|
||||
/* Remember the timestamp of the first frame seen in this udp
|
||||
* conversation to be able to calculate a relative time compared
|
||||
* to the start of this conversation
|
||||
*/
|
||||
nstime_t ts_first;
|
||||
/* Remember the timestamp of the first frame seen in this udp
|
||||
* conversation to be able to calculate a relative time compared
|
||||
* to the start of this conversation
|
||||
*/
|
||||
nstime_t ts_first;
|
||||
|
||||
/* Remember the timestamp of the frame that was last seen in this
|
||||
* udp conversation to be able to calculate a delta time compared
|
||||
* to previous frame in this conversation
|
||||
*/
|
||||
nstime_t ts_prev;
|
||||
/* Remember the timestamp of the frame that was last seen in this
|
||||
* udp conversation to be able to calculate a delta time compared
|
||||
* to previous frame in this conversation
|
||||
*/
|
||||
nstime_t ts_prev;
|
||||
};
|
||||
|
||||
/** Associate process information with a given flow
|
||||
|
|
@ -95,19 +95,26 @@ struct udp_analysis {
|
|||
* @param username Ephemeral string containing the full or partial process name
|
||||
* @param command Ephemeral string containing the full or partial process name
|
||||
*/
|
||||
extern void add_udp_process_info(guint32 frame_num, address *local_addr, address *remote_addr, guint16 local_port, guint16 remote_port, guint32 uid, guint32 pid, gchar *username, gchar *command);
|
||||
extern void
|
||||
add_udp_process_info(guint32 frame_num, address *local_addr, address *remote_addr,
|
||||
guint16 local_port, guint16 remote_port,
|
||||
guint32 uid, guint32 pid,
|
||||
gchar *username, gchar *command);
|
||||
|
||||
/** Get the current number of UDP streams
|
||||
*
|
||||
* @return The number of UDP streams
|
||||
*/
|
||||
WS_DLL_PUBLIC guint32 get_udp_stream_count(void);
|
||||
WS_DLL_PUBLIC guint32
|
||||
get_udp_stream_count(void);
|
||||
|
||||
WS_DLL_PUBLIC void decode_udp_ports(tvbuff_t *, int, packet_info *,
|
||||
proto_tree *, int, int, int);
|
||||
WS_DLL_PUBLIC void
|
||||
decode_udp_ports(tvbuff_t *, int, packet_info *,
|
||||
proto_tree *, int, int, int);
|
||||
|
||||
WS_DLL_PUBLIC struct udp_analysis *get_udp_conversation_data(conversation_t *,
|
||||
packet_info *);
|
||||
WS_DLL_PUBLIC struct udp_analysis *
|
||||
get_udp_conversation_data(conversation_t *,
|
||||
packet_info *);
|
||||
|
||||
/*
|
||||
* Loop for dissecting PDUs within a UDP packet; Similar to tcp_dissect_pdus,
|
||||
|
|
@ -129,9 +136,10 @@ WS_DLL_PUBLIC struct udp_analysis *get_udp_conversation_data(conversation_t *,
|
|||
*/
|
||||
WS_DLL_PUBLIC int
|
||||
udp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
||||
guint fixed_len, gboolean (*heuristic_check)(packet_info *, tvbuff_t *, int, void*),
|
||||
guint (*get_pdu_len)(packet_info *, tvbuff_t *, int, void*),
|
||||
dissector_t dissect_pdu, void* dissector_data);
|
||||
guint fixed_len,
|
||||
gboolean (*heuristic_check)(packet_info *, tvbuff_t *, int, void*),
|
||||
guint (*get_pdu_len)(packet_info *, tvbuff_t *, int, void*),
|
||||
dissector_t dissect_pdu, void* dissector_data);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue