Bugfix al mostrar request/response para debug en send_loop().

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

diff --git a/practicas/pipi/src/ipout.cpp b/practicas/pipi/src/ipout.cpp
index c98c4b5e7e9282cf34da1b74bd00e667c0eef3ed..dea18de17fbcf2bc1462826e7eb04bacfd539665 100644 (file)
--- a/practicas/pipi/src/ipout.cpp
+++ b/practicas/pipi/src/ipout.cpp
@@ -78,7 +78,7 @@ bool IPOut::send(IPHeader iph, std::string data) throw (std::runtime_error)
         iph2.do_checksum();
         std::string buf((char*) &iph2, sizeof(IPHeader));
         buf += data.substr(i * max_payload, max_payload);
         iph2.do_checksum();
         std::string buf((char*) &iph2, sizeof(IPHeader));
         buf += data.substr(i * max_payload, max_payload);

-#ifdef DEBUG
+#ifdef DEBUG_IP

         std::cout << "IPOut::send (" << ip << "): Fragmento " << i
                 << " => IPHeader: " << iph2 << "\n";
         std::string tmp = data.substr(i * max_payload, max_payload);
         std::cout << "IPOut::send (" << ip << "): Fragmento " << i
                 << " => IPHeader: " << iph2 << "\n";
         std::string tmp = data.substr(i * max_payload, max_payload);


@@ -97,9 +97,9 @@ void IPOut::forward_loop()
     {
         std::string buf = forward_que.receive();
         IPHeader iph(buf);
     {
         std::string buf = forward_que.receive();
         IPHeader iph(buf);

-#ifdef DEBUG
+#ifdef DEBUG_IP

         std::cout << "IPOut::forward_loop (" << ip << "): A forwardear (id "
         std::cout << "IPOut::forward_loop (" << ip << "): A forwardear (id "

-                << iph.id << ")\n";
+                << iph.id << ", offset " << iph.offset << ")\n";

 #endif
         send(iph, buf.substr(iph.header_len()));
     }
 #endif
         send(iph, buf.substr(iph.header_len()));
     }