Se agrega opción para recibir paquetes de un host específico y se mejora el

[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 e7e211ba49b357ca9db3cf53eea62ff475ed2da9..84a3733f7b32e330dc1d9a74283e950c8007c465 100644 (file)
--- a/practicas/pipi/src/ipout.cpp
+++ b/practicas/pipi/src/ipout.cpp
@@ -2,21 +2,31 @@
 #include "ipout.h"
 #include "ipheader.h"
 #include <ctime>
 #include "ipout.h"
 #include "ipheader.h"
 #include <ctime>

+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
+#ifdef DEBUG
+#include <iostream>
+#endif

 
 /// Constructor
 
 /// Constructor

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

 {
 }
 
 void IPOut::drop(const std::string& msg, const std::string& buf)
 {
 {
 }
 
 void IPOut::drop(const std::string& msg, const std::string& buf)
 {

-    log << "IPOut::drop: " << msg << "\n\tBuffer: " << buf << "\n";
+    log << "IPOut::drop (" << ip << "): " << msg << "\n\tBuffer: " << buf
+            << "\n";

 }
 
 void IPOut::drop(const std::string& msg, const IPHeader& iph)
 {
 }
 
 void IPOut::drop(const std::string& msg, const IPHeader& iph)
 {

-    log << "IPOut::drop: " << msg << "\n\tIPHeader: " << iph << "\n";
+    log << "IPOut::drop (" << ip << "): " << msg << "\n\tIPHeader: " << iph
+            << "\n";

 }
 
 /// Envía un paquete IP
 }
 
 /// Envía un paquete IP


@@ -31,21 +41,30 @@ bool IPOut::send(const std::string& data, uint8_t proto, IPAddr dst, IPAddr src,
         id = get_id();
     IPHeader iph(4, IPHeader::header_len() + data.size(), id, df, 0, 0,
             ttl, proto, src, dst);
         id = get_id();
     IPHeader iph(4, IPHeader::header_len() + data.size(), id, df, 0, 0,
             ttl, proto, src, dst);

+    // Enviamos
+    return send(iph, data);
+}
+
+/// Envía un paquete IP
+bool IPOut::send(IPHeader iph, std::string data) throw (std::runtime_error)
+{

     // Buscamos ruta
     // Buscamos ruta

-    RouteTable::Route* r = rtable.get(dst);
+    RouteTable::Route* r = rtable.get(iph.dst);

     if (!r)
     {
     if (!r)
     {

-        drop("No existe una ruta para el destino", iph);
+        // ICMP
+        drop("No existe una ruta para el destino -> ICMP", iph);

         return false;
     }
     // No quieren fragmentar
         return false;
     }
     // No quieren fragmentar

-    if (df && (IPHeader::header_len() + data.size() > r->iface->mtu))
+    if (iph.df && (IPHeader::header_len() + data.size() > r->mtu))

     {
     {

+        // Silencioso

         drop("Tamaño de paquete más grande que MTU y DF=1", iph);
         return false;
     }
     // Fragmenta (de ser necesario)
         drop("Tamaño de paquete más grande que MTU y DF=1", iph);
         return false;
     }
     // Fragmenta (de ser necesario)

-    int max_payload = r->iface->mtu - IPHeader::header_len();
+    int max_payload = r->mtu - IPHeader::header_len();

     int cant_frag = data.size() / max_payload;
     if (data.size() % max_payload)
         ++cant_frag;
     int cant_frag = data.size() / max_payload;
     if (data.size() % max_payload)
         ++cant_frag;


@@ -60,18 +79,38 @@ bool IPOut::send(const std::string& data, uint8_t proto, IPAddr dst, IPAddr src,
         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 (" << ip << "): Fragmento " << i
+                << " => IPHeader: " << iph2 << "\n";
+        std::string tmp = data.substr(i * max_payload, max_payload);
+        std::cout << "\tdata (" << tmp.size() << ") = " << tmp << "\n";

 #endif
 #endif

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

     }
     return true;
 }
 
     }
     return true;
 }
 

+/// Realiza el forwarding de paquetes (en un loop infinito)
+void IPOut::forward_loop()
+    throw (std::runtime_error)
+{
+    while (true)
+    {
+        std::string buf = forward_que.receive();
+        IPHeader iph(buf);
+#ifdef DEBUG
+        std::cout << "IPOut::forward_loop (" << ip << "): A forwardear (id "
+                << iph.id << ", offset " << iph.offset << ")\n";
+#endif
+        send(iph, buf.substr(iph.header_len()));
+    }
+}
+

 /// Obtiene un identificador para el paquete
 uint16_t IPOut::get_id() const
 {
 /// Obtiene un identificador para el paquete
 uint16_t IPOut::get_id() const
 {

-    return time(NULL);
+    static uint16_t st = time(NULL);
+    uint16_t tt = time(NULL);
+    return (tt == st) ? ++st : tt;

 }
 
 // vim: set et sw=4 sts=4 :
 }
 
 // vim: set et sw=4 sts=4 :