Se agrega README/Informe.

[z.facultad/75.74/practicos.git] / practicas / pipi / src / ipin.cpp

diff --git a/practicas/pipi/src/ipin.cpp b/practicas/pipi/src/ipin.cpp
index 55bc85626cf086b438b1c4b7cd1a8e591a268b06..c191b90c94b1e47d1ea5f5dc0d9c8165ab84801e 100644 (file)
--- a/practicas/pipi/src/ipin.cpp
+++ b/practicas/pipi/src/ipin.cpp
@@ -1,6 +1,9 @@
 
 #include "ipin.h"
 #include "ipheader.h"
 
 #include "ipin.h"
 #include "ipheader.h"

+#ifdef DEBUG
+#include <iostream>
+#endif

 
 /// Constructor
 IPIn::IPIn(const IPAddr& ip, Dev& dev, Dev& forward_que, bool router,
 
 /// Constructor
 IPIn::IPIn(const IPAddr& ip, Dev& dev, Dev& forward_que, bool router,


@@ -35,9 +38,9 @@ std::string IPIn::recv(uint8_t proto, IPAddr& src, IPAddr& dst) throw (std::runt
         }
         IPHeader iph(buf);
 #ifdef DEBUG
         }
         IPHeader iph(buf);
 #ifdef DEBUG

-        log << "IPIn::recv: IPHeader: " << iph << "\n";
+        std::cout << "IPIn::recv: IPHeader: " << iph << "\n";

         std::string tmp = buf.substr(iph.header_len());
         std::string tmp = buf.substr(iph.header_len());

-        log << "\tdata (" << tmp.size() << ") = " << tmp << "\n";
+        std::cout << "\tdata (" << tmp.size() << ") = " << tmp << "\n";

 #endif
         if (iph.version != 4)
         {
 #endif
         if (iph.version != 4)
         {


@@ -82,7 +85,7 @@ std::string IPIn::recv(uint8_t proto, IPAddr& src, IPAddr& dst) throw (std::runt
             data += i->second;
         }
 #ifdef DEBUG
             data += i->second;
         }
 #ifdef DEBUG

-        log << "IPIn::recv: Paquete completo: data = '" << data << "'\n";
+        std::cout << "IPIn::recv: Paquete completo: data = '" << data << "'\n";

 #endif
         buffer.erase(iph);
         //TODO faltaría limpiar fragmentos viejos cada tanto (timer?)
 #endif
         buffer.erase(iph);
         //TODO faltaría limpiar fragmentos viejos cada tanto (timer?)