NSIS-ka
A free C++ implementation of NSIS protocols

Changeset 4498


Ignore:
Timestamp:
Sep 29, 2009, 3:35:44 PM (8 years ago)
Author:
stud-lenk
Message:

Minor code-beautifying

Location:
ntlp/branches/20090723-multicast/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ntlp/branches/20090723-multicast/src/ntlp_statemodule_querier.cpp

    r4497 r4498  
    10341034      EVLog(param.name, color[magenta] << "NoResponse Timer went off" << color[off]);
    10351035     
    1036       // If this is a Querying Node doing multicast, unresponsive nodes get purged now
    1037       if (r_entry->is_multicast_QNode()) {
    1038         DLog(param.name, "This node is a multicasting QN in state ESTABLISHED. Purging unresponsive peers now.");
    1039         r_entry->purge_multicast_peers();
    1040 
    1041         // if in state ESTABLISHED, purging unresponsive multicast peers is all we have to do
    1042         if (r_entry->get_state() == qn_established) {
    1043           param.rt.unlock(r_key);
    1044           return;
     1036      // The timer NoResponse should only time out in state ESTABLISHED, if this is a
     1037      // Querying Node targeting a multicast address. In this case it is used to
     1038      // purge unresponsive multicast peers.
     1039      if (r_entry->get_state() == qn_established) {
     1040        if (r_entry->is_multicast_QNode()) {
     1041          DLog(param.name, "This node is a multicasting QN in state ESTABLISHED. Purging unresponsive peers now.");
     1042          r_entry->purge_multicast_peers();
     1043        } else {
     1044          // Usually this should NEVER happen. If this is not a multicast QNode
     1045          // the timer NoResponse should have been stopped on transition to
     1046          // state ESTABLISHED.
     1047          ERRCLog(param.name, color[red] << "NoResponse timeout in state ESTABLISHED, unicasting QNode -- ignoring (already got a response)" << color[off]);
    10451048        }
    1046       } else {
    1047         if (r_entry->get_state() == qn_established) {
    1048           ERRCLog(param.name, color[red] << "NoResponse timeout in state ESTABLISHED, unicasting QNode -- ignoring (already got a response)" << color[off]);
    1049           param.rt.unlock(r_key);
    1050           return;
    1051         }
     1049        param.rt.unlock(r_key);
     1050        return;
    10521051      }
    10531052
  • ntlp/branches/20090723-multicast/src/routingentry.cpp

    r4497 r4498  
    6666    }
    6767  }
     68#ifdef DEBUG_HARD
    6869  if (nli == NULL)
    6970    DLog("routingentry", "is_ma_reuse_requested() returns " << rv);
    7071  else
    7172    DLog("routingentry", "is_ma_reuse_requested(" << nli->get_if_address() << ") returns " << rv);
     73#endif
    7274  return rv;
    7375}
Note: See TracChangeset for help on using the changeset viewer.