X-Git-Url: https://git.llucax.com/z.facultad/75.74/practicos.git/blobdiff_plain/f6b5546e1ff6c6a915a10c955fea0923f39b46ac..9ee7a97ec97d3dc41e1367f1f457d5ed5d5270ea:/practicas/pipi/src/test_ipin.cpp diff --git a/practicas/pipi/src/test_ipin.cpp b/practicas/pipi/src/test_ipin.cpp index 10010e9..12e84e0 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 #include +#include #include #include #include @@ -19,7 +20,7 @@ int main(int argc, char* argv[]) 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) @@ -34,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); - 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); - 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;