Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 136 insertions, 136 deletions

diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c
index ab648bcb..40cc1c48 100644
--- a/epan/dissectors/packet-slsk.c
+++ b/epan/dissectors/packet-slsk.c
@@ -31,115 +31,115 @@ void proto_reg_handoff_slsk(void);
 static dissector_handle_t slsk_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_slsk = -1;
-
-static int hf_slsk_integer = -1;
-static int hf_slsk_string = -1;
-static int hf_slsk_byte = -1;
-static int hf_slsk_message_length = -1;
-static int hf_slsk_message_code = -1;
-static int hf_slsk_embedded_message_type = -1;
-static int hf_slsk_client_ip = -1;
-/* static int hf_slsk_server_ip = -1; */
-static int hf_slsk_directory_name = -1;
-static int hf_slsk_username = -1;
-static int hf_slsk_password = -1;
-static int hf_slsk_version = -1;
-static int hf_slsk_login_successful = -1;
-static int hf_slsk_login_message = -1;
-static int hf_slsk_port = -1;
-static int hf_slsk_ip = -1;
-static int hf_slsk_user_exists = -1;
-static int hf_slsk_status_code = -1;
-static int hf_slsk_room = -1;
-static int hf_slsk_chat_message = -1;
-static int hf_slsk_users_in_room = -1;
-static int hf_slsk_token = -1;
-static int hf_slsk_connection_type = -1;
-static int hf_slsk_chat_message_id = -1;
-static int hf_slsk_timestamp = -1;
-static int hf_slsk_search_text = -1;
-static int hf_slsk_folder_count = -1;
-static int hf_slsk_file_count = -1;
-static int hf_slsk_average_speed = -1;
-static int hf_slsk_download_number = -1;
-static int hf_slsk_files = -1;
-static int hf_slsk_directories = -1;
-static int hf_slsk_slotsfull = -1;
-static int hf_slsk_place_in_queue = -1;
-static int hf_slsk_number_of_rooms = -1;
-static int hf_slsk_filename = -1;
-static int hf_slsk_filename_ext = -1;
-static int hf_slsk_directory = -1;
-static int hf_slsk_size = -1;
-/* static int hf_slsk_checksum = -1; */
-static int hf_slsk_code = -1;
-static int hf_slsk_number_of_users = -1;
-static int hf_slsk_number_of_days = -1;
-static int hf_slsk_transfer_direction = -1;
-static int hf_slsk_user_description = -1;
-static int hf_slsk_picture_exists = -1;
-static int hf_slsk_picture = -1;
-/* static int hf_slsk_user_uploads = -1; */
-static int hf_slsk_total_uploads = -1;
-static int hf_slsk_queued_uploads = -1;
-static int hf_slsk_slots_available = -1;
-static int hf_slsk_allowed = -1;
-static int hf_slsk_compr_packet = -1;
-static int hf_slsk_parent_min_speed = -1;
-static int hf_slsk_parent_speed_connection_ratio = -1;
-static int hf_slsk_seconds_parent_inactivity_before_disconnect = -1;
-static int hf_slsk_seconds_server_inactivity_before_disconnect = -1;
-static int hf_slsk_nodes_in_cache_before_disconnect = -1;
-static int hf_slsk_seconds_before_ping_children = -1;
-static int hf_slsk_recommendation = -1;
-static int hf_slsk_user = -1;
-static int hf_slsk_ranking = -1;
-static int hf_slsk_compressed_packet_length = -1;
-static int hf_slsk_uncompressed_packet_length = -1;
-static int hf_slsk_num_directories = -1;
-static int hf_slsk_upload_speed = -1;
-static int hf_slsk_in_queue = -1;
-static int hf_slsk_num_slotsfull_records = -1;
-static int hf_slsk_num_recommendations = -1;
-static int hf_slsk_num_files = -1;
-static int hf_slsk_num_strings = -1;
-static int hf_slsk_file_code = -1;
-static int hf_slsk_file_size1 = -1;
-static int hf_slsk_file_size2 = -1;
-static int hf_slsk_file_num_attributes = -1;
-static int hf_slsk_file_attribute_type = -1;
-static int hf_slsk_file_attribute_value = -1;
-static int hf_slsk_free_upload_slots = -1;
-static int hf_slsk_bytes = -1;
-static int hf_slsk_same_recommendation = -1;
-static int hf_slsk_number_of_priv_users = -1;
-static int hf_slsk_num_parent_address = -1;
+static int proto_slsk;
+
+static int hf_slsk_integer;
+static int hf_slsk_string;
+static int hf_slsk_byte;
+static int hf_slsk_message_length;
+static int hf_slsk_message_code;
+static int hf_slsk_embedded_message_type;
+static int hf_slsk_client_ip;
+/* static int hf_slsk_server_ip; */
+static int hf_slsk_directory_name;
+static int hf_slsk_username;
+static int hf_slsk_password;
+static int hf_slsk_version;
+static int hf_slsk_login_successful;
+static int hf_slsk_login_message;
+static int hf_slsk_port;
+static int hf_slsk_ip;
+static int hf_slsk_user_exists;
+static int hf_slsk_status_code;
+static int hf_slsk_room;
+static int hf_slsk_chat_message;
+static int hf_slsk_users_in_room;
+static int hf_slsk_token;
+static int hf_slsk_connection_type;
+static int hf_slsk_chat_message_id;
+static int hf_slsk_timestamp;
+static int hf_slsk_search_text;
+static int hf_slsk_folder_count;
+static int hf_slsk_file_count;
+static int hf_slsk_average_speed;
+static int hf_slsk_download_number;
+static int hf_slsk_files;
+static int hf_slsk_directories;
+static int hf_slsk_slotsfull;
+static int hf_slsk_place_in_queue;
+static int hf_slsk_number_of_rooms;
+static int hf_slsk_filename;
+static int hf_slsk_filename_ext;
+static int hf_slsk_directory;
+static int hf_slsk_size;
+/* static int hf_slsk_checksum; */
+static int hf_slsk_code;
+static int hf_slsk_number_of_users;
+static int hf_slsk_number_of_days;
+static int hf_slsk_transfer_direction;
+static int hf_slsk_user_description;
+static int hf_slsk_picture_exists;
+static int hf_slsk_picture;
+/* static int hf_slsk_user_uploads; */
+static int hf_slsk_total_uploads;
+static int hf_slsk_queued_uploads;
+static int hf_slsk_slots_available;
+static int hf_slsk_allowed;
+static int hf_slsk_compr_packet;
+static int hf_slsk_parent_min_speed;
+static int hf_slsk_parent_speed_connection_ratio;
+static int hf_slsk_seconds_parent_inactivity_before_disconnect;
+static int hf_slsk_seconds_server_inactivity_before_disconnect;
+static int hf_slsk_nodes_in_cache_before_disconnect;
+static int hf_slsk_seconds_before_ping_children;
+static int hf_slsk_recommendation;
+static int hf_slsk_user;
+static int hf_slsk_ranking;
+static int hf_slsk_compressed_packet_length;
+static int hf_slsk_uncompressed_packet_length;
+static int hf_slsk_num_directories;
+static int hf_slsk_upload_speed;
+static int hf_slsk_in_queue;
+static int hf_slsk_num_slotsfull_records;
+static int hf_slsk_num_recommendations;
+static int hf_slsk_num_files;
+static int hf_slsk_num_strings;
+static int hf_slsk_file_code;
+static int hf_slsk_file_size1;
+static int hf_slsk_file_size2;
+static int hf_slsk_file_num_attributes;
+static int hf_slsk_file_attribute_type;
+static int hf_slsk_file_attribute_value;
+static int hf_slsk_free_upload_slots;
+static int hf_slsk_bytes;
+static int hf_slsk_same_recommendation;
+static int hf_slsk_number_of_priv_users;
+static int hf_slsk_num_parent_address;
 
 /* Initialize the subtree pointers */
-static gint ett_slsk = -1;
-static gint ett_slsk_compr_packet = -1;
-static gint ett_slsk_directory = -1;
-static gint ett_slsk_file = -1;
-static gint ett_slsk_file_attribute = -1;
-static gint ett_slsk_user = -1;
-static gint ett_slsk_recommendation = -1;
-static gint ett_slsk_room = -1;
-static gint ett_slsk_string = -1;
-
-static expert_field ei_slsk_unknown_data = EI_INIT;
-static expert_field ei_slsk_zlib_decompression_failed = EI_INIT;
-static expert_field ei_slsk_decompression_failed = EI_INIT;
+static int ett_slsk;
+static int ett_slsk_compr_packet;
+static int ett_slsk_directory;
+static int ett_slsk_file;
+static int ett_slsk_file_attribute;
+static int ett_slsk_user;
+static int ett_slsk_recommendation;
+static int ett_slsk_room;
+static int ett_slsk_string;
+
+static expert_field ei_slsk_unknown_data;
+static expert_field ei_slsk_zlib_decompression_failed;
+static expert_field ei_slsk_decompression_failed;
 
 #define SLSK_TCP_PORT_RANGE   "2234,2240,5534"
 
 
 /* desegmentation of SoulSeek Message over TCP */
-static gboolean slsk_desegment = TRUE;
-#ifdef HAVE_ZLIB
-static gboolean slsk_decompress = TRUE;
+static bool slsk_desegment = true;
+#if defined (HAVE_ZLIB) || defined (HAVE_ZLIBNG)
+static bool slsk_decompress = true;
 #else
-static gboolean slsk_decompress = FALSE;
+static bool slsk_decompress;
 #endif
 
 static const value_string slsk_tcp_msgs[] = {
@@ -246,10 +246,10 @@ static const char* connection_type(char con_type[]) {
 }
 
 // NOLINTNEXTLINE(misc-no-recursion)
-static gboolean check_slsk_format(tvbuff_t *tvb, packet_info *pinfo, int offset, const char format[]){
+static bool check_slsk_format(tvbuff_t *tvb, packet_info *pinfo, int offset, const char format[]){
 
   /*
-  * Returns TRUE if tvbuff beginning at offset matches a certain format
+  * Returns true if tvbuff beginning at offset matches a certain format
   * The format is given by an array of characters standing for a special field type
   *     i - integer  (4 bytes)
   *     b - byte  (1 byte)
@@ -260,31 +260,31 @@ static gboolean check_slsk_format(tvbuff_t *tvb, packet_info *pinfo, int offset,
 
   switch ( format[0] ) {
     case 'i':
-      if (tvb_captured_length_remaining(tvb, offset) < 4) return FALSE;
+      if (tvb_captured_length_remaining(tvb, offset) < 4) return false;
       offset += 4;
     break;
     case 'b':
-      if (tvb_captured_length_remaining(tvb, offset) < 1) return FALSE;
+      if (tvb_captured_length_remaining(tvb, offset) < 1) return false;
       offset += 1;
     break;
     case 's':
-      if (tvb_captured_length_remaining(tvb, offset) < 4) return FALSE;
-      if (tvb_captured_length_remaining(tvb, offset) < (int)tvb_get_letohl(tvb, offset)+4) return FALSE;
+      if (tvb_captured_length_remaining(tvb, offset) < 4) return false;
+      if (tvb_captured_length_remaining(tvb, offset) < (int)tvb_get_letohl(tvb, offset)+4) return false;
       offset += tvb_get_letohl(tvb, offset)+4;
     break;
     case '*':
-      return TRUE;
+      return true;
     default:
-      return FALSE;
+      return false;
   }
 
   if (format[1] == '\0' ) {
     if (tvb_captured_length_remaining(tvb, offset) > 0) /* Checks for additional bytes at the end */
-      return FALSE;
-    return TRUE;
+      return false;
+    return true;
   }
   increment_dissection_depth(pinfo);
-  gboolean valid = check_slsk_format(tvb, pinfo, offset, &format[1]);
+  bool valid = check_slsk_format(tvb, pinfo, offset, &format[1]);
   decrement_dissection_depth(pinfo);
   return valid;
 
@@ -297,7 +297,7 @@ static const char* get_message_type(tvbuff_t *tvb, packet_info *pinfo) {
   * Returns the Message Type.
   */
   int msg_code = tvb_get_letohl(tvb, 4);
-  const gchar *message_type =  try_val_to_str(msg_code, slsk_tcp_msgs);
+  const char *message_type =  try_val_to_str(msg_code, slsk_tcp_msgs);
   if (message_type == NULL) {
     if (check_slsk_format(tvb, pinfo, 4, "bisis"))
       message_type = "Distributed Search";
@@ -311,10 +311,10 @@ static const char* get_message_type(tvbuff_t *tvb, packet_info *pinfo) {
   return message_type;
 }
 
-static guint get_slsk_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb,
+static unsigned get_slsk_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb,
                               int offset, void *data _U_)
 {
-  guint32 msg_len;
+  uint32_t msg_len;
   msg_len = tvb_get_letohl(tvb, offset);
   /* That length doesn't include the length field itself; add that in. */
   msg_len += 4;
@@ -331,8 +331,8 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   proto_tree *slsk_tree, *subtree, *subtree2, *subtree3;
 
   int offset = 0, i, j;
-  guint32 msg_len, msg_code;
-  guint8 *str;
+  uint32_t msg_len, msg_code;
+  uint8_t *str;
   int str_len, start_offset, start_offset2;
 
   int comprlen = 0, uncomprlen = 0, uncompr_tvb_offset = 0;
@@ -378,7 +378,7 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
           proto_tree_add_uint_format_value(slsk_tree, hf_slsk_message_code, tvb, offset, 4, msg_code,
                      "Login Reply (Code: %02d)", msg_code);
           offset += 4;
-          i=tvb_get_guint8(tvb, offset);
+          i=tvb_get_uint8(tvb, offset);
           proto_tree_add_item(slsk_tree, hf_slsk_login_successful, tvb, offset, 1, ENC_NA);
           offset += 1;
           proto_tree_add_item_ret_length(slsk_tree, hf_slsk_login_message, tvb, offset, 4, ENC_ASCII|ENC_LITTLE_ENDIAN, &str_len);
@@ -461,9 +461,9 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
           /* [zlib compressed] */
           comprlen = tvb_captured_length_remaining(tvb, offset);
 
-          if (slsk_decompress == TRUE){
+          if (slsk_decompress == true){
 
-            tvbuff_t *uncompr_tvb = tvb_child_uncompress(tvb, tvb, offset, comprlen);
+            tvbuff_t *uncompr_tvb = tvb_child_uncompress_zlib(tvb, tvb, offset, comprlen);
 
             if (uncompr_tvb == NULL) {
               proto_tree_add_expert(slsk_tree, pinfo, &ei_slsk_zlib_decompression_failed, tvb, offset, -1);
@@ -573,9 +573,9 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
           /* [zlib compressed] */
           comprlen = tvb_captured_length_remaining(tvb, offset);
 
-          if (slsk_decompress == TRUE){
+          if (slsk_decompress == true){
 
-            tvbuff_t *uncompr_tvb = tvb_child_uncompress(tvb, tvb, offset, comprlen);
+            tvbuff_t *uncompr_tvb = tvb_child_uncompress_zlib(tvb, tvb, offset, comprlen);
 
             if (uncompr_tvb == NULL) {
               ti = proto_tree_add_item(slsk_tree, hf_slsk_compr_packet, tvb, offset, tvb_captured_length_remaining(tvb, offset), ENC_NA);
@@ -812,7 +812,7 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
           offset += str_len;
           proto_tree_add_item(slsk_tree, hf_slsk_picture_exists, tvb, offset, 1, ENC_NA);
           offset += 1;
-          if ( tvb_get_guint8(tvb, offset -1 ) == 1 ) {
+          if ( tvb_get_uint8(tvb, offset -1 ) == 1 ) {
             proto_tree_add_item_ret_length(slsk_tree, hf_slsk_picture, tvb, offset, 4, ENC_ASCII|ENC_LITTLE_ENDIAN, &str_len);
             offset += str_len;
           }
@@ -841,7 +841,7 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
       case 18:
         if (check_slsk_format(tvb, pinfo, offset, "iiss")) {
           /* Client-to-Server */
-          guint32 len;
+          uint32_t len;
 
           proto_tree_add_uint_format_value(slsk_tree, hf_slsk_message_code, tvb, offset, 4, msg_code,
                      "Connect To Peer (Code: %02d)", msg_code);
@@ -859,7 +859,7 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         }
         else if (check_slsk_format(tvb, pinfo, offset, "issiii")) {
           /* Server-to-Client */
-          guint32 len;
+          uint32_t len;
 
           proto_tree_add_uint_format_value(slsk_tree, hf_slsk_message_code, tvb, offset, 4, msg_code,
                      "Connect To Peer (Code: %02d)", msg_code);
@@ -1028,9 +1028,9 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
           /* [zlib compressed] */
           comprlen = tvb_captured_length_remaining(tvb, offset);
 
-          if (slsk_decompress == TRUE){
+          if (slsk_decompress == true){
 
-            tvbuff_t *uncompr_tvb = tvb_child_uncompress(tvb, tvb, offset, comprlen);
+            tvbuff_t *uncompr_tvb = tvb_child_uncompress_zlib(tvb, tvb, offset, comprlen);
 
             if (uncompr_tvb == NULL) {
               proto_tree_add_expert(slsk_tree, pinfo, &ei_slsk_zlib_decompression_failed, tvb, offset, -1);
@@ -1050,7 +1050,7 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
               uncompr_tvb_offset = 0;
               if (check_slsk_format(uncompr_tvb, pinfo, uncompr_tvb_offset, "isi*")) {
-                guint32 len;
+                uint32_t len;
 
                 proto_tree_add_item(slsk_compr_packet_tree, hf_slsk_token, uncompr_tvb, uncompr_tvb_offset, 4, ENC_LITTLE_ENDIAN);
                 uncompr_tvb_offset += 4;
@@ -1156,7 +1156,7 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
           offset += 4;
           proto_tree_add_item(slsk_tree, hf_slsk_token, tvb, offset, 4, ENC_LITTLE_ENDIAN);
           offset += 4;
-          i = tvb_get_guint8(tvb, offset);
+          i = tvb_get_uint8(tvb, offset);
           proto_tree_add_item(slsk_tree, hf_slsk_allowed, tvb, offset, 1, ENC_NA);
           offset += 1;
           if ( i == 1 ) {
@@ -1778,7 +1778,7 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
           proto_tree_add_uint_format_value(slsk_tree, hf_slsk_message_code, tvb, offset, 4, msg_code,
                      "Embedded Message (Code: %02d)", msg_code);
           offset += 4;
-          if ( tvb_get_guint8(tvb, offset) == 3 ){
+          if ( tvb_get_uint8(tvb, offset) == 3 ){
             /* Client-to-Client */
             proto_tree_add_uint_format_value(slsk_tree, hf_slsk_embedded_message_type, tvb, offset, 1, msg_code,
                        "Distributed Search (Byte: %d)", 3);
@@ -1978,7 +1978,7 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
       default:
         if (check_slsk_format(tvb, pinfo, offset, "bisis")) {
-          if ( tvb_get_guint8(tvb, offset) == 3 ){
+          if ( tvb_get_uint8(tvb, offset) == 3 ){
             /* Client-to-Client */
             proto_tree_add_uint_format_value(slsk_tree, hf_slsk_message_code, tvb, offset, 1, msg_code,
                        "Distributed Search (Byte: %d)", 3);
@@ -1994,9 +1994,9 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
           }
         }
         else if (check_slsk_format(tvb, pinfo, offset, "bssi")) {
-          if ( tvb_get_guint8(tvb, offset) == 1 ){
+          if ( tvb_get_uint8(tvb, offset) == 1 ){
             /* Client-to-Client */
-            guint32 len;
+            uint32_t len;
 
             proto_tree_add_uint_format_value(slsk_tree, hf_slsk_message_code, tvb, offset, 1, msg_code,
                        "Peer Init (Byte: %d)", 1);
@@ -2014,7 +2014,7 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
           }
         }
         else if (check_slsk_format(tvb, pinfo, offset, "bi")) {
-          if ( tvb_get_guint8(tvb, offset) == 0 ){
+          if ( tvb_get_uint8(tvb, offset) == 0 ){
             /* Client-to-Client */
             proto_tree_add_uint_format_value(slsk_tree, hf_slsk_message_code, tvb, offset, 1, msg_code,
                        "Pierce Fw (Byte: %d)", 0);
@@ -2311,7 +2311,7 @@ proto_register_slsk(void)
   };
 
 /* Setup protocol subtree array */
-  static gint *ett[] = {
+  static int *ett[] = {
     &ett_slsk,
     &ett_slsk_compr_packet,
     &ett_slsk_directory,
@@ -2351,7 +2351,7 @@ proto_register_slsk(void)
       "Whether the SoulSeek dissector should reassemble messages spanning multiple TCP segments."
       " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
       &slsk_desegment);
-#ifdef HAVE_ZLIB
+#if defined (HAVE_ZLIB) || defined (HAVE_ZLIBNG)
   prefs_register_bool_preference(slsk_module, "decompress",
       "Decompress zlib compressed packets inside SoulSeek messages",
       "Whether the SoulSeek dissector should decompress all zlib compressed packets inside messages",