ab2de065b2
o If we're using RADIUS and the RADIUS mtu is less than our peers mru/mrru, reduce our mtu to this value for NetBSD too. o Make struct throughput's sample period dynamic and tweak the ppp version number to reflect the extra stuff being passed through the local domain socket as a result (MP mode). o Measure the current throughput based on the number of samples actually taken rather than on the full sample period. o Keep the throughput statisics persistent while being passed to another ppp invocation through the local domain socket. o When showing throughput statistics after the timer has stopped, use the stopped time for overall calculations, not the current time. Also show the stopped time and how long the current throughput has been sampled for. o Use time() consistently in throughput.c o Tighten up the ``show bundle'' output. o Introduce the ``set bandwidth'' command. o Rewrite the ``set autoload'' command. It now takes three arguments and works based on a rolling bundle throughput average compared against the theoretical bundle bandwidth over a given period (read: it's now functional).
67 lines
2.8 KiB
C
67 lines
2.8 KiB
C
/*-
|
|
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $Id: throughput.h,v 1.6 1999/05/08 11:07:49 brian Exp $
|
|
*/
|
|
|
|
#define SAMPLE_PERIOD 5 /* Default sample period */
|
|
|
|
#define THROUGHPUT_OVERALL 0x0001
|
|
#define THROUGHPUT_CURRENT 0x0002
|
|
#define THROUGHPUT_PEAK 0x0004
|
|
#define THROUGHPUT_ALL 0x0007
|
|
|
|
struct pppThroughput {
|
|
time_t uptime, downtime;
|
|
unsigned long long OctetsIn;
|
|
unsigned long long OctetsOut;
|
|
int SamplePeriod;
|
|
unsigned long long *SampleOctets;
|
|
unsigned long long OctetsPerSecond;
|
|
unsigned long long BestOctetsPerSecond;
|
|
time_t BestOctetsPerSecondTime;
|
|
int nSample;
|
|
unsigned rolling : 1;
|
|
struct pppTimer Timer;
|
|
struct {
|
|
void *data;
|
|
void (*fn)(void *v);
|
|
} callback;
|
|
};
|
|
|
|
extern void throughput_init(struct pppThroughput *, int);
|
|
extern void throughput_destroy(struct pppThroughput *);
|
|
extern void throughput_disp(struct pppThroughput *, struct prompt *);
|
|
extern void throughput_log(struct pppThroughput *, int, const char *);
|
|
extern void throughput_start(struct pppThroughput *, const char *, int);
|
|
extern void throughput_restart(struct pppThroughput *, const char *, int);
|
|
extern void throughput_stop(struct pppThroughput *);
|
|
extern void throughput_addin(struct pppThroughput *, long long);
|
|
extern void throughput_addout(struct pppThroughput *, long long);
|
|
extern void throughput_clear(struct pppThroughput *, int, struct prompt *);
|
|
extern void throughput_callback(struct pppThroughput *, void (*)(void *),
|
|
void *);
|
|
extern int throughput_uptime(struct pppThroughput *);
|