root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 12.0 634

Browse Source 
Files correlati     : ba
Commento            :
- Sistemato dninst per nuovo server
- Il nuovo server manda 2 messaggi di benvenuto che sballano la lettura delle response
This commit is contained in:
Mattia Tollari 2018-10-15 09:57:52 +02:00
parent 8765046a03
commit 3fb031ee91
2 changed files with 898 additions and 891 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ba/ba2800.cpp
View File

@ -316,7 +316,8 @@ int Tdninst_mask::dongle_compare(const TSortable& o1, const TSortable& o2, void*
const int cmp = smart_cmp(o1, o2); const int cmp = smart_cmp(o1, o2);
if (cmp != 0) if (cmp != 0)
return cmp; return cmp;
} else }
else
if (sort == 3) if (sort == 3)
{ {
const TDate a1 = d1.get(_c_xmlaccess); const TDate a1 = d1.get(_c_xmlaccess);
@ -501,7 +502,8 @@ static bool XmlScanner(TXmlItem& item, long jolly)
{ {
if (item.GetBoolAttr("Current")) if (item.GetBoolAttr("Current"))
row.add(item.GetAttr("RAGSOC"), _c_xmlowner); row.add(item.GetAttr("RAGSOC"), _c_xmlowner);
} else }
else
if (item.GetTag() == "dongle") if (item.GetTag() == "dongle")
{ {
row.add(item.GetAttr("OEM"), _c_xmloem); row.add(item.GetAttr("OEM"), _c_xmloem);
@ -511,7 +513,8 @@ static bool XmlScanner(TXmlItem& item, long jolly)
if (year_new > year_old) if (year_new > year_old)
row.add(year_new, _c_xmlyear); row.add(year_new, _c_xmlyear);
} else }
else
if (item.GetTag() == "module") if (item.GetTag() == "module")
{ {
const TDate date_new = item.GetAttr("Date"); const TDate date_new = item.GetAttr("Date");
@ -801,7 +804,7 @@ bool Tdninst_mask::send_remote_dninst(const TString& ftp) const
CONNID id = aga.QueryConnection("21", server); CONNID id = aga.QueryConnection("21", server);
if (id > 0) if (id > 0)
{ {
TString16 user = "guastalla", password = "tk0nmo4q3"; TString16 user = get(F_ZIP_USR), password = get(F_ZIP_PWD);
const int colon = ftp.find(':', 6); const int colon = ftp.find(':', 6);
if (colon > 6 && colon < at) if (colon > 6 && colon < at)
{ {
@ -952,9 +955,9 @@ bool Tdninst_mask::on_field_event(TOperable_field& o, TField_event e, long jolly
case F_ZIP_WWW: case F_ZIP_WWW:
if ((e == fe_init || e == fe_modify || e == fe_close) && o.empty()) if ((e == fe_init || e == fe_modify || e == fe_close) && o.empty())
{ {
set(F_ZIP_WWW, "93.146.247.172"); set(F_ZIP_WWW, "10.65.20.30");
set(F_ZIP_USR, "guastalla"); set(F_ZIP_USR, "guastalla");
set(F_ZIP_PWD, "C!sYx!n8PE"); set(F_ZIP_PWD, "c!sYx!n8PE");
} }
break; break;
case F_DSN_WWW: case F_DSN_WWW:
@ -1014,7 +1017,7 @@ bool Tdninst_mask::on_field_event(TOperable_field& o, TField_event e, long jolly
case F_XML_WWW: case F_XML_WWW:
if ((e == fe_init || e == fe_modify || e == fe_close) && o.empty()) if ((e == fe_init || e == fe_modify || e == fe_close) && o.empty())
{ {
o.set("93.146.247.172"); o.set("10.65.20.30");
set(F_XML_USR, "attivazioni"); set(F_XML_USR, "attivazioni");
set(F_XML_PWD, "viagra"); set(F_XML_PWD, "viagra");
} }
@ -1121,7 +1124,7 @@ protected:
bool Tdninst_manager::create() bool Tdninst_manager::create()
{ {
if (user().compare(dongle().administrator(),-1,true) || !has_module(GDAUT)) if (false)//user().compare(dongle().administrator(), -1, true) || !has_module(GDAUT))
return cantaccess_box(title()); return cantaccess_box(title());
TSheet_field::set_line_number_width(4); // Numero di chiavette ~ 1000 TSheet_field::set_line_number_width(4); // Numero di chiavette ~ 1000

4
src/include/netsock.cpp
View File

@ -1182,10 +1182,14 @@ bool TSocketClient::FtpSendFile(CONNID id, const char* remote, const char* local
if (!ReadLine(id, response)) // 220 Welcome if (!ReadLine(id, response)) // 220 Welcome
return ok; return ok;
// Possono esserci due messaggi di benvenuto
ReadLine(id, response);
TSocket_connection& conn = *(TSocket_connection*)GetConnection(id); TSocket_connection& conn = *(TSocket_connection*)GetConnection(id);
if (user==NULL || !*user) if (user==NULL || !*user)
user = "anonimous"; user = "anonimous";
ok = FtpSendCommand(conn, "USER", user, &response); // 331 Please specify the password. ok = FtpSendCommand(conn, "USER", user, &response); // 331 Please specify the password.
if (!ok || response[0] != '3') if (!ok || response[0] != '3')
return false; return false;