}
//-----------------------------------------------------------------------------
-std::string ReplaceStr(std::string source, const std::string symlist, const char chgsym)
+std::string ReplaceStr(std::string source, const std::string & symlist, const char chgsym)
{
std::string::size_type pos=0;
}
//-----------------------------------------------------------------------------
MYSQL_STORE_SETTINGS::MYSQL_STORE_SETTINGS()
- : settings(NULL),
- errorStr(),
- dbUser(),
- dbPass(),
- dbName(),
- dbHost()
+ : settings(NULL)
{
}
//-----------------------------------------------------------------------------
-int MYSQL_STORE_SETTINGS::ParseParam(const std::vector<PARAM_VALUE> & moduleParams,
- const std::string & name, std::string & result)
+int MYSQL_STORE_SETTINGS::ParseParam(const std::vector<PARAM_VALUE> & moduleParams,
+ const std::string & name, std::string & result)
{
PARAM_VALUE pv;
pv.param = name;
std::vector<PARAM_VALUE>::const_iterator pvi;
pvi = find(moduleParams.begin(), moduleParams.end(), pv);
-if (pvi == moduleParams.end())
+if (pvi == moduleParams.end() || pvi->value.empty())
{
errorStr = "Parameter \'" + name + "\' not found.";
return -1;
}
-
+
result = pvi->value[0];
return 0;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
MYSQL_STORE::MYSQL_STORE()
- : errorStr(),
- version("mysql_store v.0.67"),
- storeSettings(),
- settings(),
+ : version("mysql_store v.0.67"),
+ schemaVersion(0),
logger(GetPluginLogger(GetStgLogger(), "store_mysql"))
{
}
{
int ret = storeSettings.ParseSettings(settings);
MYSQL mysql;
-MYSQL * sock;
mysql_init(&mysql);
if (ret)
errorStr = storeSettings.GetStrError();
errorStr = "Database password must be not empty. Please read Manual.";
return -1;
}
-
+ MYSQL * sock;
if (!(sock = mysql_real_connect(&mysql,storeSettings.GetDBHost().c_str(),
storeSettings.GetDBUser().c_str(),storeSettings.GetDBPassword().c_str(),
0,0,NULL,0)))
}
if (!ret)
{
- WriteServLog("MYSQL_STORE: Current DB schema version: %d", schemaVersion);
+ logger("MYSQL_STORE: Current DB schema version: %d", schemaVersion);
MakeUpdates(sock);
}
mysql_close(sock);
res += "PassiveCost DOUBLE DEFAULT 0.0, Fee DOUBLE DEFAULT 0.0,"
"Free DOUBLE DEFAULT 0.0, TraffType VARCHAR(10) DEFAULT '',"
- "period VARCHAR(32) NOT NULL DEFAULT 'month')";
+ "period VARCHAR(32) NOT NULL DEFAULT 'month',"
+ "change_policy VARCHAR(32) NOT NULL DEFAULT 'allow',"
+ "change_policy_timeout TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00')";
if(MysqlQuery(res.c_str(),sock))
{
res += "PassiveCost=0.0, Fee=10.0, Free=0,"\
"SinglePrice0=1, SinglePrice1=1,PriceDayA1=0.75,PriceDayB1=0.75,"\
- "PriceNightA0=1.0,PriceNightB0=1.0,TraffType='up+down',period='month'";
+ "PriceNightA0=1.0,PriceNightB0=1.0,TraffType='up+down',period='month',"\
+ "change_policy='allow', change_policy_timeout='1970-01-01 00:00:00'";
if(MysqlQuery(res.c_str(),sock))
{
mysql_close(sock);
return -1;
}
- schemaVersion = 1;
+ schemaVersion = 2;
}
//users-----------------------------------------------------------------------
res = "INSERT INTO users SET login='test',Address='',AlwaysOnline=0,"\
"Credit=0.0,CreditExpire=0,Down=0,Email='',DisabledDetailStat=0,"\
"StgGroup='',IP='192.168.1.1',Note='',Passive=0,Password='123456',"\
- "Phone='', RealName='',Tariff='tariff',TariffChange='',Userdata0='',"\
- "Userdata1='',";
+ "Phone='', RealName='',Tariff='tariff',TariffChange='',NAS='',";
+
+ for (int i = 0; i < USERDATA_NUM; i++)
+ {
+ strprintf(¶m, " Userdata%d='',", i);
+ res += param;
+ }
for (int i = 0; i < DIR_NUM; i++)
{
return -1;
}
schemaVersion = 1;
- WriteServLog("MYSQL_STORE: Updated DB schema to version %d", schemaVersion);
+ logger("MYSQL_STORE: Updated DB schema to version %d", schemaVersion);
+ }
+
+if (schemaVersion < 2)
+ {
+ if (MysqlQuery("ALTER TABLE tariffs ADD change_policy VARCHAR(32) NOT NULL DEFAULT 'allow'", sock) ||
+ MysqlQuery("ALTER TABLE tariffs ADD change_policy_timeout TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00'", sock))
+ {
+ errorStr = "Couldn't update tariffs table to version 2. With error:\n";
+ errorStr += mysql_error(sock);
+ mysql_close(sock);
+ return -1;
+ }
+ if (MysqlQuery("UPDATE info SET version = 2", sock))
+ {
+ errorStr = "Couldn't update DB schema version to 2. With error:\n";
+ errorStr += mysql_error(sock);
+ mysql_close(sock);
+ return -1;
+ }
+ schemaVersion = 2;
+ logger("MYSQL_STORE: Updated DB schema to version %d", schemaVersion);
}
return 0;
}
//-----------------------------------------------------------------------------
int MYSQL_STORE::AddUser(const std::string & login) const
{
-sprintf(qbuf,"INSERT INTO users SET login='%s'", login.c_str());
-
-if(MysqlSetQuery(qbuf))
+std::string query = "INSERT INTO users SET login='" + login + "',Note='',NAS=''";
+
+for (int i = 0; i < USERDATA_NUM; i++)
+ query += ",Userdata" + x2str(i) + "=''";
+
+if(MysqlSetQuery(query.c_str()))
{
errorStr = "Couldn't add user:\n";
//errorStr += mysql_error(sock);
row = mysql_fetch_row(res);
-std::string param;
-
conf->password = row[1];
if (conf->password.empty())
mysql_close(sock);
return -1;
}
- stat->down[i] = traff;
+ stat->monthDown[i] = traff;
sprintf(s, "U%d", i);
if (GetULongLongInt(row[startPos+i*2+1], &traff, 0) != 0)
mysql_close(sock);
return -1;
}
- stat->up[i] = traff;
+ stat->monthUp[i] = traff;
}//for
startPos += (2*DIR_NUM);
for (int i = 0; i < DIR_NUM; i++)
{
- strprintf(¶m, " D%d=%lld,", i, stat.down[i]);
+ strprintf(¶m, " D%d=%lld,", i, stat.monthDown[i]);
res += param;
- strprintf(¶m, " U%d=%lld,", i, stat.up[i]);
+ strprintf(¶m, " U%d=%lld,", i, stat.monthUp[i]);
res += param;
}
for (int i = 0; i < DIR_NUM; i++)
{
- strprintf(¶m, " U%d=%lld,", i, stat.up[i]);
+ strprintf(¶m, " U%d=%lld,", i, stat.monthUp[i]);
res += param;
- strprintf(¶m, " D%d=%lld,", i, stat.down[i]);
+ strprintf(¶m, " D%d=%lld,", i, stat.monthDown[i]);
res += param;
}
memset(adminPass, 0, sizeof(adminPass));
BLOWFISH_CTX ctx;
-EnDecodeInit(adm_enc_passwd, strlen(adm_enc_passwd), &ctx);
+InitContext(adm_enc_passwd, strlen(adm_enc_passwd), &ctx);
strncpy(adminPass, ac.password.c_str(), ADM_PASSWD_LEN);
adminPass[ADM_PASSWD_LEN - 1] = 0;
for (int i = 0; i < ADM_PASSWD_LEN/8; i++)
{
- EncodeString(pass + 8*i, adminPass + 8*i, &ctx);
+ EncryptBlock(pass + 8*i, adminPass + 8*i, &ctx);
}
pass[ADM_PASSWD_LEN - 1] = 0;
char passwordE[2*ADM_PASSWD_LEN + 2];
BLOWFISH_CTX ctx;
-memset(pass, 0, sizeof(pass));
memset(password, 0, sizeof(password));
-memset(passwordE, 0, sizeof(passwordE));
std::string p;
MYSQL_RES *res;
if (passwordE[0] != 0)
{
Decode21(pass, passwordE);
- EnDecodeInit(adm_enc_passwd, strlen(adm_enc_passwd), &ctx);
+ InitContext(adm_enc_passwd, strlen(adm_enc_passwd), &ctx);
for (int i = 0; i < ADM_PASSWD_LEN/8; i++)
{
- DecodeString(password + 8*i, pass + 8*i, &ctx);
+ DecryptBlock(password + 8*i, pass + 8*i, &ctx);
}
}
else
return -1;
}
-if (!strcasecmp(str.c_str(), "up"))
- td->tariffConf.traffType = TRAFF_UP;
-else
- if (!strcasecmp(str.c_str(), "down"))
- td->tariffConf.traffType = TRAFF_DOWN;
- else
- if (!strcasecmp(str.c_str(), "up+down"))
- td->tariffConf.traffType = TRAFF_UP_DOWN;
- else
- if (!strcasecmp(str.c_str(), "max"))
- td->tariffConf.traffType = TRAFF_MAX;
- else
- {
- mysql_free_result(res);
- errorStr = "Cannot read tariff " + tariffName + ". Parameter TraffType incorrect";
- mysql_close(sock);
- return -1;
- }
+td->tariffConf.traffType = TARIFF::StringToTraffType(str);
if (schemaVersion > 0)
{
td->tariffConf.period = TARIFF::MONTH;
}
+if (schemaVersion > 1)
+{
+ str = row[6+8*DIR_NUM];
+ param = "ChangePolicy";
+
+ if (str.length() == 0)
+ {
+ mysql_free_result(res);
+ errorStr = "Cannot read tariff " + tariffName + ". Parameter " + param;
+ mysql_close(sock);
+ return -1;
+ }
+
+ td->tariffConf.changePolicy = TARIFF::StringToChangePolicy(str);
+ }
+else
+ {
+ td->tariffConf.changePolicy = TARIFF::ALLOW;
+ }
+
mysql_free_result(res);
mysql_close(sock);
return 0;
strprintf(¶m, " Free=%f,", td.tariffConf.free);
res += param;
-switch (td.tariffConf.traffType)
- {
- case TRAFF_UP:
- res += " TraffType='up'";
- break;
- case TRAFF_DOWN:
- res += " TraffType='down'";
- break;
- case TRAFF_UP_DOWN:
- res += " TraffType='up+down'";
- break;
- case TRAFF_MAX:
- res += " TraffType='max'";
- break;
- }
+res += " TraffType='" + TARIFF::TraffTypeToString(td.tariffConf.traffType) + "'";
if (schemaVersion > 0)
res += ", Period='" + TARIFF::PeriodToString(td.tariffConf.period) + "'";
+if (schemaVersion > 1)
+ res += ", change_policy='" + TARIFF::ChangePolicyToString(td.tariffConf.changePolicy) + "'";
+
strprintf(¶m, " WHERE name='%s' LIMIT 1", tariffName.c_str());
res += param;
git.stg.codes / stg.git / blobdiff