summaryrefslogtreecommitdiffstats
path: root/src/Server
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2009-09-27 01:55:44 +0200
committerMatthias Schiffer <matthias@gamezock.de>2009-09-27 01:55:44 +0200
commite1d8490f0654a3da0b900407d80d91d8d0da68c8 (patch)
treed65b4bd4a596a98061e094120b6a1aed388d1c89 /src/Server
parentd88c486ae403bee8f4b16e4bdf9daf19f8915eed (diff)
downloadmad-e1d8490f0654a3da0b900407d80d91d8d0da68c8.tar
mad-e1d8490f0654a3da0b900407d80d91d8d0da68c8.zip
Use libicu to support unicode properly; migrated ConfigManager to UnicodeString
Diffstat (limited to 'src/Server')
-rw-r--r--src/Server/ConnectionManager.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/Server/ConnectionManager.cpp b/src/Server/ConnectionManager.cpp
index 1ffd3f1..5836b32 100644
--- a/src/Server/ConnectionManager.cpp
+++ b/src/Server/ConnectionManager.cpp
@@ -118,45 +118,45 @@ bool ConnectionManager::handleConfigEntry(const Core::ConfigEntry &entry, bool h
if(handled)
return false;
- if(entry[0].getKey().matches("Listen") && entry[1].empty()) {
+ if(entry[0].getKey().matches("Listen") && entry[1].isEmpty()) {
try {
- listenerAddresses.push_back(parseAddress(entry[0][0]));
+ listenerAddresses.push_back(parseAddress(entry[0][0].extract()));
}
catch(Core::Exception &e) {
- application->logf(Core::Logger::LOG_WARNING, "ConnectionManager: Invalid listen address '%s'", entry[0][0].c_str());
+ application->logf(Core::Logger::LOG_WARNING, "ConnectionManager: Invalid listen address '%s'", entry[0][0].extract().c_str());
}
return true;
}
- else if(entry[0].getKey().matches("X509TrustFile") && entry[1].empty()) {
- x509TrustFile = entry[0][0];
+ else if(entry[0].getKey().matches("X509TrustFile") && entry[1].isEmpty()) {
+ x509TrustFile = entry[0][0].extract();
return true;
}
- else if(entry[0].getKey().matches("X509CrlFile") && entry[1].empty()) {
- x509CrlFile = entry[0][0];
+ else if(entry[0].getKey().matches("X509CrlFile") && entry[1].isEmpty()) {
+ x509CrlFile = entry[0][0].extract();
return true;
}
- else if(entry[0].getKey().matches("X509CertFile") && entry[1].empty()) {
- x509CertFile = entry[0][0];
+ else if(entry[0].getKey().matches("X509CertFile") && entry[1].isEmpty()) {
+ x509CertFile = entry[0][0].extract();
return true;
}
- else if(entry[0].getKey().matches("X509KeyFile") && entry[1].empty()) {
- x509KeyFile = entry[0][0];
+ else if(entry[0].getKey().matches("X509KeyFile") && entry[1].isEmpty()) {
+ x509KeyFile = entry[0][0].extract();
return true;
}
else if(entry[0].getKey().matches("Daemon")) {
if(entry[0].getSize() == 1) {
- if(entry[1].empty()) {
- daemonInfo.insert(std::make_pair(entry[0][0], Common::HostInfo(entry[0][0])));
+ if(entry[1].isEmpty()) {
+ daemonInfo.insert(std::make_pair(entry[0][0].extract(), Common::HostInfo(entry[0][0].extract())));
return true;
}
- else if(entry[1].getKey().matches("IpAddress") && entry[2].empty()) {
- daemonInfo[entry[0][0]].setIP(entry[1][0]);
+ else if(entry[1].getKey().matches("IpAddress") && entry[2].isEmpty()) {
+ daemonInfo[entry[0][0].extract()].setIP(entry[1][0].extract());
return true;
}