Agrego lista de cosas que faltan.

[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 1d21ab6a3942d3062ba0f10d57a3c6f3b45d574f..e170b384fca8a4afc4ce82bd7bc8f41224452241 100644 (file)
--- a/practicas/pipi/src/test_ipin.cpp
+++ b/practicas/pipi/src/test_ipin.cpp
@@ -4,6 +4,7 @@
 #include "dev.h"
 #include <iostream>
 #include <cstdlib>
 #include "dev.h"
 #include <iostream>
 #include <cstdlib>

+#include <cassert>

 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>


@@ -32,11 +33,13 @@ int main(int argc, char* argv[])
         proto = atoi(argv[5]);
     if (argc > 6)
         queue_id = atoi(argv[6]);
         proto = atoi(argv[5]);
     if (argc > 6)
         queue_id = atoi(argv[6]);

+    int que_id = msgget(queue_id, IPC_CREAT | 0666);
+    assert(que_id != -1);

     Dev dev(addr, mtu, queue_id);
     Dev dev(addr, mtu, queue_id);

-    int que_id = msgget(queue_id+1, IPC_CREAT | 0666);
+    que_id = msgget(queue_id+1, IPC_CREAT | 0666);

     assert(que_id != -1);
     Dev fwque(addr, DEV_MAX_MTU, queue_id+1);
     assert(que_id != -1);
     Dev fwque(addr, DEV_MAX_MTU, queue_id+1);

-    IPIn ipin(addr, dev, fwque, router, forward);
+    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))
     struct msqid_ds minfo;
     for (msgctl(dev.que_id, IPC_STAT, &minfo); minfo.msg_qnum;
             msgctl(dev.que_id, IPC_STAT, &minfo))