Date: Wednesday, January 4, 2006 @ 19:26:34
Author: marc
Path: /cvsroot/carob/carob
Modified: include/Common.hpp (1.26 -> 1.27)
include/ConnectionParameters.hpp (1.11 -> 1.12)
include/JavaSocket.hpp (1.18 -> 1.19)
src/ConnectionParameters.cpp (1.9 -> 1.10) src/JavaSocket.cpp
(1.26 -> 1.27)
Now using a standard "in_port_t" C type instead of our home-made inetport_t
----------------------------------+
include/Common.hpp | 1 -
include/ConnectionParameters.hpp | 10 ++++++----
include/JavaSocket.hpp | 2 +-
src/ConnectionParameters.cpp | 2 +-
src/JavaSocket.cpp | 2 +-
5 files changed, 9 insertions(+), 8 deletions(-)
Index: carob/include/Common.hpp
diff -u carob/include/Common.hpp:1.26 carob/include/Common.hpp:1.27
--- carob/include/Common.hpp:1.26 Thu Dec 22 14:17:13 2005
+++ carob/include/Common.hpp Wed Jan 4 19:26:34 2006
@@ -41,7 +41,6 @@
/** Java byte (signed) */
typedef int8_t java_byte;
-typedef uint16_t inetport_t; // fine for both IPv4 and IPv6
/**
* Available log levels, sorted by priority (last = higher)
Index: carob/include/ConnectionParameters.hpp
diff -u carob/include/ConnectionParameters.hpp:1.11
carob/include/ConnectionParameters.hpp:1.12
--- carob/include/ConnectionParameters.hpp:1.11 Thu Dec 22 15:20:50 2005
+++ carob/include/ConnectionParameters.hpp Wed Jan 4 19:26:34 2006
@@ -22,6 +22,8 @@
#ifndef CONNECTIONPARAMETERS_H_
#define CONNECTIONPARAMETERS_H_
+#include <netinet/in.h> // in_port_t
+
#include <string>
#include "CarobException.hpp"
@@ -38,7 +40,7 @@
/**
* Constants for connection defaults
*/
-#define DEFAULT_PORT ((inetport_t)25322)
+#define DEFAULT_PORT ((in_port_t)25322)
#define DEFAULT_HOST L"localhost"
#define DEFAULT_USER L"user"
#define DEFAULT_PASSWD L""
@@ -60,7 +62,7 @@
/**
* Creates instance with set of values
*/
- ConnectionParameters(const std::wstring&, const inetport_t&,
+ ConnectionParameters(const std::wstring&, const in_port_t&,
const std::wstring&, const std::wstring&, const std::wstring&,
const DebugLevel&) throw (ConnectionException, UnexpectedException);
@@ -84,7 +86,7 @@
const std::wstring& checkHostName(const std::wstring&)
throw (ConnectionException, UnexpectedException);
/** Gives the host port */
- inline inetport_t getHostPort() const { return hostPort; }
+ inline in_port_t getHostPort() const { return hostPort; }
/** Gives the database name */
inline std::wstring getDatabaseName() const { return databaseName; }
/** Checks the database name */
@@ -102,7 +104,7 @@
/** String representation of the host name, fully qualified or IP address */
const std::wstring hostName;
/** Host port */
- const inetport_t hostPort;
+ const in_port_t hostPort;
/** Name of the database */
const std::wstring databaseName;
/** User name for database access */
Index: carob/include/JavaSocket.hpp
diff -u carob/include/JavaSocket.hpp:1.18 carob/include/JavaSocket.hpp:1.19
--- carob/include/JavaSocket.hpp:1.18 Thu Dec 22 14:17:13 2005
+++ carob/include/JavaSocket.hpp Wed Jan 4 19:26:34 2006
@@ -75,7 +75,7 @@
* @return true upon successfull connection, false otherwise
* @throws ConnectionException
*/
- bool connectTo(const std::wstring& host, inetport_t port)
+ bool connectTo(const std::wstring& host, in_port_t port)
throw (ConnectionException, UnexpectedException);
/**
* Closes connection.
Index: carob/src/ConnectionParameters.cpp
diff -u carob/src/ConnectionParameters.cpp:1.9
carob/src/ConnectionParameters.cpp:1.10
--- carob/src/ConnectionParameters.cpp:1.9 Thu Dec 22 15:20:50 2005
+++ carob/src/ConnectionParameters.cpp Wed Jan 4 19:26:34 2006
@@ -35,7 +35,7 @@
{
}
-ConnectionParameters::ConnectionParameters(const wstring& host, const
inetport_t& port,
+ConnectionParameters::ConnectionParameters(const wstring& host, const
in_port_t& port,
const wstring& db, const wstring&
uname,
const wstring& upass, const
DebugLevel& dl)
throw (ConnectionException, UnexpectedException) :
Index: carob/src/JavaSocket.cpp
diff -u carob/src/JavaSocket.cpp:1.26 carob/src/JavaSocket.cpp:1.27
--- carob/src/JavaSocket.cpp:1.26 Thu Dec 22 15:58:56 2005
+++ carob/src/JavaSocket.cpp Wed Jan 4 19:26:34 2006
@@ -78,7 +78,7 @@
return true;
}
-bool JavaSocket::connectTo(const std::wstring& host, inetport_t port)
+bool JavaSocket::connectTo(const std::wstring& host, in_port_t port)
throw (ConnectionException, UnexpectedException)
{
wstring fctName(L"JavaSocket::Connect");
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
