3b0f8d2ed6
o Remove bundle2lcp(), bundle2ccp() and bundle2link(). They're too resource-hungry and we have `owner pointers' to do their job. o Make our FSM understand LCPs that are always ST_OPENED (with a minimum code that != 1). o Send FSM code rejects for invalid codes. o Make our bundle fsm_parent deal with multiple links. o Make timer diagnostics pretty and allow access via ~t in `term' mode (not just when logging debug) and `show timers'. Only show timers every second in debug mode, otherwise we get too many diagnostics to be useful (we probably still do). Also, don't restrict ~m in term mode to depend on debug logging. o Rationalise our bundles' phases. o Create struct mp (multilink protocol). This is both an NCP and a type of struct link. It feeds off other NCPs for output, passing fragmented packets into the queues of available datalinks. It also gets PROTO_MP input, reassembles the fragments into ppp frames, and passes them back to the HDLC layer that the fragments were passed from. ** It's not yet possible to enter multilink mode :-( ** o Add `set weight' (requires context) for deciding on a links weighting in multilink mode. Weighting is simplistic (and probably badly implemented) for now. o Remove the function pointers in struct link. They ended up only applying to physical links. o Configure our tun device with an MTU equal to the MRU from struct mp's LCP and a speed equal to the sum of our link speeds. o `show {lcp,ccp,proto}' and `set deflate' now have optional context and use ChooseLink() to decide on which `struct link' to use. This allows behaviour as before when in non-multilink mode, and allows access to the MP logical link in multilink mode. o Ignore reconnect and redial values when in -direct mode and when cleaning up. Always redial when in -ddial or -dedicated mode (unless cleaning up). o Tell our links to `staydown' when we close them due to a signal. o Remove remaining `#ifdef SIGALRM's (ppp doesn't function without alarms). o Don't bother strdup()ing our physical link name. o Various other cosmetic changes.
309 lines
7.2 KiB
C
309 lines
7.2 KiB
C
/*
|
|
* PPP Timer Processing Module
|
|
*
|
|
* Written by Toshiharu OHNO (tony-o@iij.ad.jp)
|
|
*
|
|
* Copyright (C) 1993, Internet Initiative Japan, Inc. All rights reserverd.
|
|
*
|
|
* Redistribution and use in source and binary forms are permitted
|
|
* provided that the above copyright notice and this paragraph are
|
|
* duplicated in all such forms and that any documentation,
|
|
* advertising materials, and other materials related to such
|
|
* distribution and use acknowledge that the software was developed
|
|
* by the Internet Initiative Japan, Inc. The name of the
|
|
* IIJ may not be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
*
|
|
* $Id: timer.c,v 1.27 1998/01/21 02:15:29 brian Exp $
|
|
*
|
|
* TODO:
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <signal.h>
|
|
#include <stdio.h>
|
|
#include <sys/time.h>
|
|
#include <termios.h>
|
|
#include <unistd.h>
|
|
|
|
#include "command.h"
|
|
#include "mbuf.h"
|
|
#include "log.h"
|
|
#include "sig.h"
|
|
#include "timer.h"
|
|
#include "descriptor.h"
|
|
#include "prompt.h"
|
|
|
|
static struct pppTimer *TimerList = NULL;
|
|
|
|
static void StopTimerNoBlock(struct pppTimer *);
|
|
static void InitTimerService(void);
|
|
|
|
static const char *
|
|
tState2Nam(u_int state)
|
|
{
|
|
static const char *StateNames[] = { "stopped", "running", "expired" };
|
|
|
|
if (state >= sizeof StateNames / sizeof StateNames[0])
|
|
return "unknown";
|
|
return StateNames[state];
|
|
}
|
|
|
|
void
|
|
StopTimer(struct pppTimer * tp)
|
|
{
|
|
int omask;
|
|
|
|
omask = sigblock(sigmask(SIGALRM));
|
|
StopTimerNoBlock(tp);
|
|
sigsetmask(omask);
|
|
}
|
|
|
|
void
|
|
StartTimer(struct pppTimer * tp)
|
|
{
|
|
struct pppTimer *t, *pt;
|
|
u_long ticks = 0;
|
|
int omask;
|
|
|
|
omask = sigblock(sigmask(SIGALRM));
|
|
|
|
if (tp->state != TIMER_STOPPED) {
|
|
StopTimerNoBlock(tp);
|
|
}
|
|
if (tp->load == 0) {
|
|
LogPrintf(LogDEBUG, "%s timer[%p] has 0 load!\n", tp->name, tp);
|
|
sigsetmask(omask);
|
|
return;
|
|
}
|
|
pt = NULL;
|
|
for (t = TimerList; t; t = t->next) {
|
|
if (ticks + t->rest >= tp->load)
|
|
break;
|
|
ticks += t->rest;
|
|
pt = t;
|
|
}
|
|
|
|
tp->state = TIMER_RUNNING;
|
|
tp->rest = tp->load - ticks;
|
|
|
|
if (t)
|
|
LogPrintf(LogDEBUG, "StartTimer: Inserting %s timer[%p] before %s "
|
|
"timer[%p], delta = %d\n", tp->name, tp, t->name, t, tp->rest);
|
|
else
|
|
LogPrintf(LogDEBUG, "StartTimer: Inserting %s timer[%p]\n", tp->name, tp);
|
|
|
|
/* Insert given *tp just before *t */
|
|
tp->next = t;
|
|
if (pt) {
|
|
pt->next = tp;
|
|
} else {
|
|
InitTimerService();
|
|
TimerList = tp;
|
|
}
|
|
if (t)
|
|
t->rest -= tp->rest;
|
|
|
|
sigsetmask(omask);
|
|
}
|
|
|
|
static void
|
|
StopTimerNoBlock(struct pppTimer * tp)
|
|
{
|
|
struct pppTimer *t, *pt;
|
|
|
|
/*
|
|
* A Running Timer should be removing TimerList, But STOPPED/EXPIRED is
|
|
* already removing TimerList. So just marked as TIMER_STOPPED. Do not
|
|
* change tp->enext!! (Might be Called by expired proc)
|
|
*/
|
|
if (tp->state != TIMER_RUNNING) {
|
|
tp->next = NULL;
|
|
tp->state = TIMER_STOPPED;
|
|
return;
|
|
}
|
|
pt = NULL;
|
|
for (t = TimerList; t != tp && t != NULL; t = t->next)
|
|
pt = t;
|
|
if (t) {
|
|
if (pt) {
|
|
pt->next = t->next;
|
|
} else {
|
|
TimerList = t->next;
|
|
if (TimerList == NULL) /* Last one ? */
|
|
TermTimerService(); /* Terminate Timer Service */
|
|
}
|
|
if (t->next)
|
|
t->next->rest += tp->rest;
|
|
} else
|
|
LogPrintf(LogERROR, "Oops, timer not found!!\n");
|
|
|
|
tp->next = NULL;
|
|
tp->state = TIMER_STOPPED;
|
|
}
|
|
|
|
static void
|
|
TimerService()
|
|
{
|
|
struct pppTimer *tp, *exp, *wt;
|
|
|
|
if (LogIsKept(LogDEBUG)) {
|
|
static time_t t;
|
|
time_t n = time(NULL); /* Only show timers every second */
|
|
|
|
if (n > t)
|
|
ShowTimers(LogDEBUG);
|
|
t = n;
|
|
}
|
|
tp = TimerList;
|
|
if (tp) {
|
|
tp->rest--;
|
|
if (tp->rest == 0) {
|
|
|
|
/*
|
|
* Multiple timers may expires at once. Create list of expired timers.
|
|
*/
|
|
exp = NULL;
|
|
do {
|
|
tp->state = TIMER_EXPIRED;
|
|
wt = tp->next;
|
|
tp->enext = exp;
|
|
exp = tp;
|
|
tp = wt;
|
|
} while (tp && (tp->rest == 0));
|
|
|
|
TimerList = tp;
|
|
if (TimerList == NULL) /* No timers ? */
|
|
TermTimerService(); /* Terminate Timer Service */
|
|
|
|
/*
|
|
* Process all expired timers.
|
|
*/
|
|
while (exp) {
|
|
#ifdef notdef
|
|
StopTimer(exp);
|
|
#endif
|
|
if (exp->func)
|
|
(*exp->func) (exp->arg);
|
|
|
|
/*
|
|
* Just Removing each item from expired list And exp->enext will be
|
|
* intialized at next expire in this funtion.
|
|
*/
|
|
exp = exp->enext;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
ShowTimers(int LogLevel)
|
|
{
|
|
struct pppTimer *pt;
|
|
int rest = 0;
|
|
|
|
#define SECS(val) ((val) / SECTICKS)
|
|
#define HSECS(val) (((val) % SECTICKS) * 100 / SECTICKS)
|
|
#define DISP \
|
|
"%s timer[%p]: freq = %d.%02ds, next = %d.%02ds, state = %s\n", \
|
|
pt->name, pt, SECS(pt->load), HSECS(pt->load), SECS(rest), \
|
|
HSECS(rest), tState2Nam(pt->state)
|
|
|
|
if (LogIsKept(LogLevel))
|
|
LogPrintf(LogLevel, "---- Begin of Timer Service List---\n");
|
|
|
|
for (pt = TimerList; pt; pt = pt->next) {
|
|
rest += pt->rest;
|
|
if (LogIsKept(LogLevel))
|
|
LogPrintf(LogLevel, DISP);
|
|
else if (LogLevel < LogMIN)
|
|
prompt_Printf(&prompt, DISP);
|
|
}
|
|
|
|
if (LogIsKept(LogLevel))
|
|
LogPrintf(LogLevel, "---- End of Timer Service List ---\n");
|
|
}
|
|
|
|
static void
|
|
nointr_dosleep(u_int sec, u_int usec)
|
|
{
|
|
struct timeval to, st, et;
|
|
|
|
gettimeofday(&st, NULL);
|
|
et.tv_sec = st.tv_sec + sec;
|
|
et.tv_usec = st.tv_usec + usec;
|
|
to.tv_sec = sec;
|
|
to.tv_usec = usec;
|
|
for (;;) {
|
|
if (select(0, NULL, NULL, NULL, &to) == 0 ||
|
|
errno != EINTR) {
|
|
break;
|
|
} else {
|
|
gettimeofday(&to, NULL);
|
|
if (to.tv_sec > et.tv_sec + 1 ||
|
|
(to.tv_sec == et.tv_sec + 1 && to.tv_usec > et.tv_usec) ||
|
|
to.tv_sec < st.tv_sec ||
|
|
(to.tv_sec == st.tv_sec && to.tv_usec < st.tv_usec)) {
|
|
LogPrintf(LogWARN, "Clock adjusted between %d and %d seconds "
|
|
"during sleep !\n",
|
|
to.tv_sec - st.tv_sec, sec + to.tv_sec - st.tv_sec);
|
|
st.tv_sec = to.tv_sec;
|
|
st.tv_usec = to.tv_usec;
|
|
et.tv_sec = st.tv_sec + sec;
|
|
et.tv_usec = st.tv_usec + usec;
|
|
to.tv_sec = sec;
|
|
to.tv_usec = usec;
|
|
} else if (to.tv_sec > et.tv_sec ||
|
|
(to.tv_sec == et.tv_sec && to.tv_usec >= et.tv_usec)) {
|
|
break;
|
|
} else {
|
|
to.tv_sec = et.tv_sec - to.tv_sec;
|
|
if (et.tv_usec < to.tv_usec) {
|
|
to.tv_sec--;
|
|
to.tv_usec = 1000000 + et.tv_usec - to.tv_usec;
|
|
} else
|
|
to.tv_usec = et.tv_usec - to.tv_usec;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
nointr_sleep(u_int sec)
|
|
{
|
|
nointr_dosleep(sec, 0);
|
|
}
|
|
|
|
void
|
|
nointr_usleep(u_int usec)
|
|
{
|
|
nointr_dosleep(0, usec);
|
|
}
|
|
|
|
static void
|
|
InitTimerService()
|
|
{
|
|
struct itimerval itimer;
|
|
|
|
pending_signal(SIGALRM, (void (*) (int)) TimerService);
|
|
itimer.it_interval.tv_sec = itimer.it_value.tv_sec = 0;
|
|
itimer.it_interval.tv_usec = itimer.it_value.tv_usec = TICKUNIT;
|
|
if (setitimer(ITIMER_REAL, &itimer, NULL) == -1)
|
|
LogPrintf(LogERROR, "Unable to set itimer.\n");
|
|
}
|
|
|
|
void
|
|
TermTimerService(void)
|
|
{
|
|
struct itimerval itimer;
|
|
|
|
itimer.it_interval.tv_usec = itimer.it_interval.tv_sec = 0;
|
|
itimer.it_value.tv_usec = itimer.it_value.tv_sec = 0;
|
|
if (setitimer(ITIMER_REAL, &itimer, NULL) == -1)
|
|
LogPrintf(LogERROR, "Unable to set itimer.\n");
|
|
pending_signal(SIGALRM, SIG_IGN);
|
|
}
|