mirror of
https://github.com/moparisthebest/minetest
synced 2024-08-13 16:53:49 -04:00
af30183124
The legacy init packet (pre v25) sends information about the client's password that a server could use to log in to other servers if the username and password are the same. All the other benefits of SRP of protocol v25 are missed if the legacy init packet is still sent during connection creation. This patch adds an option to not send the v25 init packet. Not sending the v25 packet means breaking compat with pre v25 servers, but as the option is not enabled by default, no servers are affected unless the user explicitly flips the switch. More than 90% of the servers on the serverlist support post v25 protocols. The patch also fixes a bug with greying out of non compliant servers being done wrongly, the min and max params were mixed.
266 lines
8.1 KiB
Lua
266 lines
8.1 KiB
Lua
--Minetest
|
|
--Copyright (C) 2014 sapier
|
|
--
|
|
--This program is free software; you can redistribute it and/or modify
|
|
--it under the terms of the GNU Lesser General Public License as published by
|
|
--the Free Software Foundation; either version 2.1 of the License, or
|
|
--(at your option) any later version.
|
|
--
|
|
--This program is distributed in the hope that it will be useful,
|
|
--but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
--GNU Lesser General Public License for more details.
|
|
--
|
|
--You should have received a copy of the GNU Lesser General Public License along
|
|
--with this program; if not, write to the Free Software Foundation, Inc.,
|
|
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
--------------------------------------------------------------------------------
|
|
local function get_formspec(tabview, name, tabdata)
|
|
-- Update the cached supported proto info,
|
|
-- it may have changed after a change by the settings menu.
|
|
common_update_cached_supp_proto()
|
|
|
|
local render_details = core.is_yes(core.setting_getbool("public_serverlist"))
|
|
|
|
local retval =
|
|
"label[7.75,-0.15;" .. fgettext("Address / Port :") .. "]" ..
|
|
"label[7.75,1.05;" .. fgettext("Name / Password :") .. "]" ..
|
|
"field[8,0.75;3.4,0.5;te_address;;" ..
|
|
core.formspec_escape(core.setting_get("address")) .. "]" ..
|
|
"field[11.25,0.75;1.3,0.5;te_port;;" ..
|
|
core.formspec_escape(core.setting_get("remote_port")) .. "]" ..
|
|
"checkbox[0,4.85;cb_public_serverlist;" .. fgettext("Public Serverlist") .. ";" ..
|
|
dump(core.setting_getbool("public_serverlist")) .. "]"
|
|
|
|
if not core.setting_getbool("public_serverlist") then
|
|
retval = retval ..
|
|
"button[8,4.9;2,0.5;btn_delete_favorite;" .. fgettext("Delete") .. "]"
|
|
end
|
|
|
|
retval = retval ..
|
|
"button[10,4.9;2,0.5;btn_mp_connect;" .. fgettext("Connect") .. "]" ..
|
|
"field[8,1.95;2.95,0.5;te_name;;" ..
|
|
core.formspec_escape(core.setting_get("name")) .. "]" ..
|
|
"pwdfield[10.78,1.95;1.77,0.5;te_pwd;]" ..
|
|
"box[7.73,2.35;4.3,2.28;#999999]" ..
|
|
"textarea[8.1,2.4;4.26,2.6;;"
|
|
|
|
if tabdata.fav_selected ~= nil and
|
|
menudata.favorites[tabdata.fav_selected] ~= nil and
|
|
menudata.favorites[tabdata.fav_selected].description ~= nil then
|
|
retval = retval ..
|
|
core.formspec_escape(menudata.favorites[tabdata.fav_selected].description,true)
|
|
end
|
|
|
|
retval = retval ..
|
|
";]"
|
|
|
|
--favourites
|
|
if render_details then
|
|
retval = retval .. "tablecolumns[" ..
|
|
"color,span=3;" ..
|
|
"text,align=right;" .. -- clients
|
|
"text,align=center,padding=0.25;" .. -- "/"
|
|
"text,align=right,padding=0.25;" .. -- clients_max
|
|
image_column(fgettext("Creative mode"), "creative") .. ",padding=1;" ..
|
|
image_column(fgettext("Damage enabled"), "damage") .. ",padding=0.25;" ..
|
|
image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" ..
|
|
"color,span=1;" ..
|
|
"text,padding=1]" -- name
|
|
else
|
|
retval = retval .. "tablecolumns[text]"
|
|
end
|
|
retval = retval ..
|
|
"table[-0.15,-0.1;7.75,5;favourites;"
|
|
|
|
if #menudata.favorites > 0 then
|
|
retval = retval .. render_favorite(menudata.favorites[1],render_details)
|
|
|
|
for i=2,#menudata.favorites,1 do
|
|
retval = retval .. "," .. render_favorite(menudata.favorites[i],render_details)
|
|
end
|
|
end
|
|
|
|
if tabdata.fav_selected ~= nil then
|
|
retval = retval .. ";" .. tabdata.fav_selected .. "]"
|
|
else
|
|
retval = retval .. ";0]"
|
|
end
|
|
|
|
return retval
|
|
end
|
|
|
|
--------------------------------------------------------------------------------
|
|
local function main_button_handler(tabview, fields, name, tabdata)
|
|
if fields["te_name"] ~= nil then
|
|
gamedata.playername = fields["te_name"]
|
|
core.setting_set("name", fields["te_name"])
|
|
end
|
|
|
|
if fields["favourites"] ~= nil then
|
|
local event = core.explode_table_event(fields["favourites"])
|
|
if event.type == "DCL" then
|
|
if event.row <= #menudata.favorites then
|
|
if not is_server_protocol_compat_or_error(menudata.favorites[event.row].proto_min,
|
|
menudata.favorites[event.row].proto_max) then
|
|
return true
|
|
end
|
|
gamedata.address = menudata.favorites[event.row].address
|
|
gamedata.port = menudata.favorites[event.row].port
|
|
gamedata.playername = fields["te_name"]
|
|
if fields["te_pwd"] ~= nil then
|
|
gamedata.password = fields["te_pwd"]
|
|
end
|
|
gamedata.selected_world = 0
|
|
|
|
if menudata.favorites ~= nil then
|
|
gamedata.servername = menudata.favorites[event.row].name
|
|
gamedata.serverdescription = menudata.favorites[event.row].description
|
|
end
|
|
|
|
if gamedata.address ~= nil and
|
|
gamedata.port ~= nil then
|
|
core.setting_set("address",gamedata.address)
|
|
core.setting_set("remote_port",gamedata.port)
|
|
core.start()
|
|
end
|
|
end
|
|
return true
|
|
end
|
|
|
|
if event.type == "CHG" then
|
|
if event.row <= #menudata.favorites then
|
|
local address = menudata.favorites[event.row].address
|
|
local port = menudata.favorites[event.row].port
|
|
|
|
if address ~= nil and
|
|
port ~= nil then
|
|
core.setting_set("address",address)
|
|
core.setting_set("remote_port",port)
|
|
end
|
|
|
|
tabdata.fav_selected = event.row
|
|
end
|
|
|
|
return true
|
|
end
|
|
end
|
|
|
|
if fields["key_up"] ~= nil or
|
|
fields["key_down"] ~= nil then
|
|
|
|
local fav_idx = core.get_table_index("favourites")
|
|
|
|
if fav_idx ~= nil then
|
|
if fields["key_up"] ~= nil and fav_idx > 1 then
|
|
fav_idx = fav_idx -1
|
|
else if fields["key_down"] and fav_idx < #menudata.favorites then
|
|
fav_idx = fav_idx +1
|
|
end end
|
|
else
|
|
fav_idx = 1
|
|
end
|
|
|
|
if menudata.favorites == nil or
|
|
menudata.favorites[fav_idx] == nil then
|
|
tabdata.fav_selected = 0
|
|
return true
|
|
end
|
|
|
|
local address = menudata.favorites[fav_idx].address
|
|
local port = menudata.favorites[fav_idx].port
|
|
|
|
if address ~= nil and
|
|
port ~= nil then
|
|
core.setting_set("address",address)
|
|
core.setting_set("remote_port",port)
|
|
end
|
|
|
|
tabdata.fav_selected = fav_idx
|
|
return true
|
|
end
|
|
|
|
if fields["cb_public_serverlist"] ~= nil then
|
|
core.setting_set("public_serverlist", fields["cb_public_serverlist"])
|
|
|
|
if core.setting_getbool("public_serverlist") then
|
|
asyncOnlineFavourites()
|
|
else
|
|
menudata.favorites = core.get_favorites("local")
|
|
end
|
|
tabdata.fav_selected = nil
|
|
return true
|
|
end
|
|
|
|
if fields["btn_delete_favorite"] ~= nil then
|
|
local current_favourite = core.get_table_index("favourites")
|
|
if current_favourite == nil then return end
|
|
core.delete_favorite(current_favourite)
|
|
menudata.favorites = order_favorite_list(core.get_favorites())
|
|
tabdata.fav_selected = nil
|
|
|
|
core.setting_set("address","")
|
|
core.setting_set("remote_port","30000")
|
|
|
|
return true
|
|
end
|
|
|
|
if (fields["btn_mp_connect"] ~= nil or
|
|
fields["key_enter"] ~= nil) and fields["te_address"] ~= nil and
|
|
fields["te_port"] ~= nil then
|
|
|
|
gamedata.playername = fields["te_name"]
|
|
gamedata.password = fields["te_pwd"]
|
|
gamedata.address = fields["te_address"]
|
|
gamedata.port = fields["te_port"]
|
|
|
|
local fav_idx = core.get_table_index("favourites")
|
|
|
|
if fav_idx ~= nil and fav_idx <= #menudata.favorites and
|
|
menudata.favorites[fav_idx].address == fields["te_address"] and
|
|
menudata.favorites[fav_idx].port == fields["te_port"] then
|
|
|
|
gamedata.servername = menudata.favorites[fav_idx].name
|
|
gamedata.serverdescription = menudata.favorites[fav_idx].description
|
|
|
|
if not is_server_protocol_compat_or_error(menudata.favorites[fav_idx].proto_min,
|
|
menudata.favorites[fav_idx].proto_max)then
|
|
return true
|
|
end
|
|
else
|
|
gamedata.servername = ""
|
|
gamedata.serverdescription = ""
|
|
end
|
|
|
|
gamedata.selected_world = 0
|
|
|
|
core.setting_set("address", fields["te_address"])
|
|
core.setting_set("remote_port",fields["te_port"])
|
|
|
|
core.start()
|
|
return true
|
|
end
|
|
return false
|
|
end
|
|
|
|
local function on_change(type,old_tab,new_tab)
|
|
if type == "LEAVE" then
|
|
return
|
|
end
|
|
if core.setting_getbool("public_serverlist") then
|
|
asyncOnlineFavourites()
|
|
else
|
|
menudata.favorites = core.get_favorites("local")
|
|
end
|
|
end
|
|
|
|
--------------------------------------------------------------------------------
|
|
tab_multiplayer = {
|
|
name = "multiplayer",
|
|
caption = fgettext("Client"),
|
|
cbf_formspec = get_formspec,
|
|
cbf_button_handler = main_button_handler,
|
|
on_change = on_change
|
|
}
|