git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added config serializer.
[stg.git]
/
projects
/
stargazer
/
plugins
/
configuration
/
sgconfig
/
configproto.h
diff --git
a/projects/stargazer/plugins/configuration/sgconfig/configproto.h
b/projects/stargazer/plugins/configuration/sgconfig/configproto.h
index 15809c3c7fd9a6e9848b505691e230c64930f862..4adba09758afae9345de7104f1e4236160a55de9 100644
(file)
--- a/
projects/stargazer/plugins/configuration/sgconfig/configproto.h
+++ b/
projects/stargazer/plugins/configuration/sgconfig/configproto.h
@@
-28,12
+28,8
@@
#ifndef CONFIGPROTO_H
#define CONFIGPROTO_H
#ifndef CONFIGPROTO_H
#define CONFIGPROTO_H
-#include <expat.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <string>
-#include <list>
+#include "parser_auth_by.h"
+#include "parser_user_info.h"
#include "stg/users.h"
#include "stg/admins.h"
#include "stg/users.h"
#include "stg/admins.h"
@@
-41,6
+37,13
@@
#include "stg/logger.h"
#include "parser.h"
#include "stg/logger.h"
#include "parser.h"
+#include <string>
+#include <list>
+
+#include <expat.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+
#define STG_HEADER "SG04"
#define OK_HEADER "OKHD"
#define ERR_HEADER "ERHD"
#define STG_HEADER "SG04"
#define OK_HEADER "OKHD"
#define ERR_HEADER "ERHD"
@@
-52,10
+55,10
@@
//-----------------------------------------------------------------------------
class CONFIGPROTO {
public:
//-----------------------------------------------------------------------------
class CONFIGPROTO {
public:
- CONFIGPROTO();
+ CONFIGPROTO(
PLUGIN_LOGGER & l
);
~CONFIGPROTO();
~CONFIGPROTO();
- void SetPort(uint16_t p
ort);
+ void SetPort(uint16_t p
) { port = p; }
void SetAdmins(ADMINS * a);
void SetUsers(USERS * u);
void SetTariffs(TARIFFS * t);
void SetAdmins(ADMINS * a);
void SetUsers(USERS * u);
void SetTariffs(TARIFFS * t);
@@
-88,12
+91,13
@@
private:
std::list<std::string> requestList;
uint32_t adminIP;
std::string adminLogin;
std::list<std::string> requestList;
uint32_t adminIP;
std::string adminLogin;
+ std::string adminPassword;
uint16_t port;
pthread_t thrReciveSendConf;
bool nonstop;
int state;
ADMIN * currAdmin;
uint16_t port;
pthread_t thrReciveSendConf;
bool nonstop;
int state;
ADMIN * currAdmin;
-
STG_LOGGER & WriteServLog
;
+
PLUGIN_LOGGER & logger
;
int listenSocket;
int listenSocket;
@@
-106,6
+110,8
@@
private:
PARSER_DEL_USER parserDelUser;
PARSER_CHECK_USER parserCheckUser;
PARSER_SEND_MESSAGE parserSendMessage;
PARSER_DEL_USER parserDelUser;
PARSER_CHECK_USER parserCheckUser;
PARSER_SEND_MESSAGE parserSendMessage;
+ PARSER_AUTH_BY parserAuthBy;
+ PARSER_USER_INFO parserUserInfo;
PARSER_GET_ADMINS parserGetAdmins;
PARSER_ADD_ADMIN parserAddAdmin;
PARSER_GET_ADMINS parserGetAdmins;
PARSER_ADD_ADMIN parserAddAdmin;
@@
-120,7
+126,7
@@
private:
ADMINS * admins;
BASE_PARSER * currParser;
ADMINS * admins;
BASE_PARSER * currParser;
-
vector<BASE_PARSER *>
dataParser;
+
std::vector<BASE_PARSER *>
dataParser;
XML_Parser xmlParser;
XML_Parser xmlParser;