-ahi borre lo que se me escapo

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

diff --git a/Server/src/connection.cpp b/Server/src/connection.cpp
index 18b5909f25bb4df3d33a6b1732d4cd1afc7e5072..1dc6b6d3d9a45d01385021035114312d84aa0194 100644 (file)
--- a/Server/src/connection.cpp
+++ b/Server/src/connection.cpp
@@ -31,23 +31,54 @@
 #      include <iostream>
 #endif // DEBUG
 
 #      include <iostream>
 #endif // DEBUG
 

-PlaQui::Server::Connection::~Connection(void) {
+using namespace std;
+
+namespace PlaQui {
+
+namespace Server {
+
+Connection::~Connection(void) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": destructor." << std::endl;
+       cerr << __FILE__ << ": destructor." << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-PlaQui::Server::Connection::Connection(const sockbuf::sockdesc& sd):
+Connection::Connection(const sockbuf::sockdesc& sd):

                socket(sd) {
 #ifdef DEBUG
                socket(sd) {
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": sd = " << sd.sock << std::endl;
+       cerr << __FILE__ << ": sd = " << sd.sock << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-PlaQui::Server::Connection::Connection(sockbuf::type type):
+Connection::Connection(sockbuf::type type):

                socket(type) {
 #ifdef DEBUG
                socket(type) {
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": type = " << type << std::endl;
+       cerr << __FILE__ << ": type = " << type << endl;

 #endif // DEBUG
 }
 
 #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
+