summaryrefslogtreecommitdiff
path: root/i/simulotron/src/socket/socket.cc
diff options
context:
space:
mode:
authorhaller2005-11-29 18:49:38 +0000
committerhaller2005-11-29 18:49:38 +0000
commitab21fd007709cc4103bbdbe6dc9360b71475a01b (patch)
treef82e4157f06c89da99f94755f553a0d88f054dbb /i/simulotron/src/socket/socket.cc
parent8020ef753b8d434c026299650fe911d71d844e78 (diff)
* Debut de test pour les socket (test_socket)
* Debugage de socket... * socket reste en test
Diffstat (limited to 'i/simulotron/src/socket/socket.cc')
-rw-r--r--i/simulotron/src/socket/socket.cc27
1 files changed, 19 insertions, 8 deletions
diff --git a/i/simulotron/src/socket/socket.cc b/i/simulotron/src/socket/socket.cc
index 8b0ef99..b696690 100644
--- a/i/simulotron/src/socket/socket.cc
+++ b/i/simulotron/src/socket/socket.cc
@@ -1,5 +1,6 @@
#include <sys/socket.h>
#include <cerrno>
+#include <iostream>
#include "socket/socket.hh"
#include "utils/errno_exception.hh"
#include "socket/address.hh"
@@ -23,12 +24,13 @@ Socket::Socket(int socket)
Socket::~Socket(void)
{
- close(socket_);
+ // XXX Pas faisable car les copy détruise les socket
+ //close(socket_);
}
void Socket::connect(const Address & address)
{
- if (::connect (socket_, address.getSockaddr(), sizeof(*address.getSockaddr()) < 0))
+ if (::connect (socket_, address.getSockaddr(), sizeof(sockaddr_in)) < 0)
throw errno_exception("Impossible de mettre la chaussette", errno);
}
@@ -41,27 +43,33 @@ void Socket::listen(int maxQueue)
Socket Socket::accept(Address & address)
{
sockaddr addr;
- socklen_t length;
-
+ socklen_t length = sizeof(sockaddr_in);
+
int socket = ::accept(socket_, &addr, &length);
if (socket < 0)
throw errno_exception("Chaussette bloqué à la douane", errno);
address = Address(&addr, length);
-
+
return Socket(socket);
}
+void Socket::close(void)
+{
+ ::close(socket_);
+}
+
std::string Socket::read(void)
{
std::string str;
int charReaded;
char buffer[BUFFER_SIZE];
-
do
{
charReaded = ::read(socket_, buffer, BUFFER_SIZE - 1);
- buffer[charReaded + 1] = 0;
+ if(charReaded < 0)
+ throw errno_exception("Socket: problème de lecture", errno);
+ buffer[charReaded] = 0;
str += buffer;
}while(charReaded == BUFFER_SIZE - 1);
return str;
@@ -71,6 +79,7 @@ void Socket::write(const std::string & str)
{
char buffer[BUFFER_SIZE];
unsigned int pos = 0;
+ int retval = 0;
while(str.size() != pos)
{
@@ -78,7 +87,9 @@ void Socket::write(const std::string & str)
str.copy(buffer, size, pos);
pos += size;
buffer[size] = 0;
- ::write(socket_, buffer, size);
+ retval = ::write(socket_, buffer, size);
+ if(retval < 0)
+ throw errno_exception("Socket: erreur d'écriture (write()) ", errno);
}
}