Se mueve add_routes() a routetable porque estaba duplicado.

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

diff --git a/practicas/pipi/src/routetable.cpp b/practicas/pipi/src/routetable.cpp
index 3363952fa93af1c23709c5b5046678381fa4e400..43e3377257d1da18324f7100d44c20d8647cb62b 100644 (file)
--- a/practicas/pipi/src/routetable.cpp
+++ b/practicas/pipi/src/routetable.cpp
@@ -1,4 +1,6 @@
 #include "routetable.h"
 #include "routetable.h"

+#include <string>
+#include <sstream>

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


@@ -7,9 +9,10 @@ RouteTable::RouteTable(Dev& default_iface): default_iface(default_iface)
 {
 }
 
 {
 }
 

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

 {
 {

-    table[net] = Route(gw, metric, iface);
+    table[net] = Route(gw, metric, mtu, iface);

 #ifdef DEBUG
     //std::cout << "Se agregó tabla para " << net << ": gw = " << gw
     //    << ", metric = " << metric << "\n";
 #ifdef DEBUG
     //std::cout << "Se agregó tabla para " << net << ": gw = " << gw
     //    << ", metric = " << metric << "\n";


@@ -29,4 +32,21 @@ RouteTable::Route* RouteTable::get(const IPAddr& dst)
     return &table[dst];
 }
 
     return &table[dst];
 }
 

+void add_routes(RouteTable& rt, std::istream& is, Dev& dev)
+{
+    std::string line;
+    while (std::getline(is, line))
+    {
+        std::istringstream iss(line);
+        std::string net;
+        std::string gw;
+        unsigned mtu;
+        unsigned metric;
+        iss >> net >> gw >> mtu >> metric;
+        if (net == "0") net = "0.0.0.0";
+        if (gw == "0") gw = "0.0.0.0";
+        rt.add(net, gw, metric, mtu, dev);
+    }
+}
+

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