X-Git-Url: https://git.llucax.com/z.facultad/75.74/practicos.git/blobdiff_plain/1a2bb56c4c44080e941e6a7dc2420a404bceba5b..HEAD:/practicas/pipi/src/nameserver.cpp?ds=sidebyside diff --git a/practicas/pipi/src/nameserver.cpp b/practicas/pipi/src/nameserver.cpp index 4d878b1..4fd894a 100644 --- a/practicas/pipi/src/nameserver.cpp +++ b/practicas/pipi/src/nameserver.cpp @@ -46,7 +46,7 @@ static std::istream& parsezone(std::istream& is, NameServer::Zone& z) throw std::runtime_error("Error al parsear"); z.name = sname; #ifdef DEBUG_PARSER - std::cerr << "NameServer::parsezone: IP = " << ip << "\n\n"; + std::cout << "NameServer::parsezone: IP = " << ip << "\n\n"; #endif z.parent = IPAddr(ip); // un record por linea, sin líneas vacías @@ -60,13 +60,13 @@ static std::istream& parsezone(std::istream& is, NameServer::Zone& z) throw std::runtime_error("Error al parsear"); typedef NameServer::Record Rec; #ifdef DEBUG_PARSER - std::cerr << "NameServer::parsezone: IP = " << ip << "\n\n"; + std::cout << "NameServer::parsezone: IP = " << ip << "\n\n"; #endif Rec r((type == "NS") ? Rec::NS : Rec::A, IPAddr(ip)); z.records.insert(NameServer::Zone::records_t::value_type(key, r)); } #ifdef DEBUG_PARSER - std::cerr << "NameServer::parsezone: " << z << "\n\n"; + std::cout << "NameServer::parsezone: " << z << "\n\n"; #endif return is; } @@ -106,7 +106,7 @@ NameServer::NameServer(std::istream& is, IPIn& ipin, IPOut& ipout, zones.push_back(z); z.clear(); #ifdef DEBUG_PARSER - std::cerr << "NameServer::NameServer: " << z << "\n\n"; + std::cout << "NameServer::NameServer: " << z << "\n\n"; #endif } @@ -142,7 +142,7 @@ name_split(NameServer::Name n, NameServer::Name m) r.push_back(n[i++]); std::reverse(r.begin(), r.end()); #ifdef DEBUG_NAME - std::cerr << "NameServer::name_split(" << n << ", " << m << ") -> " + std::cout << "NameServer::name_split(" << n << ", " << m << ") -> " << r << "\n"; #endif return r; @@ -226,7 +226,7 @@ ResolvProtoResponse NameServer::resolv_direct(const Name& n) std::cout << "NameServer::resolv_direct()\n"; #endif #ifdef DEBUG_RESOLV - std::cerr << "NameServer::resolv_direct -> tratando de resolver: " + std::cout << "NameServer::resolv_direct -> tratando de resolver: " << n << "\n"; #endif search_zone zs(n); @@ -237,7 +237,7 @@ ResolvProtoResponse NameServer::resolv_direct(const Name& n) if (found) { #ifdef DEBUG_RESOLV - std::cerr << "NameServer::resolv_direct -> found (local/hijo): " + std::cout << "NameServer::resolv_direct -> found (local/hijo): " << zs.resp << "\n"; #endif return zs.resp; @@ -245,21 +245,31 @@ ResolvProtoResponse NameServer::resolv_direct(const Name& n) if (zs.local) { #ifdef DEBUG_RESOLV - std::cerr << "NameServer::resolv_direct -> NOT FOUND (es local pero " + std::cout << "NameServer::resolv_direct -> NOT FOUND (es local pero " "no existe)\n"; #endif return ResolvProtoResponse(RP_RES_NOTFOUND); } - cache_t::const_iterator i = cache.find(n); - // TODO TTL!?! + cache_t::iterator i = cache.find(n); if (i != cache.end()) { + const CacheRecord& cr = i->second; #ifdef DEBUG_RESOLV - std::cerr << "NameServer::resolv_direct -> found (en cache): " - << i->second << "\n"; + std::cout << "NameServer::resolv_direct -> found (en cache): " + << cr << "\n"; #endif - const CacheRecord& cr = i->second; - return ResolvProtoResponse(RP_RES_A, cr.ttl, cr.ips); + if (unsigned(time(NULL)) > cr.expire) // Expiró + { + cache.erase(i); +#ifdef DEBUG_RESOLV + std::cout << " -> pero no sirve, expiró " + "hace unos " << (time(NULL) - cr.expire) << " segundos\n"; +#endif + } + else + { + return ResolvProtoResponse(RP_RES_A, cr.ttl, cr.ips); + } } if (zones.size()) { @@ -267,13 +277,13 @@ ResolvProtoResponse NameServer::resolv_direct(const Name& n) for (zones_t::const_iterator i = zones.begin(); i != zones.end(); ++i) { #ifdef DEBUG_RESOLV - std::cerr << "NameServer::resolv_direct -> evaluando padre " + std::cout << "NameServer::resolv_direct -> evaluando padre " << i->parent << "\n"; #endif if (i->parent != IPAddr(0)) { #ifdef DEBUG_RESOLV - std::cerr << "NameServer::resolv_direct -> found (al padre): " + std::cout << "NameServer::resolv_direct -> found (al padre): " << i->parent << "\n"; #endif ResolvProtoResponse rpr(RP_RES_NS, i->ttl); @@ -283,7 +293,7 @@ ResolvProtoResponse NameServer::resolv_direct(const Name& n) } } #ifdef DEBUG_RESOLV - std::cerr << "NameServer::resolv_direct -> NOT FOUND (no hay padre)\n"; + std::cout << "NameServer::resolv_direct -> NOT FOUND (no hay padre)\n"; #endif // No hay padre, no puedo hacer nada más return ResolvProtoResponse(RP_RES_NOTFOUND); @@ -300,13 +310,13 @@ ResolvProtoResponse NameServer::resolv_recursive(const Name& n) { case RP_RES_NS: #ifdef DEBUG_RESOLV - std::cerr << "NameServer::resolv_recursive -> redirect a " + std::cout << "NameServer::resolv_recursive -> redirect a " << rpr << "\n"; #endif return resolv_recursive_r(n, rpr); // Sigo "bajando" case RP_RES_A: #ifdef DEBUG_RESOLV - std::cerr << "NameServer::resolv_recursive -> gotcha! " + std::cout << "NameServer::resolv_recursive -> gotcha! " << rpr << "\n"; #endif break; @@ -330,26 +340,26 @@ ResolvProtoResponse NameServer::resolv_recursive_r(const Name& n, { case RP_RES_NS: #ifdef DEBUG_RESOLV - std::cerr << "NameServer::resolv_recursive_r -> redirect a " + std::cout << "NameServer::resolv_recursive_r -> redirect a " << r << "\n"; #endif return resolv_recursive_r(n, r); // Sigo "bajando" case RP_RES_NOTFOUND: #ifdef DEBUG_RESOLV - std::cerr << "NameServer::resolv_recursive_r -> NOT FOUND en " + std::cout << "NameServer::resolv_recursive_r -> NOT FOUND en " << *ip << ", sigo probando\n"; #endif break; // Sigo probando del mismo nivel case RP_RES_A: #ifdef DEBUG_RESOLV - std::cerr << "NameServer::resolv_recursive_r -> gotcha! " + std::cout << "NameServer::resolv_recursive_r -> gotcha! " << r << "\n"; #endif return r; // Gotcha! } } #ifdef DEBUG_RESOLV - std::cerr << "NameServer::resolv_recursive_r -> NOT FOUND, no hay más " + std::cout << "NameServer::resolv_recursive_r -> NOT FOUND, no hay más " "por hacer\n"; #endif return r; // NOTFOUND @@ -363,7 +373,7 @@ ResolvProtoResponse NameServer::query(const Name& n, const IPAddr& ip) #endif ResolvProtoRequest r(std::string(n), RP_REQ_DIRECT); #ifdef DEBUG_RESOLV - std::cerr << "NameServer::query -> pidiendo " << r << " a " << ip << "\n"; + std::cout << "NameServer::query -> pidiendo " << r << " a " << ip << "\n"; #endif // Envía a través de la cola de envío snd_que.transmit(std::string(r), ip); @@ -371,12 +381,12 @@ ResolvProtoResponse NameServer::query(const Name& n, const IPAddr& ip) std::string buf = res_que.receive(mac); ResolvProtoResponse resp(buf); #ifdef DEBUG_RESOLV - std::cerr << "NameServer::query -> recibido " << resp << " de " + std::cout << "NameServer::query -> recibido " << resp << " de " << ip << "\n"; #endif // Agrego a cache if (resp.ret == RP_RES_A) - cache[n] = CacheRecord(time(NULL) + resp.ttl, resp.ips); + cache[n] = CacheRecord(time(NULL) + resp.ttl, resp.ttl, resp.ips); return resp; } @@ -449,6 +459,9 @@ void NameServer::req_loop() #endif while (true) { +#ifdef DEBUG_RESOLV + std::cout << "----------------------------------------------------\n"; +#endif Dev::mac_type mac = 0; ResolvProtoRequest req(req_que.receive(mac)); #ifdef DEBUG_RESOLV @@ -494,7 +507,8 @@ std::ostream& operator<< (std::ostream& os, const NameServer::Zone& z) std::ostream& operator<< (std::ostream& os, const NameServer::CacheRecord& cr) { - os << "CacheRecord(ttl=" << cr.ttl << ", records="; + os << "CacheRecord(expire=" << cr.expire << " [now=" << time(NULL) + << "], ttl=" << cr.ttl << ", records="; std::copy(cr.ips.begin(), cr.ips.end(), std::ostream_iterator< IPAddr >(os, ",")); return os << ")";