Se mueve add_routes() a routetable porque estaba duplicado.

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

diff --git a/practicas/pipi/src/ip.cpp b/practicas/pipi/src/ip.cpp
index 6bffcfdbbb29718db2e5bfed85e2eec668d339ca..5a538cedd10233eb8f2a30ff2303a170bf5baea2 100644 (file)
--- a/practicas/pipi/src/ip.cpp
+++ b/practicas/pipi/src/ip.cpp
@@ -18,12 +18,10 @@
 #include <sys/msg.h>
 #include <signal.h>
 
-// Uso: ./test_ipout ip [router forward routes_file port proto]
+// Uso: ./ip ip [router forward routes_file port proto]
 
 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;
@@ -33,7 +31,7 @@ int main(int argc, char* argv[])
     std::string fname = "route.txt";
     if (argc < 2)
     {
-        std::cerr << "Uso: ./test_ipout ip [router forward routes_file "
+        std::cerr << "Uso: " << argv[0] << " ip [router forward routes_file "
             "port proto]\n";
         return 1;
     }
@@ -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 :