89ce3ea906
being the same as the previous (still supported) ``host:port'' syntax for tcp socket devices. A udp device uses synchronous ppp rather than async, and avoids the double-retransmit overhead that comes with ppp over tcp (it's usually a bad idea to transport IP over a reliable transport that itself is using an unreliable transport). PPP over UDP provides througput of ** 1.5Mb per second ** with all compression disabled, maxing out a PPro/200 when running ppp twice, back-to-back. This proves that PPPoE is plausable in userland.... This change adds a few more handler functions to struct device and allows derivations of struct device (which may contain their own data etc) to pass themselves through the unix domain socket for MP. ** At last **, struct physical has lost all the tty crud ! iov2physical() is now smart enough to restore the correct stack of layers so that MP servers will work again. The version number has bumped as our MP link transfer contents have changed (they now may contain a `struct device'). Don't extract the protocol twice in MP mode (resulting in protocol rejects for every MP packet). This was broken with my original layering changes. Add ``Physical'' and ``Sync'' log levels for logging the relevent raw packets and add protocol-tracking LogDEBUG stuff in various LayerPush & LayerPull functions. Assign our physical device name for incoming tcp connections by calling getpeername(). Assign our physical device name for incoming udp connections from the address retrieved by the first recvfrom().
270 lines
7.0 KiB
C
270 lines
7.0 KiB
C
/*-
|
|
* Copyright (c) 1999 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: tcp.c,v 1.1 1999/05/08 11:07:45 brian Exp $
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <netdb.h>
|
|
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/uio.h>
|
|
#include <termios.h>
|
|
#include <unistd.h>
|
|
|
|
#include "layer.h"
|
|
#include "defs.h"
|
|
#include "mbuf.h"
|
|
#include "log.h"
|
|
#include "sync.h"
|
|
#include "timer.h"
|
|
#include "lqr.h"
|
|
#include "hdlc.h"
|
|
#include "throughput.h"
|
|
#include "fsm.h"
|
|
#include "lcp.h"
|
|
#include "ccp.h"
|
|
#include "link.h"
|
|
#include "async.h"
|
|
#include "descriptor.h"
|
|
#include "physical.h"
|
|
#include "udp.h"
|
|
|
|
struct udpdevice {
|
|
struct device dev; /* What struct physical knows about */
|
|
struct sockaddr_in sock; /* peer address */
|
|
unsigned connected : 1; /* Have we connect()d ? */
|
|
};
|
|
|
|
#define device2udp(d) ((d)->type == UDP_DEVICE ? (struct udpdevice *)d : NULL)
|
|
|
|
static ssize_t
|
|
udp_Sendto(struct physical *p, const void *v, size_t n)
|
|
{
|
|
struct udpdevice *dev = device2udp(p->handler);
|
|
|
|
if (dev->connected)
|
|
return write(p->fd, v, n);
|
|
|
|
return sendto(p->fd, v, n, 0, (struct sockaddr *)&dev->sock,
|
|
sizeof dev->sock);
|
|
}
|
|
|
|
static ssize_t
|
|
udp_Recvfrom(struct physical *p, void *v, size_t n)
|
|
{
|
|
struct udpdevice *dev = device2udp(p->handler);
|
|
int sz, ret;
|
|
|
|
if (dev->connected)
|
|
return read(p->fd, v, n);
|
|
|
|
sz = sizeof dev->sock;
|
|
ret = recvfrom(p->fd, v, n, 0, (struct sockaddr *)&dev->sock, &sz);
|
|
|
|
if (*p->name.full == '\0') {
|
|
snprintf(p->name.full, sizeof p->name.full, "%s:%d/udp",
|
|
inet_ntoa(dev->sock.sin_addr), ntohs(dev->sock.sin_port));
|
|
p->name.base = p->name.full;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void
|
|
udp_Free(struct physical *p)
|
|
{
|
|
struct udpdevice *dev = device2udp(p->handler);
|
|
|
|
free(dev);
|
|
}
|
|
|
|
static void
|
|
udp_device2iov(struct physical *p, struct iovec *iov, int *niov,
|
|
int maxiov, pid_t newpid)
|
|
{
|
|
iov[*niov].iov_base = p ? p->handler : malloc(sizeof(struct udpdevice));
|
|
iov[*niov].iov_len = sizeof(struct udpdevice);
|
|
(*niov)++;
|
|
}
|
|
|
|
static const struct device baseudpdevice = {
|
|
UDP_DEVICE,
|
|
"udp",
|
|
NULL,
|
|
NULL,
|
|
NULL,
|
|
NULL,
|
|
udp_Free,
|
|
udp_Recvfrom,
|
|
udp_Sendto,
|
|
udp_device2iov,
|
|
NULL,
|
|
NULL
|
|
};
|
|
|
|
struct device *
|
|
udp_iov2device(int type, struct physical *p, struct iovec *iov, int *niov,
|
|
int maxiov)
|
|
{
|
|
struct device *dev;
|
|
|
|
if (type == UDP_DEVICE) {
|
|
/* It's one of ours ! Let's create the device */
|
|
|
|
dev = (struct device *)iov[(*niov)++].iov_base;
|
|
/* Refresh function pointers etc */
|
|
memcpy(dev, &baseudpdevice, sizeof *dev);
|
|
/* Remember, there's really more than (sizeof *dev) there */
|
|
|
|
physical_SetupStack(p, PHYSICAL_FORCE_SYNC);
|
|
} else
|
|
dev = NULL;
|
|
|
|
return dev;
|
|
}
|
|
|
|
static struct udpdevice *
|
|
udp_CreateDevice(struct physical *p, char *host, char *port)
|
|
{
|
|
struct udpdevice *dev;
|
|
struct servent *sp;
|
|
|
|
if ((dev = malloc(sizeof *dev)) == NULL) {
|
|
log_Printf(LogWARN, "%s: Cannot allocate a udp device: %s\n",
|
|
p->link.name, strerror(errno));
|
|
return NULL;
|
|
}
|
|
|
|
dev->sock.sin_family = AF_INET;
|
|
dev->sock.sin_addr.s_addr = inet_addr(host);
|
|
dev->sock.sin_addr = GetIpAddr(host);
|
|
if (dev->sock.sin_addr.s_addr == INADDR_NONE) {
|
|
log_Printf(LogWARN, "%s: %s: unknown host\n", p->link.name, host);
|
|
free(dev);
|
|
return NULL;
|
|
}
|
|
dev->sock.sin_port = htons(atoi(port));
|
|
if (dev->sock.sin_port == 0) {
|
|
sp = getservbyname(port, "udp");
|
|
if (sp)
|
|
dev->sock.sin_port = sp->s_port;
|
|
else {
|
|
log_Printf(LogWARN, "%s: %s: unknown service\n", p->link.name, port);
|
|
free(dev);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
log_Printf(LogPHASE, "%s: Connecting to %s:%s/udp\n", p->link.name,
|
|
host, port);
|
|
|
|
p->fd = socket(PF_INET, SOCK_DGRAM, 0);
|
|
if (p->fd >= 0) {
|
|
log_Printf(LogDEBUG, "%s: Opened udp socket %s\n", p->link.name,
|
|
p->name.full);
|
|
if (connect(p->fd, (struct sockaddr *)&dev->sock, sizeof dev->sock) == 0) {
|
|
dev->connected = 1;
|
|
return dev;
|
|
} else
|
|
log_Printf(LogWARN, "%s: connect: %s\n", p->name.full, strerror(errno));
|
|
} else
|
|
log_Printf(LogWARN, "%s: socket: %s\n", p->name.full, strerror(errno));
|
|
|
|
close(p->fd);
|
|
p->fd = -1;
|
|
free(dev);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
struct device *
|
|
udp_Create(struct physical *p)
|
|
{
|
|
char *cp, *host, *port, *svc;
|
|
struct udpdevice *dev;
|
|
|
|
dev = NULL;
|
|
if (p->fd < 0) {
|
|
if ((cp = strchr(p->name.full, ':')) != NULL) {
|
|
*cp = '\0';
|
|
host = p->name.full;
|
|
port = cp + 1;
|
|
svc = strchr(port, '/');
|
|
if (svc && strcasecmp(svc, "/udp")) {
|
|
*cp = ':';
|
|
return NULL;
|
|
}
|
|
if (svc)
|
|
*svc = '\0';
|
|
|
|
if (*host && *port)
|
|
dev = udp_CreateDevice(p, host, port);
|
|
|
|
*cp = ':';
|
|
if (svc)
|
|
*svc = '/';
|
|
}
|
|
} else {
|
|
/* See if we're a connected udp socket */
|
|
int type, sz, err;
|
|
|
|
sz = sizeof type;
|
|
if ((err = getsockopt(p->fd, SOL_SOCKET, SO_TYPE, &type, &sz)) == 0 &&
|
|
sz == sizeof type && type == SOCK_DGRAM) {
|
|
if ((dev = malloc(sizeof *dev)) == NULL) {
|
|
log_Printf(LogWARN, "%s: Cannot allocate a udp device: %s\n",
|
|
p->link.name, strerror(errno));
|
|
return NULL;
|
|
}
|
|
|
|
/* We can't getpeername().... hence we stay un-connect()ed */
|
|
dev->connected = 0;
|
|
|
|
log_Printf(LogPHASE, "%s: Link is a udp socket\n", p->link.name);
|
|
|
|
if (p->link.lcp.cfg.openmode != OPEN_PASSIVE) {
|
|
log_Printf(LogPHASE, "%s: Changing openmode to PASSIVE\n",
|
|
p->link.name);
|
|
p->link.lcp.cfg.openmode = OPEN_PASSIVE;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (dev) {
|
|
memcpy(&dev->dev, &baseudpdevice, sizeof dev->dev);
|
|
physical_SetupStack(p, PHYSICAL_FORCE_SYNC);
|
|
return &dev->dev;
|
|
}
|
|
|
|
return NULL;
|
|
}
|