f4768038f0
Struct bundle will have its own struct ccp in the future too. o The ``set stopped'' command now requires context and doesn't work on the IPCP FSM. o Check if it's time to break out of our top level loop before doing a select - otherwise, we'll select forever :-( o Remove `struct link'::ccp (a temporary hack). It turns out that IpStartOutput() calls link_Output() and link_Output() incorrectly calls StartOutput() (really modem_StartOutput) requiring the ccp knowledge so that it can call IpStartOutput()... The end result is that the whole IP output queue gets dumped into the modem output queue and a pile of physical writes are done prematurely. This makes the (original) code in main() actually work in that it would not bother selecting() on the tun descriptor when our modem queue length was 20 or greater. Instead, we now make that decision based on the overall queue length. This will need improvement later.
228 lines
4.9 KiB
C
228 lines
4.9 KiB
C
/*
|
|
* Written by Eivind Eklund <eivind@yes.no>
|
|
* for Yes Interactive
|
|
*
|
|
* Copyright (C) 1998, Yes Interactive. All rights reserved.
|
|
*
|
|
* Redistribution and use in any form is permitted. Redistribution in
|
|
* source form should include the above copyright and this set of
|
|
* conditions, because large sections american law seems to have been
|
|
* created by a bunch of jerks on drugs that are now illegal, forcing
|
|
* me to include this copyright-stuff instead of placing this in the
|
|
* public domain. The name of of 'Yes Interactive' or 'Eivind Eklund'
|
|
* 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: physical.c,v 1.1.2.11 1998/02/18 19:35:53 brian Exp $
|
|
*
|
|
*/
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/tty.h>
|
|
#include <sys/uio.h>
|
|
|
|
#include <assert.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
|
|
/* XXX Name space pollution from vars.h */
|
|
#include <netinet/in.h>
|
|
#include <alias.h>
|
|
#include "defs.h"
|
|
#include "command.h"
|
|
#include "loadalias.h"
|
|
|
|
/* XXX Name space pollution from hdlc.h */
|
|
#include "mbuf.h"
|
|
|
|
/* Name space pollution for physical.h */
|
|
#include "timer.h"
|
|
#include "hdlc.h"
|
|
#include "throughput.h"
|
|
#include "fsm.h"
|
|
#include "lcp.h"
|
|
#include "async.h"
|
|
#include "link.h"
|
|
|
|
#include "descriptor.h"
|
|
#include "physical.h"
|
|
|
|
#include "vars.h"
|
|
#include "bundle.h"
|
|
#include "log.h"
|
|
|
|
/* External calls - should possibly be moved inline */
|
|
extern int IntToSpeed(int);
|
|
|
|
|
|
int
|
|
Physical_GetFD(struct physical *phys) {
|
|
return phys->fd;
|
|
}
|
|
|
|
int
|
|
Physical_IsATTY(struct physical *phys) {
|
|
return isatty(phys->fd);
|
|
}
|
|
|
|
int
|
|
Physical_IsSync(struct physical *phys) {
|
|
return phys->cfg.speed == 0;
|
|
}
|
|
|
|
int
|
|
Physical_FD_ISSET(struct physical *phys, fd_set *set) {
|
|
return phys->fd >= 0 && FD_ISSET(phys->fd, set);
|
|
}
|
|
|
|
void
|
|
Physical_FD_SET(struct physical *phys, fd_set *set) {
|
|
assert(phys->fd >= 0);
|
|
FD_SET(phys->fd, set);
|
|
}
|
|
|
|
|
|
/* XXX-ML - must be moved into the physical struct */
|
|
const char *Physical_GetDevice(struct physical *phys) {
|
|
return VarDevice;
|
|
}
|
|
|
|
/* XXX-ML - must be moved into the physical struct */
|
|
void
|
|
Physical_SetDevice(struct physical *phys, const char *new_device_list) {
|
|
strncpy(VarDeviceList, new_device_list, sizeof VarDeviceList - 1);
|
|
VarDeviceList[sizeof VarDeviceList - 1] = '\0';
|
|
}
|
|
|
|
|
|
int
|
|
Physical_SetSpeed(struct physical *phys, int speed) {
|
|
if (IntToSpeed(speed) != B0) {
|
|
phys->cfg.speed = speed;
|
|
return 1;
|
|
} else {
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
void
|
|
Physical_SetSync(struct physical *phys) {
|
|
phys->cfg.speed = 0;
|
|
}
|
|
|
|
|
|
int
|
|
Physical_SetRtsCts(struct physical *phys, int enable) {
|
|
assert(enable == 0 || enable == 1);
|
|
|
|
phys->cfg.rts_cts = enable;
|
|
return 1;
|
|
}
|
|
|
|
void
|
|
Physical_SetDedicated(struct physical *phys, int enable) {
|
|
assert(enable == 0 || enable == 1);
|
|
|
|
phys->cfg.is_dedicated = enable;
|
|
}
|
|
|
|
void
|
|
Physical_SetDirect(struct physical *phys, int enable) {
|
|
assert(enable == 0 || enable == 1);
|
|
|
|
phys->cfg.is_direct = enable;
|
|
}
|
|
|
|
int
|
|
Physical_IsDirect(struct physical *phys) {
|
|
return phys->cfg.is_direct;
|
|
}
|
|
|
|
int
|
|
Physical_IsDedicated(struct physical *phys) {
|
|
return phys->cfg.is_dedicated;
|
|
}
|
|
|
|
|
|
void
|
|
Physical_DupAndClose(struct physical *phys) {
|
|
int nmodem;
|
|
|
|
nmodem = dup(phys->fd);
|
|
close(phys->fd);
|
|
phys->fd = nmodem;
|
|
}
|
|
|
|
/* Encapsulation for a read on the FD. Avoids some exposure, and
|
|
concentrates control. */
|
|
ssize_t
|
|
Physical_Read(struct physical *phys, void *buf, size_t nbytes) {
|
|
return read(phys->fd, buf, nbytes);
|
|
}
|
|
|
|
ssize_t
|
|
Physical_Write(struct physical *phys, const void *buf, size_t nbytes) {
|
|
return write(phys->fd, buf, nbytes);
|
|
}
|
|
|
|
int
|
|
Physical_ReportProtocolStatus(struct cmdargs const *arg)
|
|
{
|
|
link_ReportProtocolStatus(bundle2link(arg->bundle, NULL));
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
Physical_UpdateSet(struct descriptor *d, fd_set *r, fd_set *w, fd_set *e,
|
|
int *n, int force)
|
|
{
|
|
struct physical *p = descriptor2physical(d);
|
|
int sets;
|
|
|
|
LogPrintf(LogDEBUG, "descriptor2physical; %p -> %p\n", d, p);
|
|
|
|
sets = 0;
|
|
if (p->fd >= 0) {
|
|
if (r) {
|
|
FD_SET(p->fd, r);
|
|
sets++;
|
|
}
|
|
if (e) {
|
|
FD_SET(p->fd, e);
|
|
sets++;
|
|
}
|
|
if (w && (force || link_QueueLen(&p->link))) {
|
|
FD_SET(p->fd, w);
|
|
sets++;
|
|
}
|
|
if (sets && *n < p->fd + 1)
|
|
*n = p->fd + 1;
|
|
}
|
|
|
|
return sets;
|
|
}
|
|
|
|
int
|
|
Physical_IsSet(struct descriptor *d, fd_set *fdset)
|
|
{
|
|
struct physical *p = descriptor2physical(d);
|
|
|
|
LogPrintf(LogDEBUG, "descriptor2physical; %p -> %p\n", d, p);
|
|
return p->fd >= 0 && FD_ISSET(p->fd, fdset);
|
|
}
|
|
|
|
void
|
|
Physical_DescriptorWrite(struct descriptor *d, struct bundle *bundle,
|
|
const fd_set *fdset)
|
|
{
|
|
struct physical *p = descriptor2physical(d);
|
|
|
|
LogPrintf(LogDEBUG, "descriptor2physical; %p -> %p\n", d, p);
|
|
link_StartOutput(&p->link, bundle);
|
|
}
|