Changeset 1637

Show
Ignore:
Timestamp:
06/14/10 20:05:22 (3 years ago)
Author:
ahu
Message:

add dont-queries statistic, plus make sure we add :: and 0.0.0.0 to the dontquery list

Location:
trunk/pdns/pdns
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/pdns/pdns/pdns_recursor.cc

    r1636 r1637  
    15911591    vector<string> ips; 
    15921592    stringtok(ips, ::arg()["dont-query"], ", "); 
     1593    ips.push_back("0.0.0.0"); 
     1594    ips.push_back("::"); 
    15931595    L<<Logger::Warning<<"Will not send queries to: "; 
    15941596    for(vector<string>::const_iterator i = ips.begin(); i!= ips.end(); ++i) { 

  • trunk/pdns/pdns/rec_channel_rec.cc

    r1623 r1637  
    391391  addGetStat("ipv6-outqueries", &g_stats.ipv6queries); 
    392392  addGetStat("throttled-outqueries", &SyncRes::s_throttledqueries); 
     393  addGetStat("dont-outqueries", &SyncRes::s_dontqueries); 
    393394  addGetStat("throttled-out", &SyncRes::s_throttledqueries); 
    394395  addGetStat("unreachables", &SyncRes::s_unreachables); 

  • trunk/pdns/pdns/syncres.cc

    r1628 r1637  
    4949unsigned int SyncRes::s_tcpoutqueries; 
    5050unsigned int SyncRes::s_throttledqueries; 
     51unsigned int SyncRes::s_dontqueries; 
    5152unsigned int SyncRes::s_nodelegated; 
    5253unsigned int SyncRes::s_unreachables; 
    … …  
    865866          else if(!pierceDontQuery && g_dontQuery && g_dontQuery->match(&*remoteIP)) { 
    866867            LOG<<prefix<<qname<<": not sending query to " << remoteIP->toString() << ", blocked by 'dont-query' setting" << endl; 
     868            s_dontqueries++; 
    867869            continue; 
    868870          } 

  • trunk/pdns/pdns/syncres.hh

    r1623 r1637  
    200200  static unsigned int s_outgoingtimeouts; 
    201201  static unsigned int s_throttledqueries; 
     202  static unsigned int s_dontqueries; 
    202203  static unsigned int s_outqueries; 
    203204  static unsigned int s_tcpoutqueries;