Se mueve add_routes() a routetable porque estaba duplicado.

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

diff --git a/practicas/pipi/src/routetable.h b/practicas/pipi/src/routetable.h
index 2fe158604005e871ab0a264d722cef09f897735a..d534d168e7e4b7991ecae62319e37a6c3570d8c5 100644 (file)
--- a/practicas/pipi/src/routetable.h
+++ b/practicas/pipi/src/routetable.h
@@ -4,6 +4,7 @@
 #include "dev.h"
 #include "ipaddr.h"
 #include <map>
 #include "dev.h"
 #include "ipaddr.h"
 #include <map>

+#include <istream>

 
 /// Tabla de ruteo
 struct RouteTable
 
 /// Tabla de ruteo
 struct RouteTable


@@ -13,11 +14,12 @@ struct RouteTable
     struct Route
     {
         IPAddr gateway;
     struct Route
     {
         IPAddr gateway;

+        unsigned mtu;

         unsigned metric;
         Dev* iface;
         unsigned metric;
         Dev* iface;

-        Route(): gateway(0), metric(0), iface(0) {}
-        Route(const IPAddr& gateway, unsigned metric, Dev& iface):
-            gateway(gateway), metric(metric), iface(&iface) {}
+        Route(): gateway(0), mtu(0), metric(0), iface(0) {}
+        Route(const IPAddr& gateway, unsigned mtu, unsigned metric, Dev& iface):
+            gateway(gateway), mtu(mtu), metric(metric), iface(&iface) {}

     };
 
     /// Tabla
     };
 
     /// Tabla


@@ -30,7 +32,7 @@ struct RouteTable
     RouteTable(Dev& default_iface);
 
     /// Agrega ruta
     RouteTable(Dev& default_iface);
 
     /// Agrega ruta

-    void add(const IPAddr& net, const IPAddr& gw, unsigned metric, Dev& iface);
+    void add(const IPAddr& net, const IPAddr& gw, unsigned mtu, unsigned metric, Dev& iface);

 
     /// Borra ruta
     void del(const IPAddr& net);
 
     /// Borra ruta
     void del(const IPAddr& net);


@@ -40,6 +42,9 @@ struct RouteTable
 
 };
 
 
 };
 

+/// Agrega rutas desde un stream de datos con un cierto dispositivo
+void add_routes(RouteTable& rt, std::istream& is, Dev& dev);
+

 #endif // _ROUTETABLE_H_
 
 // vim: set et sw=4 sts=4 :
 #endif // _ROUTETABLE_H_
 
 // vim: set et sw=4 sts=4 :