Se mueve el número de protocolo del nameserver a resolvproto.

diff --git a/practicas/pipi/src/nameserver.cpp b/practicas/pipi/src/nameserver.cpp
index 86f18e8556117e3926eeb6d1a751d4c3ff938a68..b007975234b4a351056c8863f0613b9283570d45 100644 (file)
--- a/practicas/pipi/src/nameserver.cpp
+++ b/practicas/pipi/src/nameserver.cpp
@@ -364,7 +364,7 @@ void NameServer::recv_loop()
                 << " de " << src << " para " << dst << " (proto = "
                 << unsigned(proto) << ")\n";
 #endif
                 << " de " << src << " para " << dst << " (proto = "
                 << unsigned(proto) << ")\n";
 #endif

-        if (proto == NAMESERVER_PROTO) // Si es para nosotros
+        if (proto == RESOLV_PROTO) // Si es para nosotros

         {
             rp_pkt_type_t type;
             memcpy(&type, s.c_str(), sizeof(uint8_t));
         {
             rp_pkt_type_t type;
             memcpy(&type, s.c_str(), sizeof(uint8_t));


@@ -407,7 +407,7 @@ void NameServer::send_loop()
 #ifdef DEBUG_RESOLV
             std::cout << "NameServer::send_loop() -> respondo " << res << "\n";
 #endif
 #ifdef DEBUG_RESOLV
             std::cout << "NameServer::send_loop() -> respondo " << res << "\n";
 #endif

-            ipout.send(res, NAMESERVER_PROTO, IPAddr(mac));
+            ipout.send(res, RESOLV_PROTO, IPAddr(mac));

         }
         else if (!snd_que.empty()) // Hay un request para enviar
         {
         }
         else if (!snd_que.empty()) // Hay un request para enviar
         {


@@ -417,7 +417,7 @@ void NameServer::send_loop()
             std::cout << "NameServer::send_loop() -> envío request "
                 << ResolvProtoRequest(buf) << "\n";
 #endif
             std::cout << "NameServer::send_loop() -> envío request "
                 << ResolvProtoRequest(buf) << "\n";
 #endif

-            ipout.send(buf, NAMESERVER_PROTO, IPAddr(mac));
+            ipout.send(buf, RESOLV_PROTO, IPAddr(mac));

         }
         else // No hay nada, esperamos un rato
         {
         }
         else // No hay nada, esperamos un rato
         {

diff --git a/practicas/pipi/src/nameserver.h b/practicas/pipi/src/nameserver.h
index d9b8a4f3419faa76129c89e6462c2b2b9fe5c581..4165b5879686ac36fe3263019b062967bb96ca7a 100644 (file)
--- a/practicas/pipi/src/nameserver.h
+++ b/practicas/pipi/src/nameserver.h
@@ -11,8 +11,6 @@
 #include <ostream>
 #include <stdexcept>
 
 #include <ostream>
 #include <stdexcept>
 

-#define NAMESERVER_PROTO 59
-

 /// Petición del resolver a un nameserver
 struct NameServer
 {
 /// Petición del resolver a un nameserver
 struct NameServer
 {

diff --git a/practicas/pipi/src/resolvproto.h b/practicas/pipi/src/resolvproto.h
index 210077117e408f6648d074ddd2628af12548c375..5874fbe51f162dd2cbb20174161a0b469d7de8f8 100644 (file)
--- a/practicas/pipi/src/resolvproto.h
+++ b/practicas/pipi/src/resolvproto.h
@@ -9,6 +9,9 @@
 #include <stdexcept>
 #include <stdint.h>
 
 #include <stdexcept>
 #include <stdint.h>
 

+/// Número de protocolo del resolver
+#define RESOLV_PROTO 59
+

 /// Tipo de petición
 enum rp_pkt_type_t
 {
 /// Tipo de petición
 enum rp_pkt_type_t
 {