diff options
author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-18 21:30:42 +0000 |
---|---|---|
committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-18 21:30:42 +0000 |
commit | c3af1555bb4c1eb47d86a0576d3dd7944572e6f5 (patch) | |
tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-slsk.c | |
parent | 8210e1b06b7f866f3bc60e22b8fb54a12adba06c (diff) |
From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-slsk.c')
-rw-r--r-- | epan/dissectors/packet-slsk.c | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index 0098ef74a2..cc515807f0 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -2407,133 +2407,133 @@ proto_register_slsk(void) static hf_register_info hf[] = { { &hf_slsk_integer, { "Integer", "slsk.integer", - FT_UINT32, BASE_DEC, NULL, 0, "Integer", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_string, { "String", "slsk.string", - FT_STRING, BASE_NONE, NULL, 0, "String", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_slsk_byte, { "Byte", "slsk.byte", - FT_UINT8, BASE_DEC, NULL, 0, "Byte", HFILL } }, + FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_message_length, { "Message Length", "slsk.message.length", - FT_UINT32, BASE_DEC, NULL, 0, "Message Length", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_message_code, { "Message Code", "slsk.message.code", - FT_UINT32, BASE_DEC, NULL, 0, "Message Code", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_client_ip, { "Client IP", "slsk.server.ip", - FT_IPv4, BASE_DEC, NULL, 0, "Client IP Address", HFILL } }, + FT_IPv4, BASE_NONE, NULL, 0, "Client IP Address", HFILL } }, { &hf_slsk_server_ip, { "SoulSeek Server IP", "slsk.server.ip", - FT_UINT32, BASE_DEC, NULL, 0, "SoulSeek Server IP", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_string_length, { "String Length", "slsk.string.length", - FT_UINT32, BASE_DEC, NULL, 0, "String Length", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_username, { "Username", "slsk.username", - FT_STRING, BASE_NONE, NULL, 0, "Username", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_slsk_password, { "Password", "slsk.password", - FT_STRING, BASE_NONE, NULL, 0, "Password", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_slsk_version, { "Version", "slsk.version", - FT_UINT32, BASE_DEC, NULL, 0, "Version", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_login_successful, { "Login successful", "slsk.login.successful", FT_UINT8, BASE_DEC, NULL, 0, "Login Successful", HFILL } }, { &hf_slsk_login_message, { "Login Message", "slsk.login.message", - FT_STRING, BASE_NONE, NULL, 0, "Login Message", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_slsk_port, { "Port Number", "slsk.port.number", - FT_UINT32, BASE_DEC, NULL, 0, "Port Number", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_ip, { "IP Address", "slsk.ip.address", - FT_IPv4, BASE_DEC, NULL, 0, "IP Address", HFILL } }, + FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_slsk_user_exists, { "user exists", "slsk.user.exists", FT_UINT8, BASE_DEC, NULL, 0, "User exists", HFILL } }, { &hf_slsk_status_code, { "Status Code", "slsk.status.code", - FT_UINT32, BASE_DEC, NULL, 0, "Status Code", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_room, { "Room", "slsk.room", - FT_STRING, BASE_NONE, NULL, 0, "Room", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_slsk_chat_message, { "Chat Message", "slsk.chat.message", - FT_STRING, BASE_NONE, NULL, 0, "Chat Message", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_slsk_users_in_room, { "Users in Room", "slsk.room.users", FT_UINT32, BASE_DEC, NULL, 0, "Number of Users in Room", HFILL } }, { &hf_slsk_token, { "Token", "slsk.token", - FT_UINT32, BASE_DEC, NULL, 0, "Token", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_connection_type, { "Connection Type", "slsk.connection.type", - FT_STRING, BASE_NONE, NULL, 0, "Connection Type", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_slsk_chat_message_id, { "Chat Message ID", "slsk.chat.message.id", - FT_UINT32, BASE_DEC, NULL, 0, "Chat Message ID", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_timestamp, { "Timestamp", "slsk.timestamp", - FT_UINT32, BASE_DEC, NULL, 0, "Timestamp", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_search_text, { "Search Text", "slsk.search.text", - FT_STRING, BASE_NONE, NULL, 0, "Search Text", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_slsk_folder_count, { "Folder Count", "slsk.folder.count", - FT_UINT32, BASE_DEC, NULL, 0, "Folder Count", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_file_count, { "File Count", "slsk.file.count", - FT_UINT32, BASE_DEC, NULL, 0, "File Count", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_average_speed, { "Average Speed", "slsk.average.speed", - FT_UINT32, BASE_DEC, NULL, 0, "Average Speed", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_download_number, { "Download Number", "slsk.download.number", - FT_UINT32, BASE_DEC, NULL, 0, "Download Number", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_files, { "Files", "slsk.files", - FT_UINT32, BASE_DEC, NULL, 0, "Files", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_directories, { "Directories", "slsk.directories", - FT_UINT32, BASE_DEC, NULL, 0, "Directories", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_slotsfull, { "Slots full", "slsk.slots.full", FT_UINT32, BASE_DEC, NULL, 0, "Upload Slots Full", HFILL } }, { &hf_slsk_place_in_queue, { "Place in Queue", "slsk.queue.place", - FT_UINT32, BASE_DEC, NULL, 0, "Place in Queue", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_number_of_rooms, { "Number of Rooms", "slsk.room.count", - FT_UINT32, BASE_DEC, NULL, 0, "Number of Rooms", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_filename, { "Filename", "slsk.filename", - FT_STRING, BASE_NONE, NULL, 0, "Filename", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_slsk_directory, { "Directory", "slsk.directory", - FT_STRING, BASE_NONE, NULL, 0, "Directory", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_slsk_size, { "Size", "slsk.size", FT_UINT32, BASE_DEC, NULL, 0, "File Size", HFILL } }, { &hf_slsk_checksum, { "Checksum", "slsk.checksum", - FT_UINT32, BASE_DEC, NULL, 0, "Checksum", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_code, { "Code", "slsk.code", - FT_UINT32, BASE_DEC, NULL, 0, "Code", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_number_of_users, { "Number of Users", "slsk.user.count", - FT_UINT32, BASE_DEC, NULL, 0, "Number of Users", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_number_of_days, { "Number of Days", "slsk.day.count", - FT_UINT32, BASE_DEC, NULL, 0, "Number of Days", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_transfer_direction, { "Transfer Direction", "slsk.transfer.direction", - FT_UINT32, BASE_DEC, NULL, 0, "Transfer Direction", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_user_description, { "User Description", "slsk.user.description", - FT_STRING, BASE_NONE, NULL, 0, "User Description", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_slsk_picture_exists, { "Picture exists", "slsk.user.picture.exists", FT_UINT8, BASE_DEC, NULL, 0, "User has a picture", HFILL } }, @@ -2542,16 +2542,16 @@ proto_register_slsk(void) FT_STRING, BASE_NONE, NULL, 0, "User Picture", HFILL } }, { &hf_slsk_user_uploads, { "User uploads", "slsk.uploads.user", - FT_UINT32, BASE_DEC, NULL, 0, "User uploads", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_total_uploads, { "Total uploads allowed", "slsk.uploads.total", - FT_UINT32, BASE_DEC, NULL, 0, "Total uploads allowed", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_queued_uploads, { "Queued uploads", "slsk.uploads.queued", - FT_UINT32, BASE_DEC, NULL, 0, "Queued uploads", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_slots_available, { "Upload Slots available", "slsk.uploads.available", - FT_UINT8, BASE_DEC, NULL, 0, "Upload Slots available", HFILL } }, + FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_allowed, { "Download allowed", "slsk.user.allowed", FT_UINT8, BASE_DEC, NULL, 0, "allowed", HFILL } }, @@ -2560,28 +2560,28 @@ proto_register_slsk(void) FT_NONE, BASE_NONE, NULL, 0, "zlib compressed packet", HFILL } }, { &hf_slsk_parent_min_speed, { "Parent Min Speed", "slsk.parent.min.speed", - FT_UINT32, BASE_DEC, NULL, 0, "Parent Min Speed", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_parent_speed_connection_ratio, { "Parent Speed Connection Ratio", "slsk.parent.speed.connection.ratio", - FT_UINT32, BASE_DEC, NULL, 0, "Parent Speed Connection Ratio", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_seconds_parent_inactivity_before_disconnect, { "Seconds Parent Inactivity Before Disconnect", "slsk.seconds.parent.inactivity.before.disconnect", - FT_UINT32, BASE_DEC, NULL, 0, "Seconds Parent Inactivity Before Disconnect", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_seconds_server_inactivity_before_disconnect, { "Seconds Server Inactivity Before Disconnect", "slsk.seconds.server.inactivity.before.disconnect", - FT_UINT32, BASE_DEC, NULL, 0, "Seconds Server Inactivity Before Disconnect", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_nodes_in_cache_before_disconnect, { "Nodes In Cache Before Disconnect", "slsk.nodes.in.cache.before.disconnect", - FT_UINT32, BASE_DEC, NULL, 0, "Nodes In Cache Before Disconnect", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_seconds_before_ping_children, { "Seconds Before Ping Children", "slsk.seconds.before.ping.children", - FT_UINT32, BASE_DEC, NULL, 0, "Seconds Before Ping Children", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_recommendation, { "Recommendation", "slsk.recommendation", - FT_STRING, BASE_NONE, NULL, 0, "Recommendation", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_slsk_ranking, { "Ranking", "slsk.ranking", - FT_UINT32, BASE_DEC, NULL, 0, "Ranking", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, }; /* Setup protocol subtree array */ |