Se agrega README/Informe.

[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 cf5c28c905a23a895316a89e9435d89a6f371815..6e0c80733914f6ddeaaf427e6d6513a02a680f8a 100644 (file)
--- a/practicas/pipi/src/ipout.cpp
+++ b/practicas/pipi/src/ipout.cpp
@@ -7,6 +7,9 @@
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>

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

 
 /// Constructor
 IPOut::IPOut(const IPAddr& ip, RouteTable& rtable, Dev& forward_que, std::ostream& log):
 
 /// Constructor
 IPOut::IPOut(const IPAddr& ip, RouteTable& rtable, Dev& forward_que, std::ostream& log):


@@ -35,7 +38,7 @@ bool IPOut::send(const std::string& data, uint8_t proto, IPAddr dst, IPAddr src,
         std::string buf = forward_que.receive();
         IPHeader iph(buf);
 #ifdef DEBUG
         std::string buf = forward_que.receive();
         IPHeader iph(buf);
 #ifdef DEBUG

-        log << "IPOut::send: A forwardear => IPHeader: " << iph << "\n";
+        std::cout << "IPOut::send: A forwardear\n";

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


@@ -82,8 +85,9 @@ bool IPOut::send(IPHeader iph, std::string data) throw (std::runtime_error)
         std::string buf((char*) &iph2, sizeof(IPHeader));
         buf += data.substr(i * max_payload, max_payload);
 #ifdef DEBUG
         std::string buf((char*) &iph2, sizeof(IPHeader));
         buf += data.substr(i * max_payload, max_payload);
 #ifdef DEBUG

-        log << "IPOut::send: Fragmento 0 => IPHeader: " << iph2 << "\n";
-        log << "\tbuf (" << buf.size() << ") = " << buf << "\n";
+        std::cout << "IPOut::send: Fragmento 0 => IPHeader: " << iph2 << "\n";
+        std::string tmp = data.substr(i * max_payload, max_payload);
+        std::cout << "\tdata (" << tmp.size() << ") = " << tmp << "\n";

 #endif
         r->iface->transmit(buf, r->gateway ? r->gateway : IPAddr(iph.dst));
     }
 #endif
         r->iface->transmit(buf, r->gateway ? r->gateway : IPAddr(iph.dst));
     }