Skip to content

Commit

Permalink
Merge branch 'master' of github.com:tobras/wireshark_doip
Browse files Browse the repository at this point in the history
  • Loading branch information
tobbe committed Jan 3, 2018
2 parents 1cbe6de + 180adea commit ce4865e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion plugins/doip/packet-doip.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ static void dissect_doip_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
}

// determine PDU length of protocol DoIP
static guint get_doip_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *p)
static guint get_doip_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *p _U_)
{
const guint DOIP_HEADER_LEN = 8;
return (guint)tvb_get_ntohl(tvb, offset+4) + DOIP_HEADER_LEN; // length is at offset 4 and is 4 bytes
Expand Down
2 changes: 1 addition & 1 deletion plugins/uds/packet-uds.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ gint add_header(proto_tree *uds_tree, tvbuff_t *tvb)
}

/* Uds protocol dissector */
static int dissect_uds_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
static int dissect_uds_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
gint offset = 0;
guint8 service = 0;
Expand Down
4 changes: 2 additions & 2 deletions plugins/uds/request_download.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ static const value_string compression_encrypting[] = {
{ 0, NULL }
};

gint add_request_download_fields(proto_tree *uds_tree, packet_info *pinfo, tvbuff_t *tvb, gint offset)
gint add_request_download_fields(proto_tree *uds_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint offset)
{
//guint8 data_format = tvb_get_guint8(tvb, offset);
guint8 length_address_format = tvb_get_guint8(tvb, offset + 1);
Expand All @@ -44,7 +44,7 @@ gint add_request_download_fields(proto_tree *uds_tree, packet_info *pinfo, tvbuf
}


gint add_request_download_response_fields(proto_tree *uds_tree, packet_info *pinfo, tvbuff_t *tvb, gint offset)
gint add_request_download_response_fields(proto_tree *uds_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint offset)
{

guint8 length_address_format = tvb_get_guint8(tvb, offset);
Expand Down
4 changes: 2 additions & 2 deletions plugins/uds/request_transfer_exit.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ static int hf_parameters = -1;

static int hf_parameters_response = -1;

gint add_request_transfer_exit_fields(proto_tree *uds_tree, packet_info *pinfo, tvbuff_t *tvb, gint offset)
gint add_request_transfer_exit_fields(proto_tree *uds_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint offset)
{
gint remaining = 0;

Expand All @@ -29,7 +29,7 @@ gint add_request_transfer_exit_fields(proto_tree *uds_tree, packet_info *pinfo,
}


gint add_request_transfer_exit_response_fields(proto_tree *uds_tree, packet_info *pinfo, tvbuff_t *tvb, gint offset)
gint add_request_transfer_exit_response_fields(proto_tree *uds_tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint offset)
{
gint remaining = 0;

Expand Down

0 comments on commit ce4865e

Please sign in to comment.