ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.2.x/src/res.c
(Generate patch)

Comparing ircd-hybrid/branches/8.2.x/src/res.c (file contents):
Revision 4095 by michael, Sun Jun 29 11:51:22 2014 UTC vs.
Revision 4234 by michael, Tue Jul 15 17:25:03 2014 UTC

# Line 193 | Line 193 | res_ourserver(const struct irc_ssaddr *i
193   * there too long without being resolved.
194   */
195   static time_t
196 < timeout_query_list(time_t now)
196 > timeout_query_list(void)
197   {
198    dlink_node *ptr = NULL, *ptr_next = NULL;
199 <  struct reslist *request;
199 >  struct reslist *request = NULL;
200    time_t next_time = 0;
201    time_t timeout   = 0;
202  
# Line 205 | Line 205 | timeout_query_list(time_t now)
205      request = ptr->data;
206      timeout = request->sentat + request->timeout;
207  
208 <    if (now >= timeout)
208 >    if (CurrentTime >= timeout)
209      {
210        if (--request->retries <= 0)
211        {
# Line 215 | Line 215 | timeout_query_list(time_t now)
215        }
216        else
217        {
218 <        request->sentat = now;
218 >        request->sentat = CurrentTime;
219          request->timeout += request->timeout;
220          resend_query(request);
221        }
# Line 225 | Line 225 | timeout_query_list(time_t now)
225        next_time = timeout;
226    }
227  
228 <  return (next_time > now) ? next_time : (now + AR_TTL);
228 >  return (next_time > CurrentTime) ? next_time : (CurrentTime + AR_TTL);
229   }
230  
231   /*
# Line 234 | Line 234 | timeout_query_list(time_t now)
234   static void
235   timeout_resolver(void *notused)
236   {
237 <  timeout_query_list(CurrentTime);
237 >  timeout_query_list();
238   }
239  
240   /*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines