Mejora salida (agrega IP para saber de que proceso se trata).

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

diff --git a/practicas/pipi/src/test_ipin.cpp b/practicas/pipi/src/test_ipin.cpp
index 750ffd499024fe819e3a0ce45b816fe80549b06f..eb15d0f37d13cdd9c85a3dcaec0ee2f5f7afcf57 100644 (file)
--- a/practicas/pipi/src/test_ipin.cpp
+++ b/practicas/pipi/src/test_ipin.cpp
@@ -1,25 +1,51 @@
 
 #include "ipin.h"
 #include "ipaddr.h"
+#include "dev.h"
 #include <iostream>
+#include <cstdlib>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
 
-int main()
+// Uso: ./test_ipin ip mtu router forward proto queue_id
+
+int main(int argc, char* argv[])
 {
-    Dev dev(4321);
-    IPIn ipin(IPAddr("10.10.10.1"), dev);
+    IPAddr addr("10.10.10.1");
+    unsigned mtu = 25;
+    bool router = false;
+    bool forward = false;
+    unsigned proto = 0;
+    key_t queue_id = DEV_DEFAULT_KEY;
+    if (argc > 1)
+        addr = IPAddr(argv[1]);
+    if (argc > 2)
+        mtu = atoi(argv[2]);
+    if (argc > 3)
+        router = atoi(argv[3]);
+    if (argc > 4)
+        forward = atoi(argv[4]);
+    if (argc > 5)
+        proto = atoi(argv[5]);
+    if (argc > 6)
+        queue_id = atoi(argv[6]);
+    Dev dev(addr, mtu, queue_id);
+    int que_id = msgget(queue_id+1, IPC_CREAT | 0666);
+    assert(que_id != -1);
+    Dev fwque(addr, DEV_MAX_MTU, queue_id+1);
+    IPIn ipin(addr, dev, fwque, router, forward, std::cerr);
     struct msqid_ds minfo;
     for (msgctl(dev.que_id, IPC_STAT, &minfo); minfo.msg_qnum;
             msgctl(dev.que_id, IPC_STAT, &minfo))
     {
         IPAddr src, dst;
         std::cout << "Quedan " << minfo.msg_qnum << " mensajes en la cola\n";
-        std::string s = ipin.recv(0, src, dst);
-        std::cout << "Recibido '" << s << "' (len " << s.size() << ")\n";
+        std::string s = ipin.recv(proto, src, dst);
+        std::cout << "Recibido '" << s << "' (len " << s.size() << ") de "
+            << src << " para " << dst << " (proto = " << proto << ")\n";
     }
     return 0;
 }