Se mueve add_routes() a routetable porque estaba duplicado.

diff --git a/practicas/pipi/src/dns.cpp b/practicas/pipi/src/dns.cpp
index 5b3c66c00244f9adda844a28ff22c10efd5131b2..f0846d4fa1f6eb815201d643ea2920312c13ddd2 100644 (file)
--- a/practicas/pipi/src/dns.cpp
+++ b/practicas/pipi/src/dns.cpp
@@ -23,8 +23,6 @@
 
 void send_loop(NameServer& ns);
 
-void add_routes(RouteTable& rt, std::istream& is, Dev& dev);
-
 int main(int argc, char* argv[])
 {
     uint16_t port = DEVTCP_DEFAULT_PORT;
@@ -108,21 +106,4 @@ void send_loop(NameServer& ns)
     }
 }
 
-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 :

diff --git a/practicas/pipi/src/ip.cpp b/practicas/pipi/src/ip.cpp
index 6988169c01d2200c92318a763a2b5dd2f1e2040f..5a538cedd10233eb8f2a30ff2303a170bf5baea2 100644 (file)
--- a/practicas/pipi/src/ip.cpp
+++ b/practicas/pipi/src/ip.cpp
@@ -22,8 +22,6 @@
 
 void send_loop(IPOut& ipout, unsigned proto);
 
-void add_routes(RouteTable& rt, std::istream& is, Dev& dev);
-
 int main(int argc, char* argv[])
 {
     bool router = false;
@@ -120,21 +118,4 @@ void send_loop(IPOut& ipout, unsigned proto)
     }
 }
 
-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 :

diff --git a/practicas/pipi/src/routetable.cpp b/practicas/pipi/src/routetable.cpp
index 40de2d3d04c7de1cae8fc762f14107d7384f52bb..43e3377257d1da18324f7100d44c20d8647cb62b 100644 (file)
--- a/practicas/pipi/src/routetable.cpp
+++ b/practicas/pipi/src/routetable.cpp
@@ -1,4 +1,6 @@
 #include "routetable.h"
+#include <string>
+#include <sstream>
 #ifdef DEBUG
 #include <iostream>
 #endif
@@ -30,4 +32,21 @@ RouteTable::Route* RouteTable::get(const IPAddr& 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 :

diff --git a/practicas/pipi/src/routetable.h b/practicas/pipi/src/routetable.h
index 20f62e8f709b4febee5fa9f79f0d3811bc133a22..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 <istream>
 
 /// Tabla de ruteo
 struct RouteTable
@@ -41,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 :