Se emprolija un poco el terreno:

[z.facultad/75.74/practicos.git] / practicas / pipi / src / test_recv.cpp

diff --git a/practicas/pipi/src/test_recv.cpp b/practicas/pipi/src/test_recv.cpp
index b77b5f8c888f66e14c139bf9dcc6b3070ea38a00..2471b4a1b9b3e5a93ae2866dccb357c4d1e5f185 100644 (file)
--- a/practicas/pipi/src/test_recv.cpp
+++ b/practicas/pipi/src/test_recv.cpp
@@ -1,6 +1,4 @@
 
 

-#include "ethernetframe.h"
-#include "media.h"

 #include "dev.h"
 #include <iostream>
 #include <unistd.h>
 #include "dev.h"
 #include <iostream>
 #include <unistd.h>


@@ -11,16 +9,14 @@
 
 int main()
 {
 
 int main()
 {

-    Media media(0xabcdef);
-    Dev dev(1234, media);
+    Dev dev(4321);

     struct msqid_ds minfo;
     struct msqid_ds minfo;

-    for (msgctl(media.que_id, IPC_STAT, &minfo); minfo.msg_qnum;
-            msgctl(media.que_id, IPC_STAT, &minfo))
+    for (msgctl(dev.que_id, IPC_STAT, &minfo); minfo.msg_qnum;
+            msgctl(dev.que_id, IPC_STAT, &minfo))

     {
         std::cout << "Quedan " << minfo.msg_qnum << " mensajes en la cola\n";
     {
         std::cout << "Quedan " << minfo.msg_qnum << " mensajes en la cola\n";

-        EthernetFrame<1500> f(1234);
-        dev.recv(f);
-        std::cout << f._mac << " " << f._len << " " << f._frame << "\n";
+        std::string s = dev.receive();
+        std::cout << "Recibido '" << s << "' (len " << s.size() << ")\n";

     }
     return 0;
 }
     }
     return 0;
 }