X-Git-Url: https://git.llucax.com/z.facultad/75.74/practicos.git/blobdiff_plain/6758589f5ff68b1775d5a83b01d7ac49f1b612ef..78d6e1ce97611abe9f0d083033197773f93c33f7:/practicas/pipi/src/test_ipin.cpp

diff --git a/practicas/pipi/src/test_ipin.cpp b/practicas/pipi/src/test_ipin.cpp
index eb15d0f..767db77 100644
--- 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 "dev.h"
+#include "devque.h"
 #include <iostream>
 #include <cstdlib>
+#include <cassert>
 #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 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)
@@ -32,10 +33,12 @@ int main(int argc, char* argv[])
         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);
-    Dev fwque(addr, DEV_MAX_MTU, queue_id+1);
+    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;