agrego las compuertas pero todavia no hacen nada, ademas tengo un conflicto con el...

[z.facultad/75.42/plaqui.git] / Server / src / connection.cpp

diff --git a/Server/src/connection.cpp b/Server/src/connection.cpp
index c97685f96422e27fb5e35e5d0ebddcfa06d42152..1dc6b6d3d9a45d01385021035114312d84aa0194 100644 (file)
--- a/Server/src/connection.cpp
+++ b/Server/src/connection.cpp
@@ -27,23 +27,58 @@
 
 #include "plaqui/server/connection.h"
 #include <socket++/sockinet.h>
+#ifdef DEBUG
+#      include <iostream>
+#endif // DEBUG
 
-using namespace PlaQui::Server;
+using namespace std;
 
-Connection::Connection(const sockbuf::sockdesc& sd):
-               socket(sd) {
+namespace PlaQui {
+
+namespace Server {
+
+Connection::~Connection(void) {
 #ifdef DEBUG
-       std::cerr << __FILE__ << ": sd = " << sd.sock << std::endl;
+       cerr << __FILE__ << ": destructor." << endl;
 #endif // DEBUG
 }
 
-/*
-Connection::Connection(const sockinetbuf& sb):
-               socket(sb) {
+Connection::Connection(const sockbuf::sockdesc& sd):
+               socket(sd) {
+#ifdef DEBUG
+       cerr << __FILE__ << ": sd = " << sd.sock << endl;
+#endif // DEBUG
 }
-*/
 
 Connection::Connection(sockbuf::type type):
                socket(type) {
+#ifdef DEBUG
+       cerr << __FILE__ << ": type = " << type << endl;
+#endif // DEBUG
+}
+
+void Connection::finish(bool attach) {
+       //socket_mutex.lock();
+       socket->shutdown(sockbuf::shut_readwrite);
+       //socket_mutex.unlock();
+       Runnable::finish(attach);
+}
+
+string Connection::get_peerhost(void) {
+       //socket_mutex.lock();
+       string host = socket->peerhost();
+       //socket_mutex.unlock();
+       return host;
+}
+
+unsigned Connection::get_peerport(void) {
+       //socket_mutex.lock();
+       unsigned port = socket->peerport();
+       //socket_mutex.unlock();
+       return port;
 }
 
+} // namespace Server
+
+} // namespace PlaQui
+