Date: Wednesday, December 21, 2005 @ 20:09:57
Author: marc
Path: /cvsroot/carob/carob
Modified: include/ConnectionParameters.hpp (1.7 -> 1.8)
src/ConnectionParameters.cpp (1.6 -> 1.7)
port number is not an in_addr_t (?) anymore but an inetport_t (= typedef
uint16_t)
----------------------------------+
include/ConnectionParameters.hpp | 14 +++++++-------
src/ConnectionParameters.cpp | 11 ++++++++++-
2 files changed, 17 insertions(+), 8 deletions(-)
Index: carob/include/ConnectionParameters.hpp
diff -u carob/include/ConnectionParameters.hpp:1.7
carob/include/ConnectionParameters.hpp:1.8
--- carob/include/ConnectionParameters.hpp:1.7 Fri Dec 2 15:53:07 2005
+++ carob/include/ConnectionParameters.hpp Wed Dec 21 20:09:57 2005
@@ -23,7 +23,6 @@
#define CONNECTIONPARAMETERS_H_
#include <string>
-#include <netinet/in.h> //for in_addr_t
namespace CarobNS {
@@ -34,11 +33,12 @@
DEBUG_LEVEL_DEBUG
};
+typedef uint16_t inetport_t; // fine for both IPv4 and IPv6
/**
* Constants for connection defaults
*/
-#define DEFAULT_PORT (in_addr_t)25322
+#define DEFAULT_PORT (inetport_t)25322
#define DEFAULT_HOST L"localhost"
#define DEFAULT_USER L"user"
#define DEFAULT_PASSWD L""
@@ -60,7 +60,7 @@
/**
* Creates instance with set of values
*/
- ConnectionParameters(const std::wstring&, const in_addr_t&,
+ ConnectionParameters(const std::wstring&, const inetport_t&,
const std::wstring&, const std::wstring&, const std::wstring&,
const DebugLevel&);
@@ -82,9 +82,9 @@
/** Sets the host name */
void setHostName(const std::wstring&);
/** Gives the host port */
- inline in_addr_t getHostPort() const { return hostPort; }
+ inline inetport_t getHostPort() const { return hostPort; }
/** Sets the host port */
- inline void setHostPort(const in_addr_t& p) { hostPort = p; }
+ inline void setHostPort(const inetport_t& p) { hostPort = p; }
/** Gives the database name */
inline std::wstring getDatabaseName() const { return databaseName; }
/** Sets the database name */
@@ -105,8 +105,8 @@
private:
/** String representation of the host name, fully qualified or IP address */
std::wstring hostName;
- /** Host port as a in_addr_t (unsigned int) */
- in_addr_t hostPort;
+ /** Host port */
+ inetport_t hostPort;
/** Name of the database */
std::wstring databaseName;
/** User name for database access */
Index: carob/src/ConnectionParameters.cpp
diff -u carob/src/ConnectionParameters.cpp:1.6
carob/src/ConnectionParameters.cpp:1.7
--- carob/src/ConnectionParameters.cpp:1.6 Fri Dec 2 15:53:07 2005
+++ carob/src/ConnectionParameters.cpp Wed Dec 21 20:09:57 2005
@@ -37,7 +37,7 @@
{
}
-ConnectionParameters::ConnectionParameters(const wstring& host, const
in_addr_t& port,
+ConnectionParameters::ConnectionParameters(const wstring& host, const
inetport_t& port,
const wstring& db, const wstring&
uname,
const wstring& upass, const
DebugLevel& dl)
{
@@ -129,3 +129,12 @@
}
return true;
}
+
+
+/*
+ * Local Variables:
+ * c-file-style: "bsd"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
