Se cambia el logueo de paquetes dropeados a std::cerr para diferenciar de

[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 d673f8d133cb6c566b6c7f89bcd245a853d8c01e..6e0c80733914f6ddeaaf427e6d6513a02a680f8a 100644 (file)
--- a/practicas/pipi/src/ipout.cpp
+++ b/practicas/pipi/src/ipout.cpp
@@ -2,11 +2,20 @@
 #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, Dev& dev, std::ostream& log):
-    ip(ip), dev(dev), 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)
 {


@@ -23,20 +32,45 @@ bool IPOut::send(const std::string& data, uint8_t proto, IPAddr dst, IPAddr src,
         bool df, uint8_t ttl, uint16_t id)
     throw (std::runtime_error)
 {
         bool df, uint8_t ttl, uint16_t id)
     throw (std::runtime_error)
 {

-    // No quieren fragmentar
-    if (df && (IPHeader::header_len() + data.size() > dev.mtu))
+    // Mando todo lo que tengo para forwardear
+    while (to_forward())

     {
     {

-        drop("Tamaño de paquete más grande que MTU y DF=1", data);
-        return false;
+        std::string buf = forward_que.receive();
+        IPHeader iph(buf);
+#ifdef DEBUG
+        std::cout << "IPOut::send: A forwardear\n";
+#endif
+        send(iph, buf.substr(iph.header_len()));

     }
     }

+    // Mando el paquete en sí
+    // Armamos cabecera

     if (!src)
         src = ip;
     if (!id)
         id = get_id();
     IPHeader iph(4, IPHeader::header_len() + data.size(), id, df, 0, 0,
             ttl, proto, src, dst);
     if (!src)
         src = ip;
     if (!id)
         id = get_id();
     IPHeader iph(4, IPHeader::header_len() + data.size(), id, df, 0, 0,
             ttl, proto, src, dst);

+    return send(iph, data);
+}
+
+/// Envía un paquete IP
+bool IPOut::send(IPHeader iph, std::string data) throw (std::runtime_error)
+{
+    // Buscamos ruta
+    RouteTable::Route* r = rtable.get(iph.dst);
+    if (!r)
+    {
+        drop("No existe una ruta para el destino", iph);
+        return false;
+    }
+    // No quieren fragmentar
+    if (iph.df && (IPHeader::header_len() + data.size() > r->iface->mtu))
+    {
+        drop("Tamaño de paquete más grande que MTU y DF=1", iph);
+        return false;
+    }

     // Fragmenta (de ser necesario)
     // Fragmenta (de ser necesario)

-    int max_payload = dev.mtu - IPHeader::header_len();
+    int max_payload = r->iface->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;


@@ -51,10 +85,11 @@ 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: Fragmento 0 => IPHeader: " << iph2 << "\n";
+        std::string tmp = data.substr(i * max_payload, max_payload);
+        std::cout << "\tdata (" << tmp.size() << ") = " << tmp << "\n";

 #endif
 #endif

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

     }
     return true;
 }
     }
     return true;
 }


@@ -65,4 +100,12 @@ uint16_t IPOut::get_id() const
     return time(NULL);
 }
 
     return time(NULL);
 }
 

+/// Se fija si hay paquetes a forwardear (y devuelve cuantos hay)
+unsigned IPOut::to_forward()
+{
+    struct msqid_ds minfo;
+    msgctl(forward_que.que_id, IPC_STAT, &minfo);
+    return minfo.msg_qnum;
+}
+

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