mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-30 13:57:50 +00:00
Code Issues Releases Wiki Activity

Subroutinize some stuff so that it can be called in trace playback.

Browse Source
This commit is contained in:
Ted Lemon 2001-02-12 19:41:30 +00:00
parent fc33f8c58e
commit eb6b5a2014
1 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
common/dispatch.c
View File

@ -3,7 +3,7 @@
Network input dispatcher... */ Network input dispatcher... */
/* /*
* Copyright (c) 1995-2000 Internet Software Consortium. * Copyright (c) 1995-2001 Internet Software Consortium.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -43,7 +43,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: dispatch.c,v 1.62 2000/05/16 23:02:14 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n"; "$Id: dispatch.c,v 1.63 2001/02/12 19:41:30 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@ -53,6 +53,42 @@ static struct timeout *free_timeouts;
int interfaces_invalidated; int interfaces_invalidated;
void set_time (u_int32_t t)
{
/* Do any outstanding timeouts. */
if (cur_time != t) {
cur_time = t;
process_outstanding_timeouts ((struct timeval *)0);
}
}
struct timeval *process_outstanding_timeouts (struct timeval *tvp)
{
/* Call any expired timeouts, and then if there's
still a timeout registered, time out the select
call then. */
another:
if (timeouts) {
struct timeout *t;
if (timeouts -> when <= cur_time) {
t = timeouts;
timeouts = timeouts -> next;
(*(t -> func)) (t -> what);
if (t -> unref)
(*t -> unref) (&t -> what, MDL);
t -> next = free_timeouts;
free_timeouts = t;
goto another;
}
if (tvp) {
tvp -> tv_sec = timeouts -> when;
tvp -> tv_usec = 0;
}
return tvp;
} else
return (struct timeval *)0;
}
/* Wait for packets to come in using select(). When one does, call /* Wait for packets to come in using select(). When one does, call
receive_packet to receive the packet and possibly strip hardware receive_packet to receive the packet and possibly strip hardware
addressing information from it, and then call through the addressing information from it, and then call through the
@ -60,37 +96,12 @@ int interfaces_invalidated;
void dispatch () void dispatch ()
{ {
fd_set r, w, x;
struct protocol *l;
int max = 0;
int count;
struct timeval tv, *tvp; struct timeval tv, *tvp;
isc_result_t status; isc_result_t status;
/* Wait for a packet or a timeout... XXX */
do { do {
/* Call any expired timeouts, and then if there's tvp = process_outstanding_timeouts (&tv);
still a timeout registered, time out the select
call then. */
another:
if (timeouts) {
struct timeout *t;
if (timeouts -> when <= cur_time) {
t = timeouts;
timeouts = timeouts -> next;
(*(t -> func)) (t -> what);
if (t -> unref)
(*t -> unref) (&t -> what, MDL);
t -> next = free_timeouts;
free_timeouts = t;
goto another;
}
tv.tv_sec = timeouts -> when;
tv.tv_usec = 0;
tvp = &tv;
} else
tvp = (struct timeval *)0;
/* Wait for a packet or a timeout... XXX */
status = omapi_one_dispatch (0, tvp); status = omapi_one_dispatch (0, tvp);
} while (status == ISC_R_TIMEDOUT || status == ISC_R_SUCCESS); } while (status == ISC_R_TIMEDOUT || status == ISC_R_SUCCESS);
log_fatal ("omapi_one_dispatch failed: %s -- exiting.", log_fatal ("omapi_one_dispatch failed: %s -- exiting.",