Se crea una interfaz genérica para interfaces de red (Dev) y se pasa la

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

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

 #include <iostream>
 #include <cstdlib>
 #include <cassert>
 #include <iostream>
 #include <cstdlib>
 #include <cassert>


@@ -20,7 +20,7 @@ int main(int argc, char* argv[])
     bool router = false;
     bool forward = false;
     unsigned proto = 0;
     bool router = false;
     bool forward = false;
     unsigned proto = 0;

-    key_t queue_id = DEV_DEFAULT_KEY;
+    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)


@@ -35,10 +35,10 @@ int main(int argc, char* argv[])
         queue_id = atoi(argv[6]);
     int que_id = msgget(queue_id, IPC_CREAT | 0666);
     assert(que_id != -1);
         queue_id = atoi(argv[6]);
     int que_id = msgget(queue_id, IPC_CREAT | 0666);
     assert(que_id != -1);

-    Dev dev(addr, mtu, queue_id);
+    DevQue dev(addr, mtu, queue_id);

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

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