d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8fa348db2e
freebsd-skq/usr.sbin/ppp/bundle.h

193 lines
7.1 KiB
C
Raw Normal View History

MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
/*-
* Copyright (c) 1998 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$ -> $FreeBSD$
1999-08-28 01:35:59 +00:00
* $FreeBSD$
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
*/
#define PHASE_DEAD 0 /* Link is dead */
#define PHASE_ESTABLISH 1 /* Establishing link */
#define PHASE_AUTHENTICATE 2 /* Being authenticated */
#define PHASE_NETWORK 3 /* We're alive ! */
#define PHASE_TERMINATE 4 /* Terminating link */
/* cfg.opt bit settings */
Add ``enable proxyall'' support. This adds proxy ARP entries for every machine on every class C or smaller subnet that we route to. Add ``set {send,recv}pipe'' for controlling our socket buffer sizes. Mention the IP number with the problem in a few error messages. All submitted by: Craig Leres <leres@ee.lbl.gov> Modified slightly by: me
1998-10-26 19:07:39 +00:00
#define OPT_IDCHECK 0x0001
Shuffle the iface-alias option so that's in alphabetical order like the rest of the options.
1998-10-26 19:07:42 +00:00
#define OPT_IFACEALIAS 0x0002
Introduce the ``keep-session'' option. Refer to the man page for details. This allows MP over non-tty devices where the original ppp process must not exit (such as sshd-spawned ppp sessions).
1999-06-02 00:46:55 +00:00
#define OPT_KEEPSESSION 0x0004
#define OPT_LOOPBACK 0x0008
#define OPT_PASSWDAUTH 0x0010
#define OPT_PROXY 0x0020
#define OPT_PROXYALL 0x0040
#define OPT_SROUTES 0x0080
#define OPT_THROUGHPUT 0x0100
#define OPT_UTMP 0x0200
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
#define MAX_ENDDISC_CLASS 5
#define Enabled(b, o) ((b)->cfg.opt & (o))
o Obsolete the undocumented ``set weight'' command. 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).
1999-08-05 10:32:16 +00:00
/* AutoAdjust() values */
#define AUTO_UP 1
#define AUTO_DOWN 2
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
struct sockaddr_un;
struct datalink;
struct physical;
struct link;
struct server;
struct prompt;
Solve the ``first connection'' problem that occurs on demand-dial links with dynamic IP numbers where the program that causes the dial bind()s to an interface address that is subsequently changed after ppp negotiation. The problem is defeated by adding negotiated addresses to the tun interface as additional alias addresses and providing a set of ``iface'' commands for managing the interface. Libalias is also required (and what a name clash!) - it happily IP-aliases the address so that the source is that of the primary (negotiated) interface and un-IP-aliases it on the way back. An ``enable iface-alias'' is done implicitly by the -alias command line switch. If -alias isn't given, iface-aliasing is disabled by default and can't be enabled 'till an ``alias enable yes'' is done. ``alias enable no'' silently disables iface-alias. So, for dynamic-IP-type-connections, running ``ppp -alias -auto blah'' will work for the first connection, although existing bindings will not survive a disconnect/connect as the TCP peer will be trying to send to the old IP address - the packets won't route. It's now a lot easier to add IPXCP to ppp with minor updates to the new iface.[ch] (if anyone ever gets 'round to it). It's also now possible to manually add interface aliases with something like ``iface add 1.2.3.4/24 5.6.7.8''. This allows multi-homed ppp links :-)
1998-10-22 02:32:50 +00:00
struct iface;
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
struct bundle {
Adjust whitespace
2000-03-14 01:47:11 +00:00
struct fdescriptor desc; /* really all our datalinks */
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
int unit; /* The device/interface unit number */
struct {
char Name[20]; /* The /dev/XXXX name */
Correct some typos introduced in the descriptor -> fdescriptor change.
2000-03-14 01:47:07 +00:00
int fd; /* The /dev/XXXX descriptor */
Handle the availability of TUNSIFHEAD. If it's there, use it. For the moment this is just overhead, but it'll be used for INET6 support later.
2000-01-23 01:48:19 +00:00
unsigned header : 1; /* Family header sent & received ? */
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
} dev;
o Obsolete the undocumented ``set weight'' command. 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).
1999-08-05 10:32:16 +00:00
u_long bandwidth; /* struct tuninfo speed */
Solve the ``first connection'' problem that occurs on demand-dial links with dynamic IP numbers where the program that causes the dial bind()s to an interface address that is subsequently changed after ppp negotiation. The problem is defeated by adding negotiated addresses to the tun interface as additional alias addresses and providing a set of ``iface'' commands for managing the interface. Libalias is also required (and what a name clash!) - it happily IP-aliases the address so that the source is that of the primary (negotiated) interface and un-IP-aliases it on the way back. An ``enable iface-alias'' is done implicitly by the -alias command line switch. If -alias isn't given, iface-aliasing is disabled by default and can't be enabled 'till an ``alias enable yes'' is done. ``alias enable no'' silently disables iface-alias. So, for dynamic-IP-type-connections, running ``ppp -alias -auto blah'' will work for the first connection, although existing bindings will not survive a disconnect/connect as the TCP peer will be trying to send to the old IP address - the packets won't route. It's now a lot easier to add IPXCP to ppp with minor updates to the new iface.[ch] (if anyone ever gets 'round to it). It's also now possible to manually add interface aliases with something like ``iface add 1.2.3.4/24 5.6.7.8''. This allows multi-homed ppp links :-)
1998-10-22 02:32:50 +00:00
struct iface *iface; /* Interface information */
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
int routing_seq; /* The current routing sequence number */
u_int phase; /* Curent phase */
o Maintain a link-type mask for open datalinks as well as for all datalinks in a bundle. Ppp now deals correctly with link types that are changed while open o When changing the type of the last AUTO link, only clear the interface if we're not in PHASE_NETWORK. This allows us to switch to -ddial mode while we have a connection without suddenly unexpectedly throttling ourselves by clearing the interface configuration. Problem area noted by: Aaron Jeremias Luz <aaron@csh.rit.edu>
1998-06-12 17:45:10 +00:00
struct {
int all; /* Union of all physical::type's */
int open; /* Union of all open physical::type's */
} phys_type;
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
unsigned CleaningUp : 1; /* Going to exit.... */
o Add the -foreground switch. This switch behaves like -background except that ppp stays in the foreground. o Add the -quiet switch to quieten ppps startup o Add the -nat flag and discourage the use of the -alias flag. Both do the same thing. o Correct some nat usage strings. o Change the internal ``alias'' command to ``nat''.
1999-08-19 18:15:52 +00:00
unsigned NatEnabled : 1; /* Are we using libalias ? */
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
struct fsm_parent fsm; /* Our callback functions */
struct datalink *links; /* Our data links */
Implement a minimum idle time value as an optional second argument to ``set timeout''. This is useful for situations where your minimum call charge is (say) 5 minutes (like mine is)
1999-08-17 17:22:46 +00:00
time_t upat; /* When the link came up */
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
struct {
Implement a minimum idle time value as an optional second argument to ``set timeout''. This is useful for situations where your minimum call charge is (say) 5 minutes (like mine is)
1999-08-17 17:22:46 +00:00
struct {
int timeout; /* NCP Idle timeout value */
int min_timeout; /* Don't idle out before this */
} idle;
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
struct {
Initial RADIUS support (using libradius). See the man page for details. Compiling with -DNORADIUS (the default for `release') removes support. TODO: The functionality in libradius::rad_send_request() needs to be supplied as a set of routines so that ppp doesn't have to wait indefinitely for the radius server(s). Instead, we need to get a descriptor back, select() on the descriptor, and ask libradius to service it when necessary. For now, ppp blocks SIGALRM while in rad_send_request(), so it misses PAP/CHAP retries & timeouts if they occur. Only PAP is functional. When CHAP is attempted, libradius complains that no User-Password has been specified... rfc2138 says that it *mustn't* be used for CHAP :-( Sponsored by: Internet Business Solutions Ltd., Switzerland
1999-01-28 01:56:34 +00:00
char name[AUTHLEN]; /* PAP/CHAP system name */
char key[AUTHLEN]; /* PAP/CHAP key */
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
} auth;
unsigned opt; /* Uses OPT_ bits from above */
char label[50]; /* last thing `load'ed */
u_short mtu; /* Interface mtu */
If we've got a full output buffer queue and cannot send anything for two mintues (see ``set choked'' and ``show bundle''), nuke the ip, mp and link level buffer queues. This should fix problems where ``ppp -auto'' seems to stop responding after failing to connect to the peer a few times.
1998-08-25 17:48:43 +00:00
struct {
Initial RADIUS support (using libradius). See the man page for details. Compiling with -DNORADIUS (the default for `release') removes support. TODO: The functionality in libradius::rad_send_request() needs to be supplied as a set of routines so that ppp doesn't have to wait indefinitely for the radius server(s). Instead, we need to get a descriptor back, select() on the descriptor, and ask libradius to service it when necessary. For now, ppp blocks SIGALRM while in rad_send_request(), so it misses PAP/CHAP retries & timeouts if they occur. Only PAP is functional. When CHAP is attempted, libradius complains that no User-Password has been specified... rfc2138 says that it *mustn't* be used for CHAP :-( Sponsored by: Internet Business Solutions Ltd., Switzerland
1999-01-28 01:56:34 +00:00
int timeout; /* How long to leave the output queue choked */
If we've got a full output buffer queue and cannot send anything for two mintues (see ``set choked'' and ``show bundle''), nuke the ip, mp and link level buffer queues. This should fix problems where ``ppp -auto'' seems to stop responding after failing to connect to the peer a few times.
1998-08-25 17:48:43 +00:00
} choked;
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
} cfg;
struct {
struct ipcp ipcp; /* Our IPCP FSM */
struct mp mp; /* Our MP */
} ncp;
struct {
Initial RADIUS support (using libradius). See the man page for details. Compiling with -DNORADIUS (the default for `release') removes support. TODO: The functionality in libradius::rad_send_request() needs to be supplied as a set of routines so that ppp doesn't have to wait indefinitely for the radius server(s). Instead, we need to get a descriptor back, select() on the descriptor, and ask libradius to service it when necessary. For now, ppp blocks SIGALRM while in rad_send_request(), so it misses PAP/CHAP retries & timeouts if they occur. Only PAP is functional. When CHAP is attempted, libradius complains that no User-Password has been specified... rfc2138 says that it *mustn't* be used for CHAP :-( Sponsored by: Internet Business Solutions Ltd., Switzerland
1999-01-28 01:56:34 +00:00
struct filter in; /* incoming packet filter */
struct filter out; /* outgoing packet filter */
struct filter dial; /* dial-out packet filter */
struct filter alive; /* keep-alive packet filter */
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
} filter;
struct {
Initial RADIUS support (using libradius). See the man page for details. Compiling with -DNORADIUS (the default for `release') removes support. TODO: The functionality in libradius::rad_send_request() needs to be supplied as a set of routines so that ppp doesn't have to wait indefinitely for the radius server(s). Instead, we need to get a descriptor back, select() on the descriptor, and ask libradius to service it when necessary. For now, ppp blocks SIGALRM while in rad_send_request(), so it misses PAP/CHAP retries & timeouts if they occur. Only PAP is functional. When CHAP is attempted, libradius complains that no User-Password has been specified... rfc2138 says that it *mustn't* be used for CHAP :-( Sponsored by: Internet Business Solutions Ltd., Switzerland
1999-01-28 01:56:34 +00:00
struct pppTimer timer; /* timeout after cfg.idle_timeout */
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
time_t done;
} idle;
struct {
Initial RADIUS support (using libradius). See the man page for details. Compiling with -DNORADIUS (the default for `release') removes support. TODO: The functionality in libradius::rad_send_request() needs to be supplied as a set of routines so that ppp doesn't have to wait indefinitely for the radius server(s). Instead, we need to get a descriptor back, select() on the descriptor, and ask libradius to service it when necessary. For now, ppp blocks SIGALRM while in rad_send_request(), so it misses PAP/CHAP retries & timeouts if they occur. Only PAP is functional. When CHAP is attempted, libradius complains that no User-Password has been specified... rfc2138 says that it *mustn't* be used for CHAP :-( Sponsored by: Internet Business Solutions Ltd., Switzerland
1999-01-28 01:56:34 +00:00
int fd; /* write status here */
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
} notify;
If we've got a full output buffer queue and cannot send anything for two mintues (see ``set choked'' and ``show bundle''), nuke the ip, mp and link level buffer queues. This should fix problems where ``ppp -auto'' seems to stop responding after failing to connect to the peer a few times.
1998-08-25 17:48:43 +00:00
struct {
Initial RADIUS support (using libradius). See the man page for details. Compiling with -DNORADIUS (the default for `release') removes support. TODO: The functionality in libradius::rad_send_request() needs to be supplied as a set of routines so that ppp doesn't have to wait indefinitely for the radius server(s). Instead, we need to get a descriptor back, select() on the descriptor, and ask libradius to service it when necessary. For now, ppp blocks SIGALRM while in rad_send_request(), so it misses PAP/CHAP retries & timeouts if they occur. Only PAP is functional. When CHAP is attempted, libradius complains that no User-Password has been specified... rfc2138 says that it *mustn't* be used for CHAP :-( Sponsored by: Internet Business Solutions Ltd., Switzerland
1999-01-28 01:56:34 +00:00
struct pppTimer timer; /* choked output queue timer */
If we've got a full output buffer queue and cannot send anything for two mintues (see ``set choked'' and ``show bundle''), nuke the ip, mp and link level buffer queues. This should fix problems where ``ppp -auto'' seems to stop responding after failing to connect to the peer a few times.
1998-08-25 17:48:43 +00:00
} choked;
Initial RADIUS support (using libradius). See the man page for details. Compiling with -DNORADIUS (the default for `release') removes support. TODO: The functionality in libradius::rad_send_request() needs to be supplied as a set of routines so that ppp doesn't have to wait indefinitely for the radius server(s). Instead, we need to get a descriptor back, select() on the descriptor, and ask libradius to service it when necessary. For now, ppp blocks SIGALRM while in rad_send_request(), so it misses PAP/CHAP retries & timeouts if they occur. Only PAP is functional. When CHAP is attempted, libradius complains that no User-Password has been specified... rfc2138 says that it *mustn't* be used for CHAP :-( Sponsored by: Internet Business Solutions Ltd., Switzerland
1999-01-28 01:56:34 +00:00
#ifndef NORADIUS
struct radius radius; /* Info retrieved from radius server */
#endif
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
};
#define descriptor2bundle(d) \
((d)->type == BUNDLE_DESCRIPTOR ? (struct bundle *)(d) : NULL)
Fix ``set proctitle'' by using setproctitle().
1999-11-17 21:12:35 +00:00
extern struct bundle *bundle_Create(const char *, int, int);
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
extern void bundle_Destroy(struct bundle *);
extern const char *bundle_PhaseName(struct bundle *);
#define bundle_Phase(b) ((b)->phase)
extern void bundle_NewPhase(struct bundle *, u_int);
o Support callback types NONE, E.164, AUTH and CBCP. (see the new ``set callback'' and ``set cbcp'' commands) o Add a ``cbcp'' log level and mbuf type. o Don't dump core when \T is given in ``set login'' or ``set hangup''. o Allow ``*'' and blanks as placeholders in ppp.secret and allow a fifth field for specifying auth/cbcp dialback parameters. o Remove a few extraneous #includes o Define the default number of REQs (restart counter) in defs.h rather than hardcoding ``5'' all over the place. o Fix a few man page inconsistencies.
1998-08-07 18:42:51 +00:00
extern void bundle_LinksRemoved(struct bundle *);
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
extern int bundle_LinkIsUp(const struct bundle *);
extern int bundle_SetRoute(struct bundle *, int, struct in_addr,
Silence ``Network unreachable'' warnings when using ``add .... HISADDR''. The network will never be reachable at this point unless we're in -auto or reading the command from ppp.linkup. We can now run the following lines and get the expected results: set ifaddr 1.2.3.4/0 5.6.7.8/0 add default HISADDR where a route is added immediately in auto mode and the whole thing is delayed 'till the IP numbers have been agreed in other modes. Essentially, ppp.linkup is no longer required.
1998-07-28 21:54:54 +00:00
struct in_addr, struct in_addr, int, int);
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
extern void bundle_Close(struct bundle *, const char *, int);
Don't bring the modem offline or hangup when ``down lcp'' is done. Instead, behave like ``close lcp''.
1998-06-16 19:40:28 +00:00
extern void bundle_Down(struct bundle *, int);
Allow an optional ``!'' in the open, dial & call commands. When used, the redial timer is ignored and the modem is opened immediately.
1998-07-29 18:21:17 +00:00
extern void bundle_Open(struct bundle *, const char *, int, int);
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
extern void bundle_LinkClosed(struct bundle *, struct datalink *);
extern int bundle_ShowLinks(struct cmdargs const *);
extern int bundle_ShowStatus(struct cmdargs const *);
extern void bundle_StartIdleTimer(struct bundle *);
Implement a minimum idle time value as an optional second argument to ``set timeout''. This is useful for situations where your minimum call charge is (say) 5 minutes (like mine is)
1999-08-17 17:22:46 +00:00
extern void bundle_SetIdleTimer(struct bundle *, int, int);
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
extern void bundle_StopIdleTimer(struct bundle *);
extern int bundle_IsDead(struct bundle *);
extern struct datalink *bundle2datalink(struct bundle *, const char *);
To avoid namespace polution in NetBSD: ``struct descriptor'' -> ``struct fdescriptor''
2000-03-14 01:46:09 +00:00
extern void bundle_RegisterDescriptor(struct bundle *, struct fdescriptor *);
extern void bundle_UnRegisterDescriptor(struct bundle *, struct fdescriptor *);
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
extern void bundle_SetTtyCommandMode(struct bundle *, struct datalink *);
extern int bundle_DatalinkClone(struct bundle *, struct datalink *,
const char *);
extern void bundle_DatalinkRemove(struct bundle *, struct datalink *);
extern void bundle_CleanDatalinks(struct bundle *);
extern void bundle_SetLabel(struct bundle *, const char *);
extern const char *bundle_GetLabel(struct bundle *);
extern void bundle_SendDatalink(struct datalink *, int, struct sockaddr_un *);
Rewrite the link descriptor transfer code in MP mode. Previously, ppp attempted to bind() to a local domain tcp socket based on the peer authname & enddisc. If it succeeded, it listen()ed and became MP server. If it failed, it connect()ed and became MP client. The server then select()ed on the descriptor, accept()ed it and wrote its pid to it then read the link data & link file descriptor, and finally sent an ack (``!''). The client would read() the server pid, transfer the link lock to that pid, send the link data & descriptor and read the ack. It would then close the descriptor and clean up. There was a race between the bind() and listen() where someone could attempt to connect() and fail. This change removes the race. Now ppp makes the RCVBUF big enough on a socket descriptor and attempts to bind() to a local domain *udp* socket (same name as before). If it succeeds, it becomes MP server. If it fails, it sets the SNDBUF and connect()s, becoming MP client. The server select()s on the descriptor and recvmsg()s the message, insisting on at least two descriptors (plus the link data). It uses the second descriptor to write() its pid then read()s an ack (``!''). The client creates a socketpair() and sendmsg()s the link data, link descriptor and one of the socketpair descriptors. It then read()s the server pid from the other socketpair descriptor, transfers any locks and write()s an ack. Now, there can be no race, and a connect() failure indicates a stale socket file. This also fixes MP ppp over ethernet, where the struct msghdr was being misconstructed when transferring the control socket descriptor. Also, if we fail to send the link, don't hang around in a ``session owner'' state, just do the setsid() and fork() if it's required to disown a tty. UDP idea suggested by: Chris Bennet from Mindspring at FreeBSDCon
1999-11-25 02:47:04 +00:00
extern int bundle_LinkSize(void);
extern void bundle_ReceiveDatalink(struct bundle *, int);
MFMP: Make ppp multilink capable. See the file README.changes, and re-read the man page.
1998-05-21 21:49:08 +00:00
extern int bundle_SetMode(struct bundle *, struct datalink *, int);
extern int bundle_RenameDatalink(struct bundle *, struct datalink *,
const char *);
o #define the name "tun" in defs.h against the future possibility of supporting architectures with different device names. o Close /dev/tunX when destroying the bundle. o Don't forget to close the parent end of the pipe in the child process when exec'ing a program from a chat script. o If we close our controlling terminal, ditch the current session with it, allowing getty(8) (or whatever) to regain control. o After transferring our controlling terminal descriptor to another ppp instance, we now fork a new ppp to continue where we left off, transferring ownership of all uucp locks and the /var/run/tunX.pid file. Meanwhile the parent closes all file descriptors, defaults all signals and does a pause() to wait for a HUP after the transferred descriptor is finally closed. We don't run /bin/cat any more (again!). Suggested by: bde TODO: It seems clocal devices need their pause()d session leader to be given a manual HUP, as closing the last open descriptor doesn't do the job.
1998-05-28 23:17:51 +00:00
extern void bundle_setsid(struct bundle *, int);
Put the correct pid in /var/run/tunX.pid Suggested by: many
1998-06-06 20:50:57 +00:00
extern void bundle_LockTun(struct bundle *);
Loosen our restrictions on setting enddisc, mrru, shortseq, authname and authkey. o Auth{name,key} may additionally be set in PHASE_ESTABLISH. o The others may be set in PHASE_ESTABLISH as long as no links have yet reached DATALINK_LCP.
1998-10-24 01:08:45 +00:00
extern int bundle_HighestState(struct bundle *);
When using ``set device !someprogram'', when ``someprogram'' exits, it causes a select() exception. Handle these select() exceptions on link descriptors in pretty much the same way as loss of carrier rather than dropping out in confusion.
1998-12-10 18:36:30 +00:00
extern int bundle_Exception(struct bundle *, int);
Remember if MYADDR or HISADDR is used in a filter add tweak all filters any time either value changes.
1999-05-31 23:57:40 +00:00
extern void bundle_AdjustFilters(struct bundle *, struct in_addr *,
struct in_addr *);
Add the ``resolv'' command for telling ppp how to deal with resolv.conf. You can now ``resolv restore'' in ppp.linkdown ! Add DNS0 and DNS1 macros.
2000-03-14 01:47:27 +00:00
extern void bundle_AdjustDNS(struct bundle *, struct in_addr [2]);
o Obsolete the undocumented ``set weight'' command. 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).
1999-08-05 10:32:16 +00:00
extern void bundle_CalculateBandwidth(struct bundle *);
extern void bundle_AutoAdjust(struct bundle *, int, int);
extern int bundle_WantAutoloadTimer(struct bundle *);
Use TUNSIFPID when we change our PID (if it exists).
2000-01-21 00:33:27 +00:00
extern void bundle_ChangedPID(struct bundle *);
Reference in New Issue Copy Permalink