aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/ppp/tun.c
diff options
context:
space:
mode:
authorBrian Somers <brian@FreeBSD.org>1998-04-03 19:21:56 +0000
committerBrian Somers <brian@FreeBSD.org>1998-04-03 19:21:56 +0000
commit3b0f8d2ed641ceeded11c0d3f253b0cacbf00880 (patch)
treed23344627008ee3c3fbe45b8aaa83290cd4ee5aa /usr.sbin/ppp/tun.c
parent5cf4388bdf4c4e693f048a9d8563b298c16e8cb5 (diff)
downloadsrc-3b0f8d2ed641ceeded11c0d3f253b0cacbf00880.tar.gz
src-3b0f8d2ed641ceeded11c0d3f253b0cacbf00880.zip
o Move struct lcp and struct ccp into struct link.
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.
Notes
Notes: svn path=/cvs2svn/branches/MP/; revision=35009
Diffstat (limited to 'usr.sbin/ppp/tun.c')
-rw-r--r--usr.sbin/ppp/tun.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/ppp/tun.c b/usr.sbin/ppp/tun.c
index 500bcef9c31b..51aa67cacb7a 100644
--- a/usr.sbin/ppp/tun.c
+++ b/usr.sbin/ppp/tun.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: tun.c,v 1.6.4.8 1998/03/16 22:54:28 brian Exp $
+ * $Id: tun.c,v 1.6.4.9 1998/03/20 19:48:25 brian Exp $
*/
#include <sys/param.h>
@@ -57,6 +57,10 @@
#include "ipcp.h"
#include "filter.h"
#include "descriptor.h"
+#include "lcp.h"
+#include "ccp.h"
+#include "link.h"
+#include "mp.h"
#include "bundle.h"
#include "tun.h"