aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gadu-gadu.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-08-20 14:46:37 -0700
committerGuy Harris <guy@alum.mit.edu>2014-08-20 21:47:02 +0000
commit2afb736a43290efc0dab686f96fd011017815f85 (patch)
treefdfd6ab5c8d6dc360ec15abb81385b2888dcf9e5 /epan/dissectors/packet-gadu-gadu.c
parent74e75c5c5f40b05fba45c8f3f988dfb1ca3077d5 (diff)
Sort hfi[] to match the definitions, and add a missing entry that found.
Sorting them to match the definitions of the hfi variables makes it easier to compare the two lists. Comparing the lists found a missing entry; add it. Change-Id: I3517667336b1355195c5a227f0d02f1740a7c4cd Reviewed-on: https://code.wireshark.org/review/3757 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-gadu-gadu.c')
-rw-r--r--epan/dissectors/packet-gadu-gadu.c30
1 files changed, 16 insertions, 14 deletions
diff --git a/epan/dissectors/packet-gadu-gadu.c b/epan/dissectors/packet-gadu-gadu.c
index 649473cf22..dbd34b4170 100644
--- a/epan/dissectors/packet-gadu-gadu.c
+++ b/epan/dissectors/packet-gadu-gadu.c
@@ -2028,6 +2028,7 @@ proto_register_gadu_gadu(void)
&hfi_gadu_gadu_userdata_attr_name,
&hfi_gadu_gadu_userdata_attr_type,
&hfi_gadu_gadu_userdata_attr_value,
+ /* Typing notify */
&hfi_gadu_gadu_typing_notify_type,
&hfi_gadu_gadu_typing_notify_uin,
/* Message common */
@@ -2041,10 +2042,10 @@ proto_register_gadu_gadu(void)
/* GG_RECV_MSG80, GG_SEND_MSG80 */
&hfi_gadu_gadu_msg80_offset_plain,
&hfi_gadu_gadu_msg80_offset_attr,
- /* Contact (notify) common */
- &hfi_gadu_gadu_contact_uin,
- &hfi_gadu_gadu_contact_uin_str,
- &hfi_gadu_gadu_contact_type,
+ /* GG_SEND_MSG_ACK */
+ &hfi_gadu_gadu_msg_ack_status,
+ &hfi_gadu_gadu_msg_ack_recipient,
+ &hfi_gadu_gadu_msg_ack_seq,
/* Status common */
&hfi_gadu_gadu_status_uin,
&hfi_gadu_gadu_status_status,
@@ -2053,6 +2054,12 @@ proto_register_gadu_gadu(void)
&hfi_gadu_gadu_status_version,
&hfi_gadu_gadu_status_img_size,
&hfi_gadu_gadu_status_descr,
+ /* Direct Connection */
+ &hfi_dcc_type,
+ &hfi_dcc_id,
+ &hfi_dcc_uin_to,
+ &hfi_dcc_uin_from,
+ &hfi_dcc_filename,
/* New status (setting status) common */
&hfi_gadu_gadu_new_status_status,
&hfi_gadu_gadu_new_status_desc,
@@ -2061,12 +2068,7 @@ proto_register_gadu_gadu(void)
&hfi_gadu_gadu_userlist_version,
&hfi_gadu_gadu_userlist_format,
&hfi_gadu_gadu_userlist_reply_type,
- /* Direct Connection */
- &hfi_dcc_type,
- &hfi_dcc_id,
- &hfi_dcc_uin_to,
- &hfi_dcc_uin_from,
- &hfi_dcc_filename,
+ &hfi_gadu_gadu_userlist,
/* Public Directory */
&hfi_gadu_gadu_pubdir_request_type,
&hfi_gadu_gadu_pubdir_request_seq,
@@ -2074,12 +2076,12 @@ proto_register_gadu_gadu(void)
&hfi_gadu_gadu_pubdir_reply_type,
&hfi_gadu_gadu_pubdir_reply_seq,
&hfi_gadu_gadu_pubdir_reply_str,
+ /* Contact (notify) common */
+ &hfi_gadu_gadu_contact_uin,
+ &hfi_gadu_gadu_contact_uin_str,
+ &hfi_gadu_gadu_contact_type,
/* GG_WELCOME */
&hfi_gadu_gadu_welcome_seed,
- /* GG_SEND_MSG_ACK */
- &hfi_gadu_gadu_msg_ack_status,
- &hfi_gadu_gadu_msg_ack_recipient,
- &hfi_gadu_gadu_msg_ack_seq,
/* Not dissected data */
&hfi_gadu_gadu_data,
};