-#include "rpcconfig.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <unistd.h>
#include <cstdlib>
#include <csignal>
+#include <cerrno>
+#include <cstring>
+#include <vector>
+#include <algorithm>
+#include <ostream> // xmlrpc-c devs have missed something :)
+
+#include "stg/common.h"
+#include "stg/admin.h"
+#include "stg/module_settings.h"
+#include "stg/settings.h"
+#include "stg/plugin_creator.h"
+
+#include "rpcconfig.h"
#include "info_methods.h"
#include "users_methods.h"
#include "tariffs_methods.h"
#include "admins_methods.h"
#include "messages_methods.h"
-class RPC_CONFIG_CREATOR
-{
-private:
- RPC_CONFIG * rpcconfig;
-
-public:
- RPC_CONFIG_CREATOR()
- : rpcconfig(new RPC_CONFIG())
- {
- };
- ~RPC_CONFIG_CREATOR()
- {
- delete rpcconfig;
- };
-
- RPC_CONFIG * GetPlugin()
- {
- return rpcconfig;
- };
-};
-
-RPC_CONFIG_CREATOR rpcc;
+PLUGIN_CREATOR<RPC_CONFIG> rpcc;
RPC_CONFIG_SETTINGS::RPC_CONFIG_SETTINGS()
: errorStr(),
{
}
-int RPC_CONFIG_SETTINGS::ParseIntInRange(const string & str,
- int min,
- int max,
- int * val)
-{
-if (str2x(str.c_str(), *val))
- {
- errorStr = "Incorrect value \'" + str + "\'.";
- return -1;
- }
-if (*val < min || *val > max)
- {
- errorStr = "Value \'" + str + "\' out of range.";
- return -1;
- }
-return 0;
-}
-
int RPC_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
{
int p;
PARAM_VALUE pv;
-vector<PARAM_VALUE>::const_iterator pvi;
+
std::vector<PARAM_VALUE>::const_iterator pvi;
pv.param = "Port";
-pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv);
+pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
if (pvi == s.moduleParams.end())
{
errorStr = "Parameter \'Port\' not found.";
port = p;
pv.param = "CookieTimeout";
-pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv);
+pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
if (pvi == s.moduleParams.end())
{
cookieTimeout = 1800; // 30 * 60
return 0;
}
-BASE_PLUGIN * GetPlugin()
+PLUGIN * GetPlugin()
{
return rpcc.GetPlugin();
}
RPC_CONFIG::RPC_CONFIG()
- : rpcServer(NULL)
+ : errorStr(),
+ rpcConfigSettings(),
+ users(NULL),
+ admins(NULL),
+ tariffs(NULL),
+ store(NULL),
+ settings(),
+ fd(-1),
+ rpcRegistry(),
+ rpcServer(NULL),
+ running(false),
+ stopped(true),
+ tid(),
+ cookies(),
+ dayFee(0),
+ dirNames()
{
-
}
RPC_CONFIG::~RPC_CONFIG()
return ret;
}
+void RPC_CONFIG::SetStgSettings(const SETTINGS * settings)
+{
+ dayFee = settings->GetDayFee();
+ dirNames.erase(dirNames.begin(), dirNames.end());
+ for (size_t i = 0; i < DIR_NUM; ++i) {
+ dirNames.push_back(settings->GetDirName(i));
+ }
+}
+
int RPC_CONFIG::Start()
{
InitiateRegistry();
running = true;
+
+fd = socket(AF_INET, SOCK_STREAM, 0);
+if (fd < 0)
+ {
+ errorStr = "Failed to create socket";
+ printfd(__FILE__, "Failed to create listening socket: %s\n", strerror(errno));
+ return -1;
+ }
+
+int flag = 1;
+
+if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(flag)))
+ {
+ errorStr = "Setsockopt failed.";
+ printfd(__FILE__, "Setsockopt failed: %s\n", strerror(errno));
+ return -1;
+ }
+
+struct sockaddr_in addr;
+addr.sin_family = AF_INET;
+addr.sin_port = htons(rpcConfigSettings.GetPort());
+addr.sin_addr.s_addr = inet_addr("0.0.0.0");
+
+if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)))
+ {
+ errorStr = "Failed to bind socket";
+ printfd(__FILE__, "Failed to bind listening socket: %s\n", strerror(errno));
+ return -1;
+ }
+
+if (listen(fd, 10))
+ {
+ errorStr = "Failed to listen socket";
+ printfd(__FILE__, "Failed to listen listening socket: %s\n", strerror(errno));
+ return -1;
+ }
+
rpcServer = new xmlrpc_c::serverAbyss(
- rpcRegistry,
- rpcConfigSettings.GetPort(),
- "/var/log/stargazer_rpc.log"
+ xmlrpc_c::serverAbyss::constrOpt()
+ .registryP(&rpcRegistry)
+ .logFileName("/var/log/stargazer_rpc.log")
+ .socketFd(fd)
);
+
if (pthread_create(&tid, NULL, Run, this))
{
errorStr = "Failed to create RPC thread";
printfd(__FILE__, "Failed to crate RPC thread\n");
return -1;
}
+
return 0;
}
{
running = false;
for (int i = 0; i < 5 && !stopped; ++i)
- usleep(200000);
-//rpcServer->terminate();
+ {
+ struct timespec ts = {0, 200000000};
+ nanosleep(&ts, NULL);
+ }
+
if (!stopped)
{
- if (pthread_kill(tid, SIGTERM))
- {
- errorStr = "Failed to kill thread";
- printfd(__FILE__, "Failed to kill thread\n");
- }
- for (int i = 0; i < 25 && !stopped; ++i)
- usleep(200000);
- if (!stopped)
- {
- printfd(__FILE__, "Failed to stop RPC thread\n");
- errorStr = "Failed to stop RPC thread";
- return -1;
- }
- else
- {
- pthread_join(tid, NULL);
- }
+ running = true;
+ printfd(__FILE__, "Failed to stop RPC thread\n");
+ errorStr = "Failed to stop RPC thread";
+ return -1;
+ }
+else
+ {
+ pthread_join(tid, NULL);
}
+
+close(fd);
+
return 0;
}
void * RPC_CONFIG::Run(void * rc)
{
+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+
RPC_CONFIG * config = static_cast<RPC_CONFIG *>(rc);
config->stopped = false;
while (config->running)
{
- config->rpcServer->runOnce();
+ if (WaitPackets(config->fd))
+ config->rpcServer->runOnce();
}
config->stopped = true;
const std::string & password,
std::string * cookie)
{
-ADMIN admin;
+ADMIN * admin = NULL;
-if (!admins->AdminCorrect(login, password, &admin))
+if (!admins->Correct(login, password, &admin))
{
return true;
}
ADMIN_INFO info;
time(&info.accessTime);
info.admin = login;
-info.priviledges = *admin.GetPriv();
+info.priviledges = *admin->GetPriv();
*cookie = GetCookie();
cookies[*cookie] = info;
xmlrpc_c::methodPtr const methodInfoPtr(new METHOD_INFO(
tariffs,
users,
- stgSettings
+ dayFee,
+ dirNames
));
rpcRegistry.addMethod("stargazer.info", methodInfoPtr);
xmlrpc_c::methodPtr const methodChgUserPtr(new METHOD_USER_CHG(
this,
admins,
+ tariffs,
store,
users
));
store,
users
));
-rpcRegistry.addMethod("stargazer.add_cash", methodAddCashPtr);
+rpcRegistry.addMethod("stargazer.add_user_cash", methodAddCashPtr);
xmlrpc_c::methodPtr const methodSetCashPtr(new METHOD_USER_CASH_SET(
this,
store,
users
));
-rpcRegistry.addMethod("stargazer.set_cash", methodSetCashPtr);
+rpcRegistry.addMethod("stargazer.set_user_cash", methodSetCashPtr);
xmlrpc_c::methodPtr const methodTariffChangePtr(new METHOD_USER_TARIFF_CHANGE(
this,
store,
users
));
-rpcRegistry.addMethod("stargazer.tariff_change", methodTariffChangePtr);
+rpcRegistry.addMethod("stargazer.chg_user_tariff", methodTariffChangePtr);
xmlrpc_c::methodPtr const methodGetTariffPtr(new METHOD_TARIFF_GET(
this,
this,
users
));
-rpcRegistry.addMethod("stargazer.send_message", methodSendMessagePtr);
+rpcRegistry.addMethod("stargazer.send_user_message", methodSendMessagePtr);
xmlrpc_c::methodPtr const methodGetOnlinIPsPtr(new METHOD_GET_ONLINE_IPS(
this,
git.stg.codes / stg.git / blobdiff