summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Borisov <borisov.alexandr@rambler.ru>2011-12-02 04:27:14 +0200
committerAlex Borisov <borisov.alexandr@rambler.ru>2011-12-02 04:27:14 +0200
commitb4b3df8a16aef72a6ca921ada062c2982b959c55 (patch)
tree35328180b5df3f1da4d983322c148b515c58a9d1
parentf9d323b6e8540c1c8869089b16de97e8a3f038da (diff)
Request Config from server as it's working by now
-rw-r--r--client/UpdatedConfig.cpp5
-rw-r--r--client/UpdatedConfig.h4
2 files changed, 4 insertions, 5 deletions
diff --git a/client/UpdatedConfig.cpp b/client/UpdatedConfig.cpp
index 99a89db..9cf91dd 100644
--- a/client/UpdatedConfig.cpp
+++ b/client/UpdatedConfig.cpp
@@ -65,13 +65,11 @@ void UpdatedConfig::update()
retryFailed = false;
}
- /*
if (! (updateStatus & (1 << SslClient::Config)))
{
client->SendRequest(SslClient::Config);
}
- */
- if (! (updateStatus & (1 << SslClient::GenericProxyList)))
+ else if (! (updateStatus & (1 << SslClient::GenericProxyList)))
{
client->SendRequest(SslClient::GenericProxyList);
}
@@ -128,6 +126,7 @@ void UpdatedConfig::gotServerReply(SslClient::RequestType &type, QByteArray &con
{
case SslClient::Config:
ParseConfig(confdata.constData());
+ Logger::Debug("Config data:\n %s", confdata.constData());
break;
case SslClient::GenericProxyList:
ParseGenericProxies(confdata.constData());
diff --git a/client/UpdatedConfig.h b/client/UpdatedConfig.h
index a9def0b..f98c45e 100644
--- a/client/UpdatedConfig.h
+++ b/client/UpdatedConfig.h
@@ -44,7 +44,7 @@ private slots:
void gotServerReply(SslClient::RequestType &type, QByteArray &confdata);
private:
- static const int UPDATED_STATE_FULL = 0x7C;
+ static const int UPDATED_STATE_FULL = 0x7E;
/**
* @brief Pointer to the singleton Config instance
@@ -96,4 +96,4 @@ private:
UpdatedConfig();
};
-#endif \ No newline at end of file
+#endif