No se crea más la cola porque la crea el mismo DevQue.

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

diff --git a/practicas/pipi/src/ipin.h b/practicas/pipi/src/ipin.h
index ecdc93ebdfff71ecdc4a98d44a5867f0cb9ff75c..8a452b2cd4dcb17ec6554e96e46fd9cff884fd24 100644 (file)
--- a/practicas/pipi/src/ipin.h
+++ b/practicas/pipi/src/ipin.h
@@ -47,19 +47,6 @@ struct IPIn
     typedef std::map< BufferKey, offsetmap_type > buffer_type;
     buffer_type buffer;
 
     typedef std::map< BufferKey, offsetmap_type > buffer_type;
     buffer_type buffer;
 

-    /// Buffers de paquetes completos
-    struct BufferPkt
-    {
-        uint32_t dst;
-        std::string data;
-        BufferPkt() {}
-        BufferPkt(const IPAddr& dst, const std::string& data):
-            dst(dst), data(data) {}
-    };
-    typedef std::map< IPAddr, BufferPkt > srcmap_type;
-    typedef std::map< uint8_t, srcmap_type > buffer_complete_type;
-    buffer_complete_type buffer_complete;
-

     /// Constructor
     IPIn(const IPAddr& ip, Dev& dev, Dev& forward_que, bool router = false,
         bool forward = false, std::ostream& log = std::cout);
     /// Constructor
     IPIn(const IPAddr& ip, Dev& dev, Dev& forward_que, bool router = false,
         bool forward = false, std::ostream& log = std::cout);


@@ -69,8 +56,7 @@ struct IPIn
     void drop(const std::string& msg, const IPHeader& iph);
 
     /// Recibe un paquete IP
     void drop(const std::string& msg, const IPHeader& iph);
 
     /// Recibe un paquete IP

-    std::string recv(uint8_t proto, IPAddr& src, IPAddr& dst,
-            bool filter = false)
+    std::string recv(uint8_t& proto, IPAddr& src, IPAddr& dst)

         throw (std::runtime_error);
 
     // Nada de andar copiando placas...
         throw (std::runtime_error);
 
     // Nada de andar copiando placas...