/*
-Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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
#include <sstream>
#include <algorithm>
+#include "version.h"
#include "main.h" // for g_settings
#include "settings.h"
#include "serverlist.h"
#include "filesys.h"
#include "porting.h"
#include "log.h"
-#if USE_CURL
-#include <curl/curl.h>
-#endif
+#include "json/json.h"
+#include "convert_json.h"
+#include "httpfetch.h"
+#include "util/string.h"
namespace ServerList
{
{
std::string serverlist_file = g_settings->get("serverlist_file");
- std::string rel_path = std::string("client") + DIR_DELIM
- + "serverlist" + DIR_DELIM
- + serverlist_file;
- std::string path = porting::path_share + DIR_DELIM + rel_path;
+ std::string dir_path = std::string("client") + DIR_DELIM
+ + "serverlist" + DIR_DELIM;
+ fs::CreateDir(porting::path_user + DIR_DELIM + "client");
+ fs::CreateDir(porting::path_user + DIR_DELIM + dir_path);
+ std::string rel_path = dir_path + serverlist_file;
+ std::string path = porting::path_user + DIR_DELIM + rel_path;
return path;
}
std::string liststring;
if(fs::PathExists(path))
{
- std::ifstream istream(path.c_str(), std::ios::binary);
+ std::ifstream istream(path.c_str());
if(istream.is_open())
{
std::ostringstream ostream;
}
-#if USE_CURL
-
-static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp)
-{
- ((std::string*)userp)->append((char*)contents, size * nmemb);
- return size * nmemb;
-}
-
-
std::vector<ServerListSpec> getOnline()
{
- std::string liststring;
- CURL *curl;
-
- curl = curl_easy_init();
- if (curl)
- {
- CURLcode res;
+ Json::Value root = fetchJsonValue((g_settings->get("serverlist_url")+"/list").c_str(), NULL);
- curl_easy_setopt(curl, CURLOPT_URL, g_settings->get("serverlist_url").c_str());
- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, ServerList::WriteCallback);
- curl_easy_setopt(curl, CURLOPT_WRITEDATA, &liststring);
+ std::vector<ServerListSpec> serverlist;
- res = curl_easy_perform(curl);
- if (res != CURLE_OK)
- errorstream<<"Serverlist at url "<<g_settings->get("serverlist_url")<<" not found (internet connection?)"<<std::endl;
- curl_easy_cleanup(curl);
+ if (root.isArray()) {
+ for (unsigned int i = 0; i < root.size(); i++)
+ {
+ if (root[i].isObject()) {
+ serverlist.push_back(root[i]);
+ }
+ }
}
- return ServerList::deSerialize(liststring);
+ return serverlist;
}
-#endif
-
/*
Delete a server fromt he local favorites list
*/
std::vector<ServerListSpec> serverlist = ServerList::getLocal();
for(unsigned i = 0; i < serverlist.size(); i++)
{
- if (serverlist[i].address == server.address
- && serverlist[i].port == server.port)
+ if (serverlist[i]["address"] == server["address"]
+ && serverlist[i]["port"] == server["port"])
{
serverlist.erase(serverlist.begin() + i);
}
}
std::string path = ServerList::getFilePath();
- std::ofstream stream (path.c_str());
- if (stream.is_open())
- {
- stream<<ServerList::serialize(serverlist);
- return true;
- }
- return false;
+ std::ostringstream ss(std::ios_base::binary);
+ ss << ServerList::serialize(serverlist);
+ if (!fs::safeWriteToFile(path, ss.str()))
+ return false;
+ return true;
}
/*
serverlist.insert(serverlist.begin(), server);
std::string path = ServerList::getFilePath();
- std::ofstream stream (path.c_str());
- if (stream.is_open())
- {
- stream<<ServerList::serialize(serverlist);
- }
+ std::ostringstream ss(std::ios_base::binary);
+ ss << ServerList::serialize(serverlist);
+ fs::safeWriteToFile(path, ss.str());
return false;
}
{
std::vector<ServerListSpec> serverlist;
std::istringstream stream(liststring);
- std::string line;
+ std::string line, tmp;
while (std::getline(stream, line))
{
std::transform(line.begin(), line.end(),line.begin(), ::toupper);
if (line == "[SERVER]")
{
ServerListSpec thisserver;
- std::getline(stream, thisserver.name);
- std::getline(stream, thisserver.address);
- std::getline(stream, thisserver.port);
- std::getline(stream, thisserver.description);
+ std::getline(stream, tmp);
+ thisserver["name"] = tmp;
+ std::getline(stream, tmp);
+ thisserver["address"] = tmp;
+ std::getline(stream, tmp);
+ thisserver["port"] = tmp;
+ std::getline(stream, tmp);
+ thisserver["description"] = tmp;
serverlist.push_back(thisserver);
}
}
for(std::vector<ServerListSpec>::iterator i = serverlist.begin(); i != serverlist.end(); i++)
{
liststring += "[server]\n";
- liststring += i->name + "\n";
- liststring += i->address + "\n";
- liststring += i->port + "\n";
- liststring += i->description + "\n";
+ liststring += (*i)["name"].asString() + "\n";
+ liststring += (*i)["address"].asString() + "\n";
+ liststring += (*i)["port"].asString() + "\n";
+ liststring += (*i)["description"].asString() + "\n";
liststring += "\n";
}
return liststring;
}
+std::string serializeJson(std::vector<ServerListSpec> serverlist)
+{
+ Json::Value root;
+ Json::Value list(Json::arrayValue);
+ for(std::vector<ServerListSpec>::iterator i = serverlist.begin(); i != serverlist.end(); i++)
+ {
+ list.append(*i);
+ }
+ root["list"] = list;
+ Json::StyledWriter writer;
+ return writer.write( root );
+}
+
+
+#if USE_CURL
+void sendAnnounce(std::string action, const std::vector<std::string> & clients_names, double uptime, u32 game_time, float lag, std::string gameid, std::vector<ModSpec> mods) {
+ Json::Value server;
+ if (action.size())
+ server["action"] = action;
+ server["port"] = g_settings->get("port");
+ server["address"] = g_settings->get("server_address");
+ if (action != "delete") {
+ server["name"] = g_settings->get("server_name");
+ server["description"] = g_settings->get("server_description");
+ server["version"] = minetest_version_simple;
+ server["url"] = g_settings->get("server_url");
+ server["creative"] = g_settings->get("creative_mode");
+ server["damage"] = g_settings->get("enable_damage");
+ server["password"] = g_settings->getBool("disallow_empty_password");
+ server["pvp"] = g_settings->getBool("enable_pvp");
+ server["clients"] = (int)clients_names.size();
+ server["clients_max"] = g_settings->get("max_users");
+ server["clients_list"] = Json::Value(Json::arrayValue);
+ for(u32 i = 0; i < clients_names.size(); ++i) {
+ server["clients_list"].append(clients_names[i]);
+ }
+ if (uptime >= 1) server["uptime"] = (int)uptime;
+ if (gameid != "") server["gameid"] = gameid;
+ if (game_time >= 1) server["game_time"] = game_time;
+ }
+
+ if(server["action"] == "start") {
+ server["dedicated"] = g_settings->get("server_dedicated");
+ server["privs"] = g_settings->get("default_privs");
+ server["rollback"] = g_settings->getBool("enable_rollback_recording");
+ server["mapgen"] = g_settings->get("mg_name");
+ server["can_see_far_names"] = g_settings->getBool("unlimited_player_transfer_distance");
+ server["mods"] = Json::Value(Json::arrayValue);
+ for(std::vector<ModSpec>::iterator m = mods.begin(); m != mods.end(); m++) {
+ server["mods"].append(m->name);
+ }
+ actionstream << "announcing to " << g_settings->get("serverlist_url") << std::endl;
+ } else {
+ if (lag)
+ server["lag"] = lag;
+ }
+
+ Json::FastWriter writer;
+ HTTPFetchRequest fetchrequest;
+ fetchrequest.url = g_settings->get("serverlist_url") + std::string("/announce");
+ std::string query = std::string("json=") + urlencode(writer.write(server));
+ if (query.size() < 1000)
+ fetchrequest.url += "?" + query;
+ else
+ fetchrequest.post_fields = query;
+ httpfetch_async(fetchrequest);
+}
+#endif
+
} //namespace ServerList
projects / oweals / minetest.git / blobdiff