No se crea más la cola porque la crea el mismo DevQue.

[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..767db773cc37d6cf978f5ca5976e267b4eb56434 100644 (file)
--- a/practicas/pipi/src/test_ipin.cpp
+++ b/practicas/pipi/src/test_ipin.cpp
@@ -1,9 +1,10 @@
 
 #include "ipin.h"
 #include "ipaddr.h"
 
 #include "ipin.h"
 #include "ipaddr.h"

-#include "dev.h"
+#include "devque.h"

 #include <iostream>
 #include <cstdlib>
 #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>


@@ -18,8 +19,8 @@ int main(int argc, char* argv[])
     unsigned mtu = 25;
     bool router = false;
     bool forward = false;
     unsigned mtu = 25;
     bool router = false;
     bool forward = false;

-    unsigned proto = 0;
-    key_t queue_id = DEV_DEFAULT_KEY;
+    uint8_t proto = 0;
+    key_t queue_id = DEVQUE_DEFAULT_KEY;

     if (argc > 1)
         addr = IPAddr(argv[1]);
     if (argc > 2)
     if (argc > 1)
         addr = IPAddr(argv[1]);
     if (argc > 2)


@@ -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]);

-    Dev dev(addr, mtu, queue_id);
-    int que_id = msgget(queue_id+1, IPC_CREAT | 0666);
+    int que_id = msgget(queue_id, IPC_CREAT | 0666);

     assert(que_id != -1);
     assert(que_id != -1);

-    Dev fwque(addr, DEV_MAX_MTU, queue_id+1);
-    IPIn ipin(addr, dev, fwque, router, forward);
+    DevQue dev(addr, mtu, queue_id);
+    que_id = msgget(queue_id+1, IPC_CREAT | 0666);
+    assert(que_id != -1);
+    DevQue 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))
     struct msqid_ds minfo;
     for (msgctl(dev.que_id, IPC_STAT, &minfo); minfo.msg_qnum;
             msgctl(dev.que_id, IPC_STAT, &minfo))