Se agrega generacion de XML para dar el estado actual de la planta simulada.

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

diff --git a/Server/src/connection.cpp b/Server/src/connection.cpp
index 1dc6b6d3d9a45d01385021035114312d84aa0194..1b328c643e0d71d51228edf11cef177e95685a25 100644 (file)
--- a/Server/src/connection.cpp
+++ b/Server/src/connection.cpp
@@ -46,17 +46,29 @@ Connection::~Connection(void) {
 Connection::Connection(const sockbuf::sockdesc& sd):
                socket(sd) {
 #ifdef DEBUG
 Connection::Connection(const sockbuf::sockdesc& sd):
                socket(sd) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": sd = " << sd.sock << endl;
+       cerr << __FILE__ << ": sd = " << sd.sock;
+#endif // DEBUG
+       host = socket->peerhost();
+       port = socket->peerport();
+#ifdef DEBUG
+       cerr << " | host = " << host << " | port = " << port << endl;

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

-Connection::Connection(sockbuf::type type):
+Connection::Connection(const sockbuf::type& type):

                socket(type) {
 #ifdef DEBUG
        cerr << __FILE__ << ": type = " << type << endl;
 #endif // DEBUG
 }
 
                socket(type) {
 #ifdef DEBUG
        cerr << __FILE__ << ": type = " << type << endl;
 #endif // DEBUG
 }
 

+Connection::Connection(const std::string& host, const Port& port):
+               host(host), port(port) {
+#ifdef DEBUG
+       cerr << __FILE__ << ": host = " << host << " | port = " << port << endl;
+#endif // DEBUG
+}
+

 void Connection::finish(bool attach) {
        //socket_mutex.lock();
        socket->shutdown(sockbuf::shut_readwrite);
 void Connection::finish(bool attach) {
        //socket_mutex.lock();
        socket->shutdown(sockbuf::shut_readwrite);


@@ -64,17 +76,11 @@ void Connection::finish(bool attach) {
        Runnable::finish(attach);
 }
 
        Runnable::finish(attach);
 }
 

-string Connection::get_peerhost(void) {
-       //socket_mutex.lock();
-       string host = socket->peerhost();
-       //socket_mutex.unlock();
+const string& Connection::get_host(void) const {

        return host;
 }
 
        return host;
 }
 

-unsigned Connection::get_peerport(void) {
-       //socket_mutex.lock();
-       unsigned port = socket->peerport();
-       //socket_mutex.unlock();
+const Connection::Port& Connection::get_port(void) const {

        return port;
 }
 
        return port;
 }