Changeset 188

Timestamp:

03/02/10 10:48:40 (6 months ago)

Author:

sausage

Message:

DBPort config option

Location:

eoserv/trunk

Files:

• config.ini (modified) (1 diff)
• src/database.cpp (modified) (2 diffs)
• src/database.hpp (modified) (1 diff)
• src/eoserver.cpp (modified) (1 diff)
• src/eoserver.hpp (modified) (2 diffs)
• src/main.cpp (modified) (3 diffs)
• src/world.cpp (modified) (1 diff)
• src/world.hpp (modified) (1 diff)

eoserv/trunk/config.ini

@@ -103 +103 @@
 # Database name (MySQL only)
 DBName = eoserv
+
+## DBPort (number)
+# Database port (MySQL only)
+# Leave at 0 to use the library default
+DBPort = 0
 
 

eoserv/trunk/src/database.cpp

@@ -81 +81 @@
         this->user = user;
         this->pass = pass;
+        this->port = util::to_int(port);
         this->db = db;
 
@@ -96 +97 @@
                                 throw Database_OpenFailed(mysql_error(this->mysql_handle));
                         }
-                        if (mysql_real_connect(this->mysql_handle, host.c_str(), user.c_str(), pass.c_str(), 0, 0, 0, 0) != this->mysql_handle)
+                        if (mysql_real_connect(this->mysql_handle, host.c_str(), user.c_str(), pass.c_str(), 0, this->port, 0, 0) != this->mysql_handle)
                         {
                                 throw Database_OpenFailed(mysql_error(this->mysql_handle));

eoserv/trunk/src/database.hpp

@@ -115 +115 @@
 
                 std::string host, user, pass, db;
+                unsigned int port;
 
         public:

eoserv/trunk/src/eoserver.cpp

@@ -130 +130 @@
 }
 
-void EOServer::Initialize(util::array<std::string, 5> dbinfo, const Config &eoserv_config, const Config &admin_config)
+void EOServer::Initialize(util::array<std::string, 6> dbinfo, const Config &eoserv_config, const Config &admin_config)
 {
         this->world = new World(dbinfo, eoserv_config, admin_config);

eoserv/trunk/src/eoserver.hpp

@@ -21 +21 @@
 {
         private:
-                void Initialize(util::array<std::string, 5> dbinfo, const Config &eoserv_config, const Config &admin_config);
+                void Initialize(util::array<std::string, 6> dbinfo, const Config &eoserv_config, const Config &admin_config);
 
         protected:
@@ -31 +31 @@
                 SLN *sln;
 
-                EOServer(IPAddress addr, unsigned short port, util::array<std::string, 5> dbinfo, const Config &eoserv_config, const Config &admin_config) : Server(addr, port)
+                EOServer(IPAddress addr, unsigned short port, util::array<std::string, 6> dbinfo, const Config &eoserv_config, const Config &admin_config) : Server(addr, port)
                 {
                         this->Initialize(dbinfo, eoserv_config, admin_config);

eoserv/trunk/src/main.cpp

@@ -254 +254 @@
                 eoserv_config_default(config, "DBPass"             , "eoserv");
                 eoserv_config_default(config, "DBName"             , "eoserv");
+                eoserv_config_default(config, "DBPort"             , 0);
                 eoserv_config_default(config, "EIF"                , "./data/pub/dat001.eif");
                 eoserv_config_default(config, "ENF"                , "./data/pub/dtn001.enf");
@@ -514 +515 @@
                 }
 
-                util::array<std::string, 5> dbinfo;
+                util::array<std::string, 6> dbinfo;
                 dbinfo[0] = static_cast<std::string>(config["DBType"]);
                 dbinfo[1] = static_cast<std::string>(config["DBHost"]);
@@ -520 +521 @@
                 dbinfo[3] = static_cast<std::string>(config["DBPass"]);
                 dbinfo[4] = static_cast<std::string>(config["DBName"]);
+                dbinfo[5] = static_cast<std::string>(config["DBPort"]);
 
                 EOServer server(static_cast<std::string>(config["Host"]), static_cast<int>(config["Port"]), dbinfo, config, aconfig);

eoserv/trunk/src/world.cpp

@@ -132 +132 @@
 }
 
-World::World(util::array<std::string, 5> dbinfo, const Config &eoserv_config, const Config &admin_config)
+World::World(util::array<std::string, 6> dbinfo, const Config &eoserv_config, const Config &admin_config)
 {
         if (int(this->timer.resolution * 1000.0) > 1)

eoserv/trunk/src/world.hpp

@@ -115 +115 @@
                 util::array<int, 254> exp_table;
 
-                World(util::array<std::string, 5> dbinfo, const Config &eoserv_config, const Config &admin_config);
+                World(util::array<std::string, 6> dbinfo, const Config &eoserv_config, const Config &admin_config);
                 void LoadHome();