Merge pull request #203 from RElesgoe/master
Use JSON configuration file for Ad Banners
This commit is contained in:
RElesgoe
commit
c99de23626
12 changed files with 10435 additions and 481 deletions
8
.gitignore
vendored
Normal file
8
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
################################################################################
|
||||||
|
# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
/zlib
|
||||||
|
/conf
|
||||||
|
/cmake/Modules
|
||||||
|
/build
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
# generate the configs with proper line endings
|
# generate the configs with proper line endings
|
||||||
set(OUTPUT_CONFS ad.conf anongame_infos.conf address_translation.conf
|
set(OUTPUT_CONFS ad.json anongame_infos.conf address_translation.conf
|
||||||
autoupdate.conf bnalias.conf bnban.conf bnetd_default_user.plain
|
autoupdate.conf bnalias.conf bnban.conf bnetd_default_user.plain
|
||||||
bnissue.txt bnmaps.conf bnxpcalc.conf
|
bnissue.txt bnmaps.conf bnxpcalc.conf
|
||||||
bnxplevel.conf channel.conf command_groups.conf realm.conf
|
bnxplevel.conf channel.conf command_groups.conf realm.conf
|
||||||
|
|
@ -15,7 +15,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/d2cs.conf.in ${CMAKE_CURRENT_BINARY_D
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/d2dbs.conf.in ${CMAKE_CURRENT_BINARY_DIR}/d2dbs.conf)
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/d2dbs.conf.in ${CMAKE_CURRENT_BINARY_DIR}/d2dbs.conf)
|
||||||
|
|
||||||
if(WITH_BNETD)
|
if(WITH_BNETD)
|
||||||
set(BNETD_CONFS bnetd.conf ad.conf anongame_infos.conf address_translation.conf
|
set(BNETD_CONFS bnetd.conf ad.json anongame_infos.conf address_translation.conf
|
||||||
autoupdate.conf bnalias.conf bnban.conf
|
autoupdate.conf bnalias.conf bnban.conf
|
||||||
bnetd_default_user.plain bnissue.txt bnmaps.conf
|
bnetd_default_user.plain bnissue.txt bnmaps.conf
|
||||||
bnxpcalc.conf bnxplevel.conf channel.conf command_groups.conf
|
bnxpcalc.conf bnxplevel.conf channel.conf command_groups.conf
|
||||||
|
|
|
||||||
|
|
@ -1,49 +0,0 @@
|
||||||
##############################################################################
|
|
||||||
# ad.list - Configuration for bnetd ad banners #
|
|
||||||
#----------------------------------------------------------------------------#
|
|
||||||
# #
|
|
||||||
# Quotes (") are required around the strings, but they are not allowed #
|
|
||||||
# inside them. #
|
|
||||||
# #
|
|
||||||
# The "file name" indicates the name of the file containing the actual ad. #
|
|
||||||
# The files must be in the files/ directory and no path components should be #
|
|
||||||
# listed here, only the filename portion. #
|
|
||||||
# #
|
|
||||||
# The "URL" field is the location that the user will be sent to if (s)he #
|
|
||||||
# clicks on the ad. #
|
|
||||||
# #
|
|
||||||
# The "client" field determines which banner will be displayed to which #
|
|
||||||
# client. Starting with Warcraft III banners are .mng files which are not #
|
|
||||||
# visible by all clients (and .pcx files dont show on Warcraft III). If this #
|
|
||||||
# field is NULL than it will be shown to all clients _except_ those who have #
|
|
||||||
# a specific clienttag line. #
|
|
||||||
# #
|
|
||||||
# The "lang" field allows to limit display of certain banners to clients #
|
|
||||||
# that identified with a specific language tag. A value of "any" means #
|
|
||||||
# this banner will be chosen if no banner is defined for a given language. #
|
|
||||||
#
|
|
||||||
# ---file name--- --------------URL-------------- --client-- --lang--#
|
|
||||||
|
|
||||||
# PNG(static) or MNG(animation) used in Warcraft 3
|
|
||||||
# (banners are displayed randomly)
|
|
||||||
|
|
||||||
"ad000001.png" "http://pvpgn.pro" "W3XP" "any"
|
|
||||||
"ad000002.mng" "http://pvpgn.pro" "W3XP" "any"
|
|
||||||
|
|
||||||
|
|
||||||
# PCX(static) or SMK(animation) used in Starcraft, Warcraft 2, Diablo 1/2
|
|
||||||
# (banners are displayed in series)
|
|
||||||
|
|
||||||
"ad000001.smk" "http://pvpgn.pro" "NULL" "any"
|
|
||||||
|
|
||||||
|
|
||||||
# Examples for different countries
|
|
||||||
# "ad000001.smk" "http://en.wikipedia.org/wiki/Earth" "SEXP" "any"
|
|
||||||
# "ad000001.smk" "http://en.wikipedia.org/wiki/Germany" "NULL" "deDE"
|
|
||||||
# "ad000001.smk" "http://en.wikipedia.org/wiki/USA" "NULL" "enUS"
|
|
||||||
# "ad000001.smk" "http://en.wikipedia.org/wiki/France" "NULL" "frFR"
|
|
||||||
# "ad000001.smk" "http://en.wikipedia.org/wiki/Italy" "NULL" "itIT"
|
|
||||||
# "ad000001.smk" "http://en.wikipedia.org/wiki/Russia" "NULL" "ruRU"
|
|
||||||
# "ad000001.smk" "http://pvpgn.pro" "NULL" "any"
|
|
||||||
# #
|
|
||||||
##############################################################################
|
|
||||||
8
conf/ad.json.in
Normal file
8
conf/ad.json.in
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
{
|
||||||
|
"ads":
|
||||||
|
[
|
||||||
|
{"filename": "ad000001.png", "url": "http://pvpgn.pro", "client": "W3XP", "lang": "any"},
|
||||||
|
{"filename": "ad000002.mng", "url": "http://pvpgn.pro", "client": "W3XP", "lang": "any"},
|
||||||
|
{"filename": "ad000001.smk", "url": "http://pvpgn.pro", "client": "NULL", "lang": "any"}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
@ -78,7 +78,7 @@ userlogdir = "${LOCALSTATEDIR}/userlogs"
|
||||||
i18ndir = "${SYSCONFDIR}/i18n"
|
i18ndir = "${SYSCONFDIR}/i18n"
|
||||||
issuefile = "${SYSCONFDIR}/bnissue.txt"
|
issuefile = "${SYSCONFDIR}/bnissue.txt"
|
||||||
channelfile = "${SYSCONFDIR}/channel.conf"
|
channelfile = "${SYSCONFDIR}/channel.conf"
|
||||||
adfile = "${SYSCONFDIR}/ad.conf"
|
adfile = "${SYSCONFDIR}/ad.json"
|
||||||
topicfile = "${SYSCONFDIR}/topics.conf"
|
topicfile = "${SYSCONFDIR}/topics.conf"
|
||||||
ipbanfile = "${SYSCONFDIR}/bnban.conf"
|
ipbanfile = "${SYSCONFDIR}/bnban.conf"
|
||||||
mpqfile = "${SYSCONFDIR}/autoupdate.conf"
|
mpqfile = "${SYSCONFDIR}/autoupdate.conf"
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,7 @@ set(BNETD_SOURCES
|
||||||
luaobjects.cpp luaobjects.h luawrapper.cpp luawrapper.h
|
luaobjects.cpp luaobjects.h luawrapper.cpp luawrapper.h
|
||||||
i18n.cpp i18n.h userlog.cpp userlog.h
|
i18n.cpp i18n.h userlog.cpp userlog.h
|
||||||
../win32/winmain.cpp ../win32/winmain.h
|
../win32/winmain.cpp ../win32/winmain.h
|
||||||
|
../json/json.hpp
|
||||||
)
|
)
|
||||||
|
|
||||||
set(BNETD_CONSOLE_RESOURCES
|
set(BNETD_CONSOLE_RESOURCES
|
||||||
|
|
|
||||||
|
|
@ -20,383 +20,209 @@
|
||||||
#include "common/setup_before.h"
|
#include "common/setup_before.h"
|
||||||
#include "adbanner.h"
|
#include "adbanner.h"
|
||||||
|
|
||||||
#include <stdexcept>
|
#include <algorithm>
|
||||||
#include <fstream>
|
|
||||||
#include <sstream>
|
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
#include <fstream>
|
||||||
|
#include <random>
|
||||||
|
#include <stdexcept>
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
#include "json/json.hpp"
|
||||||
|
|
||||||
|
#include "common/bn_type.h"
|
||||||
#include "compat/strcasecmp.h"
|
#include "compat/strcasecmp.h"
|
||||||
#include "common/eventlog.h"
|
#include "common/eventlog.h"
|
||||||
#include "common/systemerror.h"
|
|
||||||
#include "connection.h"
|
#include "connection.h"
|
||||||
#include "common/setup_after.h"
|
#include "common/setup_after.h"
|
||||||
|
|
||||||
|
|
||||||
|
using json = nlohmann::json;
|
||||||
|
|
||||||
|
|
||||||
namespace pvpgn
|
namespace pvpgn
|
||||||
{
|
{
|
||||||
namespace bnetd
|
namespace bnetd
|
||||||
{
|
{
|
||||||
scoped_ptr<AdBannerComponent> adbannerlist;
|
std::vector<AdBanner> AdBanner::m_banners;
|
||||||
|
|
||||||
AdBanner::AdBanner(unsigned id_, bn_int extag, unsigned delay_, unsigned next_, const std::string& fname, const std::string& link_, t_clienttag client_, t_gamelang lang_)
|
AdBanner::AdBanner()
|
||||||
:id(id_), extensiontag(bn_int_get(extag)), delay(delay_), next(next_), filename(fname), link(link_), client(client_), lang(lang_)
|
: m_id(0),
|
||||||
{
|
m_extensiontag(0),
|
||||||
/* I'm aware that this statement looks stupid */
|
m_filename(),
|
||||||
if (client && (!tag_check_client(client)))
|
m_url(),
|
||||||
throw std::runtime_error("banner with invalid clienttag \"" + std::string(clienttag_uint_to_str(client)) + "\"encountered");
|
m_client(0),
|
||||||
|
m_lang(0)
|
||||||
char language[5];
|
|
||||||
eventlog(eventlog_level_debug, __FUNCTION__, "created ad id=0x%08x filename=\"%s\" extensiontag=0x%04x delay=%u link=\"%s\" next_id=0x%08x client=\"%s\" lang=\"%s\"", id, filename.c_str(), extensiontag, delay, link.c_str(), next, client ? clienttag_uint_to_str(client) : "NULL", lang ? tag_uint_to_str(language, lang) : "NULL");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
AdBanner::~AdBanner() throw()
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
const AdBanner* AdBannerComponent::find(t_clienttag ctag, t_gamelang lang, unsigned id) const
|
AdBanner::AdBanner(std::size_t id, bn_int extensiontag, const std::string& filename, const std::string& url, t_clienttag clienttag, t_gamelang lang)
|
||||||
|
: m_id(id),
|
||||||
|
m_extensiontag(bn_int_get(extensiontag)),
|
||||||
|
m_filename(filename),
|
||||||
|
m_url(url),
|
||||||
|
m_client(clienttag),
|
||||||
|
m_lang(lang)
|
||||||
{
|
{
|
||||||
return find(std::make_pair(ctag, lang), id);
|
char language[5] = {};
|
||||||
|
eventlog(eventlog_level_debug, __FUNCTION__, "Created ad id=0x%08zu filename=\"%s\" link=\"%s\" client=\"%s\" lang=\"%s\"", id, filename.c_str(), url.c_str(), clienttag ? clienttag_uint_to_str(clienttag) : "NULL", lang ? tag_uint_to_str(language, lang) : "NULL");
|
||||||
}
|
}
|
||||||
|
|
||||||
const AdBanner* AdBannerComponent::find(AdKey adKey, unsigned id) const
|
void AdBanner::load(const std::string& filename)
|
||||||
{
|
{
|
||||||
const AdBanner* result;
|
m_banners.clear();
|
||||||
if ((result = finder(adKey, id)))
|
|
||||||
return result;
|
|
||||||
else if ((result = finder(std::make_pair(adKey.first, 0), id)))
|
|
||||||
return result;
|
|
||||||
else if ((result = finder(std::make_pair(0, adKey.second), id)))
|
|
||||||
return result;
|
|
||||||
else
|
|
||||||
return finder(std::make_pair(0, 0), id);
|
|
||||||
}
|
|
||||||
|
|
||||||
const AdBanner* AdBannerComponent::finder(AdKey adKey, unsigned id) const
|
std::ifstream file_stream(filename, std::ios::in);
|
||||||
{
|
if (!file_stream.is_open())
|
||||||
AdCtagMap::const_iterator cit(adlist.find(adKey));
|
throw std::runtime_error("Could not open " + filename);
|
||||||
if (cit == adlist.end()) return 0;
|
|
||||||
|
|
||||||
AdIdMap::const_iterator iit(cit->second.find(id));
|
json j;
|
||||||
if (iit == cit->second.end()) return 0;
|
try
|
||||||
|
|
||||||
return &(iit->second);
|
|
||||||
}
|
|
||||||
|
|
||||||
const AdBanner* AdBannerComponent::pick(t_clienttag ctag, t_gamelang lang, unsigned prev_id) const
|
|
||||||
{
|
|
||||||
return pick(std::make_pair(ctag, lang), prev_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
const AdBanner* AdBannerComponent::pick(AdKey adKey, unsigned prev_id) const
|
|
||||||
{
|
|
||||||
/* eventlog(eventlog_level_debug,__FUNCTION__,"prev_id=%u init_count=%u start_count=%u norm_count=%u",prev_id,adbannerlist_init_count,adbannerlist_start_count,adbannerlist_norm_count); */
|
|
||||||
/* if this is the first ad, randomly choose an init sequence (if there is one) */
|
|
||||||
if (prev_id == 0 && !adlist_init.empty())
|
|
||||||
return findRandom(adlist_init, adKey);
|
|
||||||
// return list_get_data_by_pos(adbannerlist_init_head,((unsigned int)std::rand())%adbannerlist_init_count);
|
|
||||||
/* eventlog(eventlog_level_debug,__FUNCTION__,"not sending init banner"); */
|
|
||||||
|
|
||||||
unsigned next_id = 0;
|
|
||||||
const AdBanner* prev(find(adKey, prev_id));
|
|
||||||
if (prev) next_id = prev->getNextId();
|
|
||||||
|
|
||||||
/* return its next ad if there is one */
|
|
||||||
if (next_id)
|
|
||||||
{
|
{
|
||||||
const AdBanner* curr(find(adKey, next_id));
|
j << file_stream;
|
||||||
if (curr) return curr;
|
|
||||||
ERROR1("could not locate next requested ad with id 0x%06x", next_id);
|
|
||||||
}
|
}
|
||||||
/* eventlog(eventlog_level_debug,__FUNCTION__,"not sending next banner"); */
|
catch (const std::invalid_argument& e)
|
||||||
|
|
||||||
/* otherwise choose another starting point randomly */
|
|
||||||
if (!adlist_start.empty())
|
|
||||||
return findRandom(adlist_start, adKey);
|
|
||||||
|
|
||||||
/* eventlog(eventlog_level_debug,__FUNCTION__,"not sending start banner... nothing to return"); */
|
|
||||||
return NULL; /* nothing else to return */
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned AdBanner::getId() const
|
|
||||||
{
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned AdBanner::getNextId() const
|
|
||||||
{
|
|
||||||
return next;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned AdBanner::getExtensionTag() const
|
|
||||||
{
|
|
||||||
return extensiontag;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
char const * AdBanner::getFilename() const
|
|
||||||
{
|
|
||||||
return filename.c_str();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
char const * AdBanner::getLink() const
|
|
||||||
{
|
|
||||||
return link.c_str();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
t_clienttag AdBanner::getClient() const
|
|
||||||
{
|
|
||||||
return client;
|
|
||||||
}
|
|
||||||
|
|
||||||
const AdBanner* AdBannerComponent::findRandom(const AdCtagRefMap& where, AdKey adKey) const
|
|
||||||
{
|
|
||||||
const AdBanner* result;
|
|
||||||
// first try language and client specific ad
|
|
||||||
if ((result = randomFinder(where, adKey)))
|
|
||||||
return result;
|
|
||||||
// then try discarding language
|
|
||||||
else if ((result = randomFinder(where, std::make_pair(adKey.first, 0))))
|
|
||||||
return result;
|
|
||||||
// now discard client
|
|
||||||
else if ((result = randomFinder(where, std::make_pair(0, adKey.second))))
|
|
||||||
return result;
|
|
||||||
// and finally look for a totally unspecific ad
|
|
||||||
else
|
|
||||||
return randomFinder(where, std::make_pair(0, 0));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
const AdBanner* AdBannerComponent::randomFinder(const AdCtagRefMap& where, AdKey adKey) const
|
|
||||||
{
|
|
||||||
/* first try to lookup a random banner into the specific client tag map */
|
|
||||||
AdCtagRefMap::const_iterator cit(where.find(adKey));
|
|
||||||
if (cit == where.end() || cit->second.size() == 0)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
unsigned pos = (static_cast<unsigned>(std::rand())) % cit->second.size();
|
|
||||||
/* TODO: optimize this linear search ? */
|
|
||||||
for (AdIdRefMap::const_iterator it(cit->second.begin()); it != cit->second.end(); ++it)
|
|
||||||
{
|
{
|
||||||
if (!pos) return &(it->second->second);
|
throw std::runtime_error("Invalid JSON file: " + std::string(e.what()));
|
||||||
--pos;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
for (const auto& ad : j["ads"])
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void AdBannerComponent::insert(AdCtagRefMap& where, const std::string& fname, unsigned id, unsigned delay, const std::string& link, unsigned next_id, const std::string& client, const std::string& lang)
|
|
||||||
{
|
|
||||||
std::string::size_type idx(fname.rfind('.'));
|
|
||||||
if (idx == std::string::npos || idx + 4 != fname.size())
|
|
||||||
{
|
{
|
||||||
ERROR1("Invalid extension for '%s'", fname.c_str());
|
try
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string ext(fname.substr(idx + 1));
|
|
||||||
|
|
||||||
bn_int bntag;
|
|
||||||
if (strcasecmp(ext.c_str(), "pcx") == 0)
|
|
||||||
bn_int_tag_set(&bntag, EXTENSIONTAG_PCX);
|
|
||||||
else if (strcasecmp(ext.c_str(), "mng") == 0)
|
|
||||||
bn_int_tag_set(&bntag, EXTENSIONTAG_MNG);
|
|
||||||
else if (strcasecmp(ext.c_str(), "png") == 0)
|
|
||||||
bn_int_tag_set(&bntag, EXTENSIONTAG_MNG);
|
|
||||||
else if (strcasecmp(ext.c_str(), "smk") == 0)
|
|
||||||
bn_int_tag_set(&bntag, EXTENSIONTAG_SMK);
|
|
||||||
else {
|
|
||||||
ERROR1("unknown extension on filename \"%s\"", fname.c_str());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
t_clienttag ctag;
|
|
||||||
if (!strcasecmp(client.c_str(), "NULL"))
|
|
||||||
ctag = 0;
|
|
||||||
else
|
|
||||||
ctag = clienttag_str_to_uint(client.c_str());
|
|
||||||
|
|
||||||
t_gamelang ltag;
|
|
||||||
if (!strcasecmp(lang.c_str(), "any"))
|
|
||||||
ltag = 0;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ltag = tag_str_to_uint(lang.c_str());
|
|
||||||
if (!tag_check_gamelang(ltag))
|
|
||||||
{
|
{
|
||||||
eventlog(eventlog_level_error, __FUNCTION__, "got unknown language tag \"%s\"", lang.c_str());
|
if (ad["filename"].get<std::string>().find('/') != std::string::npos
|
||||||
return;
|
|| ad["filename"].get<std::string>().find('\\') != std::string::npos)
|
||||||
|
throw std::runtime_error("Paths are not supported (" + ad["filename"].get<std::string>() + ")");
|
||||||
|
|
||||||
|
std::size_t ext = ad["filename"].get<std::string>().find('.');
|
||||||
|
if (ext == std::string::npos)
|
||||||
|
throw std::runtime_error("Filename must contain an extension");
|
||||||
|
|
||||||
|
std::string file_extension(ad["filename"].get<std::string>().substr(ext + 1));
|
||||||
|
bn_int extensiontag = {};
|
||||||
|
if (strcasecmp(file_extension.c_str(), "pcx") == 0)
|
||||||
|
bn_int_tag_set(&extensiontag, EXTENSIONTAG_PCX);
|
||||||
|
else if (strcasecmp(file_extension.c_str(), "mng") == 0)
|
||||||
|
bn_int_tag_set(&extensiontag, EXTENSIONTAG_MNG);
|
||||||
|
else if (strcasecmp(file_extension.c_str(), "png") == 0)
|
||||||
|
bn_int_tag_set(&extensiontag, EXTENSIONTAG_MNG);
|
||||||
|
else if (strcasecmp(file_extension.c_str(), "smk") == 0)
|
||||||
|
bn_int_tag_set(&extensiontag, EXTENSIONTAG_SMK);
|
||||||
|
else
|
||||||
|
throw std::runtime_error("Unknown file extension (" + file_extension + ")");
|
||||||
|
|
||||||
|
t_clienttag ctag = 0;
|
||||||
|
if (strcasecmp(ad["client"].get<std::string>().c_str(), "NULL") != 0)
|
||||||
|
{
|
||||||
|
ctag = clienttag_str_to_uint(ad["client"].get<std::string>().c_str());
|
||||||
|
|
||||||
|
if (std::strcmp(clienttag_uint_to_str(ctag), "UNKN") == 0)
|
||||||
|
throw std::runtime_error("Unknown client tag (" + ad["client"].get<std::string>() + ")");
|
||||||
|
}
|
||||||
|
|
||||||
|
t_gamelang ltag = 0;
|
||||||
|
if (strcasecmp(ad["lang"].get<std::string>().c_str(), "any") != 0)
|
||||||
|
{
|
||||||
|
ltag = tag_str_to_uint(ad["lang"].get<std::string>().c_str());
|
||||||
|
|
||||||
|
if (!tag_check_gamelang(ltag))
|
||||||
|
throw std::runtime_error("Unknown language (" + ad["lang"].get<std::string>() + ")");
|
||||||
|
}
|
||||||
|
|
||||||
|
m_banners.push_back(AdBanner(m_banners.size(), extensiontag, ad["filename"].get<std::string>(),
|
||||||
|
ad["url"].get<std::string>(), ctag, ltag));
|
||||||
}
|
}
|
||||||
}
|
catch (const std::runtime_error& e)
|
||||||
|
|
||||||
AdKey adKey = std::make_pair(ctag, ltag);
|
|
||||||
|
|
||||||
// check if the ctag is known so far
|
|
||||||
AdCtagMap::iterator cit(adlist.find(adKey));
|
|
||||||
// if not register the ctag then insert new
|
|
||||||
if (cit == adlist.end())
|
|
||||||
{
|
|
||||||
std::pair<AdCtagMap::iterator, bool> res(adlist.insert(std::make_pair(adKey, AdIdMap())));
|
|
||||||
if (!res.second)
|
|
||||||
throw std::runtime_error("Could not insert unexistent element into map?!");
|
|
||||||
cit = res.first;
|
|
||||||
}
|
|
||||||
|
|
||||||
// insert the adbanner into the ctag specific AdIdMap
|
|
||||||
std::pair<AdIdMap::iterator, bool> res(cit->second.insert(std::make_pair(id, AdBanner(id, bntag, delay, next_id, fname, link, ctag, ltag))));
|
|
||||||
if (!res.second)
|
|
||||||
{
|
|
||||||
ERROR0("Couldnt insert new ad banner, duplicate banner IDs ?!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// check if where already knows about ctag
|
|
||||||
AdCtagRefMap::iterator cit2(where.find(adKey));
|
|
||||||
// if not register ctag
|
|
||||||
if (cit2 == where.end())
|
|
||||||
{
|
|
||||||
std::pair<AdCtagRefMap::iterator, bool> res2(where.insert(std::make_pair(adKey, AdIdRefMap())));
|
|
||||||
if (!res2.second)
|
|
||||||
{
|
{
|
||||||
cit->second.erase(res.first);
|
eventlog(eventlog_level_error, __FUNCTION__, "Could not load ad: %s", e.what());
|
||||||
throw std::runtime_error("Could not insert unexistent element into map?!");
|
|
||||||
}
|
|
||||||
cit2 = res2.first;
|
|
||||||
}
|
|
||||||
|
|
||||||
// insert reference to adbanner into the ctag specific AdIdRefMap
|
|
||||||
if (!cit2->second.insert(std::make_pair(id, res.first)).second)
|
|
||||||
{
|
|
||||||
cit->second.erase(res.first);
|
|
||||||
throw std::runtime_error("Could not insert unexistent element into map?!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
AdBannerComponent::AdBannerComponent(const std::string& fname)
|
|
||||||
:adlist(), adlist_init(), adlist_start(), adlist_norm()
|
|
||||||
{
|
|
||||||
std::ifstream fp(fname.c_str());
|
|
||||||
if (!fp)
|
|
||||||
{
|
|
||||||
ERROR2("could not open adbanner file \"%s\" for reading (std::fopen: %s)", fname.c_str(), std::strerror(errno));
|
|
||||||
throw SystemError("open");
|
|
||||||
}
|
|
||||||
|
|
||||||
// FIXME: (HarpyWar) this value is unused, because game clients retrieve ads in interval of ~20 seconds;
|
|
||||||
// I think this is normal delay
|
|
||||||
unsigned delay = 30;
|
|
||||||
|
|
||||||
std::vector<std::map<std::string, std::string> > tmplist;
|
|
||||||
|
|
||||||
std::string name, link, client, lang;
|
|
||||||
std::string buff;
|
|
||||||
// 1) Read ad.conf file
|
|
||||||
for (unsigned line = 1; std::getline(fp, buff); ++line)
|
|
||||||
{
|
|
||||||
std::string::size_type idx(buff.find('#'));
|
|
||||||
if (idx != std::string::npos) buff.erase(idx);
|
|
||||||
|
|
||||||
idx = buff.find_first_not_of(" \t");
|
|
||||||
if (idx == std::string::npos) continue;
|
|
||||||
|
|
||||||
std::istringstream is(buff);
|
|
||||||
|
|
||||||
is >> name;
|
|
||||||
is >> link;
|
|
||||||
is >> client;
|
|
||||||
is >> lang;
|
|
||||||
|
|
||||||
if (!is || name.size() < 2 || link.size() < 2 || client.size() < 2 || lang.size() < 2)
|
|
||||||
{
|
|
||||||
ERROR2("malformed line %u in file \"%s\"", line, fname.c_str());
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
name.erase(0, 1);
|
|
||||||
name.erase(name.size() - 1);
|
|
||||||
link.erase(0, 1);
|
|
||||||
link.erase(link.size() - 1);
|
|
||||||
client.erase(0, 1);
|
|
||||||
client.erase(client.size() - 1);
|
|
||||||
lang.erase(0, 1);
|
|
||||||
lang.erase(lang.size() - 1);
|
|
||||||
|
|
||||||
std::map<std::string, std::string> item;
|
|
||||||
item["name"] = name;
|
|
||||||
item["link"] = link;
|
|
||||||
item["client"] = client;
|
|
||||||
item["lang"] = lang;
|
|
||||||
tmplist.push_back(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned id = 0;
|
|
||||||
int init_count = 0;
|
|
||||||
|
|
||||||
bool first = true;
|
|
||||||
std::map<std::string, int> tmpdata;
|
|
||||||
unsigned next_id;
|
|
||||||
|
|
||||||
// insert ads
|
|
||||||
for (std::vector<std::map<std::string, std::string> >::iterator it = tmplist.begin(); it != tmplist.end(); ++it)
|
|
||||||
{
|
|
||||||
id++;
|
|
||||||
tmpdata = get_rowdata(id, (*it)["client"], tmplist, init_count);
|
|
||||||
next_id = tmpdata["next_id"];
|
|
||||||
|
|
||||||
if ((*it)["client"] == CLIENTTAG_WAR3XP || (*it)["client"] == CLIENTTAG_WARCRAFT3)
|
|
||||||
{
|
|
||||||
// warcraft 3 doesn't return previous ad id in SID_CHECKAD, and we must process all ADs as "init"
|
|
||||||
// so they will be shown randomly
|
|
||||||
insert(adlist_init, (*it)["name"], id, delay, (*it)["link"], id + 1, (*it)["client"], (*it)["lang"]);
|
|
||||||
}
|
|
||||||
else if (tmpdata["when"] == 1)
|
|
||||||
{
|
|
||||||
init_count++;
|
|
||||||
// "init"
|
|
||||||
insert(adlist_init, (*it)["name"], id, delay, (*it)["link"], id+1, (*it)["client"], (*it)["lang"]);
|
|
||||||
id++;
|
|
||||||
if (next_id > 0) next_id++;
|
|
||||||
// and duplicate the same ad in "start"
|
|
||||||
insert(adlist_start, (*it)["name"], id, delay, (*it)["link"], next_id, (*it)["client"], (*it)["lang"]);
|
|
||||||
}
|
|
||||||
else if (tmpdata["when"] > 1)
|
|
||||||
{
|
|
||||||
insert(adlist_norm, (*it)["name"], id, delay, (*it)["link"], next_id, (*it)["client"], (*it)["lang"]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::map<std::string, int> AdBannerComponent::get_rowdata(int id, std::string client, std::vector<std::map<std::string, std::string> > templist, int init_count)
|
AdBanner AdBanner::pick(t_clienttag client_tag, t_gamelang client_lang, std::size_t prev_ad_id)
|
||||||
{
|
{
|
||||||
std::map<std::string, int> data;
|
auto random_ad = [client_tag, client_lang, prev_ad_id]()
|
||||||
|
|
||||||
int tmpid = init_count;
|
|
||||||
// find clienttag
|
|
||||||
for (std::vector<std::map<std::string, std::string> >::iterator it = templist.begin(); it != templist.end(); ++it)
|
|
||||||
{
|
{
|
||||||
tmpid++;
|
std::vector<AdBanner> candidates = {};
|
||||||
if ((*it)["client"] == client)
|
std::copy_if(m_banners.begin(), m_banners.end(), std::back_inserter(candidates), [=](const AdBanner& a) -> bool
|
||||||
{
|
{
|
||||||
if (tmpid <= id)
|
return a.get_client() == client_tag
|
||||||
data["when"]++;
|
&& a.get_language() == client_lang
|
||||||
|
&& a.get_id() != prev_ad_id
|
||||||
|
? true : false;
|
||||||
|
});
|
||||||
|
|
||||||
// set next_id if value is not greater of max size
|
std::default_random_engine eng{};
|
||||||
if (tmpid > id)
|
std::uniform_int_distribution<std::size_t> random(0, m_banners.size() - 1);
|
||||||
{
|
|
||||||
data["next_id"] = tmpid;
|
return m_banners.at(random(eng));
|
||||||
break;
|
};
|
||||||
}
|
|
||||||
}
|
switch (m_banners.size())
|
||||||
|
{
|
||||||
|
case 0:
|
||||||
|
return AdBanner();
|
||||||
|
case 1:
|
||||||
|
return m_banners.at(0);
|
||||||
|
default:
|
||||||
|
if (prev_ad_id == 0)
|
||||||
|
return random_ad();
|
||||||
|
else
|
||||||
|
return m_banners.at(prev_ad_id + 1);
|
||||||
}
|
}
|
||||||
return data;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
AdBannerComponent::~AdBannerComponent() throw()
|
AdBanner AdBanner::find(t_clienttag client_tag, t_gamelang client_lang, std::size_t ad_id)
|
||||||
{}
|
{
|
||||||
|
auto result = std::find_if(m_banners.begin(), m_banners.end(),
|
||||||
|
[client_tag, client_lang, ad_id](const AdBanner& a) -> bool
|
||||||
|
{
|
||||||
|
return a.get_client() == client_tag && a.get_language() == client_lang && a.get_id() == ad_id ? true : false;
|
||||||
|
});
|
||||||
|
|
||||||
|
return result != m_banners.end() ? m_banners.at(result - m_banners.begin()) : AdBanner();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AdBanner::empty() const
|
||||||
|
{
|
||||||
|
return this->m_client == 0
|
||||||
|
&& this->m_extensiontag == 0
|
||||||
|
&& this->m_filename.empty()
|
||||||
|
&& this->m_id == 0
|
||||||
|
&& this->m_lang == 0
|
||||||
|
&& this->m_url.empty()
|
||||||
|
? true : false;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::size_t AdBanner::get_id() const
|
||||||
|
{
|
||||||
|
return this->m_id;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int AdBanner::get_extension_tag() const
|
||||||
|
{
|
||||||
|
return this->m_extensiontag;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string AdBanner::get_filename() const
|
||||||
|
{
|
||||||
|
return this->m_filename;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string AdBanner::get_url() const
|
||||||
|
{
|
||||||
|
return this->m_url;
|
||||||
|
}
|
||||||
|
|
||||||
|
t_clienttag AdBanner::get_client() const
|
||||||
|
{
|
||||||
|
return this->m_client;
|
||||||
|
}
|
||||||
|
|
||||||
|
t_gamelang AdBanner::get_language() const
|
||||||
|
{
|
||||||
|
return this->m_lang;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,78 +19,48 @@
|
||||||
#define INCLUDED_ADBANNER_H
|
#define INCLUDED_ADBANNER_H
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <map>
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "common/tag.h"
|
#include "common/tag.h"
|
||||||
#include "common/scoped_ptr.h"
|
|
||||||
#include "common/bn_type.h"
|
#include "common/bn_type.h"
|
||||||
|
|
||||||
|
|
||||||
namespace pvpgn
|
namespace pvpgn
|
||||||
{
|
{
|
||||||
|
|
||||||
namespace bnetd
|
namespace bnetd
|
||||||
{
|
{
|
||||||
|
|
||||||
class AdBanner
|
class AdBanner
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
AdBanner(unsigned id_, bn_int extag, unsigned delay_, unsigned next_, const std::string& fname, const std::string& link_, t_clienttag client_, t_gamelang lang_);
|
AdBanner();
|
||||||
~AdBanner() throw();
|
|
||||||
|
|
||||||
unsigned getId() const;
|
void load(const std::string& filename);
|
||||||
unsigned getNextId() const;
|
|
||||||
unsigned getExtensionTag() const;
|
static AdBanner pick(t_clienttag client_tag, t_gamelang client_lang, std::size_t prev_ad_id);
|
||||||
char const * getFilename() const;
|
static AdBanner find(t_clienttag client_tag, t_gamelang client_lang, std::size_t ad_id);
|
||||||
char const * getLink() const;
|
|
||||||
t_clienttag getClient() const;
|
bool empty() const;
|
||||||
t_gamelang getGameLang() const;
|
|
||||||
|
std::size_t get_id() const;
|
||||||
|
unsigned int get_extension_tag() const;
|
||||||
|
std::string get_filename() const;
|
||||||
|
std::string get_url() const;
|
||||||
|
t_clienttag get_client() const;
|
||||||
|
t_gamelang get_language() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
unsigned id;
|
AdBanner(std::size_t id, bn_int extensiontag, const std::string& filename, const std::string& url, t_clienttag clienttag, t_gamelang lang);
|
||||||
unsigned extensiontag;
|
|
||||||
unsigned delay; /* in seconds */
|
static std::vector<AdBanner> m_banners;
|
||||||
unsigned next; /* adid or 0 */
|
|
||||||
const std::string filename;
|
const std::size_t m_id;
|
||||||
const std::string link;
|
const std::string m_filename;
|
||||||
t_clienttag client;
|
const unsigned int m_extensiontag;
|
||||||
t_gamelang lang;
|
const std::string m_url;
|
||||||
|
const t_clienttag m_client;
|
||||||
|
const t_gamelang m_lang;
|
||||||
};
|
};
|
||||||
|
|
||||||
class AdBannerComponent
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
explicit AdBannerComponent(const std::string& fname);
|
|
||||||
~AdBannerComponent() throw();
|
|
||||||
|
|
||||||
typedef std::pair<t_clienttag, t_gamelang> AdKey;
|
|
||||||
const AdBanner* pick(t_clienttag ctag, t_gamelang lang, unsigned prev_id) const;
|
|
||||||
const AdBanner* find(t_clienttag ctag, t_gamelang lang, unsigned id) const;
|
|
||||||
|
|
||||||
private:
|
|
||||||
typedef std::map<unsigned, AdBanner> AdIdMap;
|
|
||||||
typedef std::map<AdKey, AdIdMap> AdCtagMap;
|
|
||||||
typedef std::map<unsigned, AdIdMap::const_iterator> AdIdRefMap;
|
|
||||||
typedef std::map<AdKey, AdIdRefMap> AdCtagRefMap;
|
|
||||||
|
|
||||||
AdCtagMap adlist;
|
|
||||||
AdCtagRefMap adlist_init;
|
|
||||||
AdCtagRefMap adlist_start;
|
|
||||||
AdCtagRefMap adlist_norm;
|
|
||||||
|
|
||||||
const AdBanner* pick(AdKey adKey, unsigned prev_id) const;
|
|
||||||
const AdBanner* find(AdKey adKey, unsigned id) const;
|
|
||||||
const AdBanner* finder(AdKey adKey, unsigned id) const;
|
|
||||||
const AdBanner* findRandom(const AdCtagRefMap& where, AdKey adKey) const;
|
|
||||||
const AdBanner* randomFinder(const AdCtagRefMap& where, AdKey adKey) const;
|
|
||||||
void insert(AdCtagRefMap& where, const std::string& fname, unsigned id, unsigned delay, const std::string& link, unsigned next_id, const std::string& client, const std::string& lang);
|
|
||||||
std::map<std::string, int> get_rowdata(int id, std::string client, std::vector<std::map<std::string, std::string> > templist, int init_count);
|
|
||||||
};
|
|
||||||
|
|
||||||
extern scoped_ptr<AdBannerComponent> adbannerlist;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -3207,31 +3207,26 @@ namespace pvpgn
|
||||||
|
|
||||||
static int _client_adreq(t_connection * c, t_packet const *const packet)
|
static int _client_adreq(t_connection * c, t_packet const *const packet)
|
||||||
{
|
{
|
||||||
t_packet *rpacket;
|
if (packet_get_size(packet) < sizeof(t_client_adreq))
|
||||||
|
{
|
||||||
if (packet_get_size(packet) < sizeof(t_client_adreq)) {
|
|
||||||
eventlog(eventlog_level_error, __FUNCTION__, "[%d] got bad ADREQ packet (expected %lu bytes, got %u)", conn_get_socket(c), sizeof(t_client_adreq), packet_get_size(packet));
|
eventlog(eventlog_level_error, __FUNCTION__, "[%d] got bad ADREQ packet (expected %lu bytes, got %u)", conn_get_socket(c), sizeof(t_client_adreq), packet_get_size(packet));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
AdBanner ad = AdBanner::pick(conn_get_clienttag(c), conn_get_gamelang(c), bn_int_get(packet->u.client_adreq.prev_adid));
|
||||||
const AdBanner *ad = adbannerlist->pick(conn_get_clienttag(c), conn_get_gamelang(c), bn_int_get(packet->u.client_adreq.prev_adid));
|
if (ad.empty())
|
||||||
if (!ad)
|
return 0;
|
||||||
return 0;
|
|
||||||
|
|
||||||
/* eventlog(eventlog_level_debug,__FUNCTION__,"[%d] picking ad file=\"%s\" id=0x%06x tag=%u",conn_get_socket(c),adbanner_get_filename(ad),adbanner_get_id(ad),adbanner_get_extensiontag(ad)); */
|
t_packet *rpacket = packet_create(packet_class_bnet);
|
||||||
if ((rpacket = packet_create(packet_class_bnet))) {
|
packet_set_size(rpacket, sizeof(t_server_adreply));
|
||||||
packet_set_size(rpacket, sizeof(t_server_adreply));
|
packet_set_type(rpacket, SERVER_ADREPLY);
|
||||||
packet_set_type(rpacket, SERVER_ADREPLY);
|
bn_int_set(&rpacket->u.server_adreply.adid, ad.get_id());
|
||||||
bn_int_set(&rpacket->u.server_adreply.adid, ad->getId());
|
bn_int_set(&rpacket->u.server_adreply.extensiontag, ad.get_extension_tag());
|
||||||
bn_int_set(&rpacket->u.server_adreply.extensiontag, ad->getExtensionTag());
|
file_to_mod_time(c, ad.get_filename().c_str(), &rpacket->u.server_adreply.timestamp);
|
||||||
file_to_mod_time(c, ad->getFilename(), &rpacket->u.server_adreply.timestamp);
|
packet_append_string(rpacket, ad.get_filename().c_str());
|
||||||
packet_append_string(rpacket, ad->getFilename());
|
packet_append_string(rpacket, ad.get_url().c_str());
|
||||||
packet_append_string(rpacket, ad->getLink());
|
conn_push_outqueue(c, rpacket);
|
||||||
conn_push_outqueue(c, rpacket);
|
packet_del_ref(rpacket);
|
||||||
packet_del_ref(rpacket);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
@ -3268,29 +3263,26 @@ namespace pvpgn
|
||||||
|
|
||||||
static int _client_adclick2(t_connection * c, t_packet const *const packet)
|
static int _client_adclick2(t_connection * c, t_packet const *const packet)
|
||||||
{
|
{
|
||||||
t_packet *rpacket;
|
if (packet_get_size(packet) < sizeof(t_client_adclick2))
|
||||||
|
{
|
||||||
if (packet_get_size(packet) < sizeof(t_client_adclick2)) {
|
|
||||||
eventlog(eventlog_level_error, __FUNCTION__, "[%d] got bad ADCLICK2 packet (expected %lu bytes, got %u)", conn_get_socket(c), sizeof(t_client_adclick2), packet_get_size(packet));
|
eventlog(eventlog_level_error, __FUNCTION__, "[%d] got bad ADCLICK2 packet (expected %lu bytes, got %u)", conn_get_socket(c), sizeof(t_client_adclick2), packet_get_size(packet));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
eventlog(eventlog_level_info, __FUNCTION__, "[%d] ad click2 for adid 0x%04hx from \"%s\"", conn_get_socket(c), bn_int_get(packet->u.client_adclick2.adid), conn_get_username(c));
|
eventlog(eventlog_level_trace, __FUNCTION__, "[%d] ad click2 for adid 0x%04hx from \"%s\"", conn_get_socket(c), bn_int_get(packet->u.client_adclick2.adid), conn_get_username(c));
|
||||||
|
|
||||||
{
|
|
||||||
const AdBanner *ad = adbannerlist->find(conn_get_clienttag(c), conn_get_gamelang(c), bn_int_get(packet->u.client_adclick2.adid));
|
|
||||||
if (!ad)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
if ((rpacket = packet_create(packet_class_bnet))) {
|
AdBanner ad = AdBanner::find(conn_get_clienttag(c), conn_get_gamelang(c), bn_int_get(packet->u.client_adclick2.adid));
|
||||||
packet_set_size(rpacket, sizeof(t_server_adclickreply2));
|
if (ad.empty())
|
||||||
packet_set_type(rpacket, SERVER_ADCLICKREPLY2);
|
return 0;
|
||||||
bn_int_set(&rpacket->u.server_adclickreply2.adid, ad->getId());
|
|
||||||
packet_append_string(rpacket, ad->getLink());
|
t_packet *rpacket = packet_create(packet_class_bnet);
|
||||||
conn_push_outqueue(c, rpacket);
|
packet_set_size(rpacket, sizeof(t_server_adclickreply2));
|
||||||
packet_del_ref(rpacket);
|
packet_set_type(rpacket, SERVER_ADCLICKREPLY2);
|
||||||
}
|
bn_int_set(&rpacket->u.server_adclickreply2.adid, ad.get_id());
|
||||||
}
|
packet_append_string(rpacket, ad.get_url().c_str());
|
||||||
|
conn_push_outqueue(c, rpacket);
|
||||||
|
packet_del_ref(rpacket);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
#include <exception>
|
#include <exception>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
#include <stdexcept>
|
||||||
|
|
||||||
#include <cerrno>
|
#include <cerrno>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
@ -366,7 +367,16 @@ int pre_server_startup(void)
|
||||||
ipbanlist_create();
|
ipbanlist_create();
|
||||||
if (ipbanlist_load(prefs_get_ipbanfile()) < 0)
|
if (ipbanlist_load(prefs_get_ipbanfile()) < 0)
|
||||||
eventlog(eventlog_level_error, __FUNCTION__, "could not load IP ban list");
|
eventlog(eventlog_level_error, __FUNCTION__, "could not load IP ban list");
|
||||||
adbannerlist.reset(new AdBannerComponent(prefs_get_adfile()));
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
AdBanner().load(prefs_get_adfile());
|
||||||
|
}
|
||||||
|
catch (const std::runtime_error& e)
|
||||||
|
{
|
||||||
|
eventlog(eventlog_level_error, __FUNCTION__, "%s", e.what());
|
||||||
|
}
|
||||||
|
|
||||||
if (autoupdate_load(prefs_get_mpqfile()) < 0)
|
if (autoupdate_load(prefs_get_mpqfile()) < 0)
|
||||||
eventlog(eventlog_level_error, __FUNCTION__, "could not load autoupdate list");
|
eventlog(eventlog_level_error, __FUNCTION__, "could not load autoupdate list");
|
||||||
if (versioncheck_load(prefs_get_versioncheck_file()) < 0)
|
if (versioncheck_load(prefs_get_versioncheck_file()) < 0)
|
||||||
|
|
@ -441,7 +451,6 @@ void post_server_shutdown(int status)
|
||||||
news_unload();
|
news_unload();
|
||||||
versioncheck_unload();
|
versioncheck_unload();
|
||||||
autoupdate_unload();
|
autoupdate_unload();
|
||||||
adbannerlist.reset();
|
|
||||||
ipbanlist_save(prefs_get_ipbanfile());
|
ipbanlist_save(prefs_get_ipbanfile());
|
||||||
ipbanlist_destroy();
|
ipbanlist_destroy();
|
||||||
helpfile_unload();
|
helpfile_unload();
|
||||||
|
|
|
||||||
|
|
@ -1438,7 +1438,14 @@ namespace pvpgn
|
||||||
|
|
||||||
if (do_restart == restart_mode_all || do_restart == restart_mode_banners)
|
if (do_restart == restart_mode_all || do_restart == restart_mode_banners)
|
||||||
{
|
{
|
||||||
adbannerlist.reset(new AdBannerComponent(prefs_get_adfile()));
|
try
|
||||||
|
{
|
||||||
|
AdBanner().load(prefs_get_adfile());
|
||||||
|
}
|
||||||
|
catch (const std::runtime_error& e)
|
||||||
|
{
|
||||||
|
eventlog(eventlog_level_error, __FUNCTION__, "%s", e.what());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (do_restart == restart_mode_all || do_restart == restart_mode_tracker)
|
if (do_restart == restart_mode_all || do_restart == restart_mode_tracker)
|
||||||
|
|
|
||||||
10182
src/json/json.hpp
Normal file
10182
src/json/json.hpp
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue