Commit Graph

81 Commits

Author SHA1 Message Date
Brian Somers
85b542cf4f Move the terminal/diagnostic socket stuff out of main.c
and into the new `prompt.c'.  struct prompt is (of course)
a `sort' of descriptor.
1998-02-10 03:23:50 +00:00
Brian Somers
b77776a7f2 Pass the fdset to descriptor_Read & descriptor_Write
allowing support for the use of multiple file descriptors.
1998-02-10 03:22:05 +00:00
Brian Somers
ea69f16a19 Typo police. 1998-02-10 03:21:39 +00:00
Brian Somers
77ff88ad4b Make the server descriptor into a `sort' of struct descriptor. 1998-02-09 19:24:03 +00:00
Brian Somers
42d4d39668 o Introduce struct descriptor.
This will ultimately be a member of a list of descriptors and
  their handler functions on which we need to select() in the
  main loop.
o Make struct physical into a `sort' of struct descriptor.
1998-02-09 19:21:11 +00:00
Brian Somers
68a0f0ccdd o Add bundle_Destroy().
o Don't remove routes and DOWN the interface when we're
  closed in auto mode.
o Initialize the FSMs in bundle_Create.
o Initialize ipcp::if_mine & ipcp::if_peer only once (so
  that we don't forget that we've SIOCAIFADDR'd the interface).
o Do a SIOCDIFADDR on the specific address to avoid hurting any
  other (still non-existent) NCPs.
o Fix some error/diagnostic messages.
1998-02-08 19:29:45 +00:00
Brian Somers
1afedc4b86 Create an AbortProgram() function for getting out of
ppp immediately.
1998-02-08 11:07:32 +00:00
Brian Somers
aad81d1ecf Rename ccpstate to ccp, ipcpstate to ipcp and lcpstate to lcp. 1998-02-08 11:05:01 +00:00
Brian Somers
9876c443a8 Initialize RTS/CTS, speed and parity in modem_Create(). 1998-02-08 01:31:27 +00:00
Brian Somers
4a3762fbfd Remove two SIGSEGVs. 1998-02-07 22:22:45 +00:00
Brian Somers
455aabc3f8 o Hook the FSMs into our bundle.
o The FSM layering is now more sane.
o Move a lot of the NCP stuff into our ipcpstate rather than having it
  in the bundle, including control of the configured IP addresses.  We
  don't need hacks like the global `linkup' variable any more as the
  FSM decides when our ppp.link* files get run.  This is going to eventually
  be configurable based on FSM events anyway.
o Fix a few inconsistencies when both sides require authentication.
o We now have "Ppp..." and "PPp" prompts, reflecting authentication
  and network phase.  We don't print loads of spurious prompts as we
  change phases any more.
o Our phase is part of the bundle now.
o Fix a bug where the FSM wasn't calling LayerFinish.
o Close the FSM down correctly with a signal rather than slamming it
  down as if the line was dropped (the undocumented ``down'' command
  is still available though).
o Remove the forgotten `tunno' variable and fix references to it.
1998-02-07 20:50:08 +00:00
Brian Somers
83d1af558c Isolate fsm callback functions
Derive {lcp,ipcp,ccp}state structures from struct fsm
where convenient.
Create bundle_Down() and remove LcpDown()
1998-02-06 02:24:29 +00:00
Brian Somers
2289f24698 Move pppVars.physical into the bundle (for the moment). 1998-02-06 02:23:48 +00:00
Brian Somers
6f1bc4e5da Remove static phys_modem 1998-02-06 02:22:52 +00:00
Brian Somers
ecd5172a68 Shuffle names and args in modem.h 1998-02-06 02:22:28 +00:00
Brian Somers
52f21f2683 Correct magic number format string
Spotted by: Bruce M. Walter <walter@fortean.com>
1998-02-04 01:03:51 +00:00
Brian Somers
1f64f3adab Parse configuration files a bit better.
Allow continuation lines ('\' as the last char on a line).
1998-02-04 01:03:36 +00:00
Brian Somers
26fe3a55f3 Comment bundle.h 1998-02-04 01:03:19 +00:00
Brian Somers
6140ba1177 Create struct async' and make it part of struct physical'.
This structure contains the asynchronous state of the physical
link.
Unfortunately, just about every .h file is included in every .c
file now.  Fixing this can be one of the last jobs.
1998-02-02 19:33:40 +00:00
Brian Somers
820de6eb8e Bring the routing seqno into struct bundle. 1998-02-02 19:33:02 +00:00
Brian Somers
42e91bc7b3 Cosmetic: Merge the show vj' command into show ipcp'
and make it prettier.
1998-02-02 19:32:31 +00:00
Brian Somers
7a6f872047 Create `struct bundle' - the top level control structure.
This structure will eventually contain a list of NCPs (currently
only IPCP is supported) and a list of physical `struct link's.
It will also derive from a struct link itself.
Make ModemTimeout() static - it's way to dangerous to be called
from outside !
Bump version to 1.9.  Our first MP release should be 2.0.
1998-02-02 19:32:16 +00:00
Brian Somers
7308ec6890 Move the global FSMs into their relevent structures.
IPCP, CCP and LCP are now just derived FSMs.
Comment each of the FSM implementations so that we can
tell what's going on.
Revise the state transitions so that CCP and IPCP actually
send terminate REQs when appropriate.

The OS & IPCP layers are still like spagetti (next job).
1998-01-31 02:48:30 +00:00
Brian Somers
8c07a7b2e0 Create `struct link' - the logical link from which
`struct physical' (and the future `struct logical')
are derived.
1998-01-30 19:46:07 +00:00
Brian Somers
c8ee0d78b6 o Bring global/static data into LcpInfo.
o Parameterise LcpReportTime().
o Don't obscure the hard-coded use of LcpInfo.
o Comment on the data elements of LcpInfo.
1998-01-30 01:33:46 +00:00
Brian Somers
e675fb2392 Null commit: I managed to ^c the last commit before the mail
message (with a garbage update message) and
              after the update :-(  DUH!
I meant:
Remove extraneous extern decls.
1998-01-30 01:32:55 +00:00
Brian Somers
5119c5a20c Index: ipcp.h
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ppp/ipcp.h,v
retrieving revision 1.18.2.2
diff -c -r1.18.2.2 ipcp.h
*** ipcp.h	1998/01/29 23:11:37	1.18.2.2
--- ipcp.h	1998/01/30 01:24:37
***************
*** 71,81 ****
  };

  extern struct ipcpstate IpcpInfo;
- extern struct in_range DefMyAddress;
- extern struct in_range DefHisAddress;
- extern struct iplist DefHisChoice;
- extern struct in_addr TriggerAddress;
- extern int HaveTriggerAddress;
  extern struct fsm IpcpFsm;

  extern void IpcpInit(struct physical *physical);
--- 71,76 ----
1998-01-30 01:28:35 +00:00
Brian Somers
29e275cee4 o Move global/static IPCP data into IpcpInfo.
o Use INADDR_ANY and INADDR_BROADCAST instead of 0 and 0xffffffff
  for IP addresses & masks.
o Move struct compreq into ipcp.c (it's none of anyone elses
  business).
o Rename MAX_STATES to MAX_VJ_STATES.
1998-01-29 23:11:44 +00:00
Brian Somers
247ab36d28 o Move in_algorithm and out_algorithm into CcpInfo.
o Take note of the return value of the compression layers
  init routine, and if it fails, bring the whole layer
  cleanly back down again.
o Only use srandomdev() if ``__FreeBSD__ > 2'' - this makes
  these sources buildable on 2.2 (where I'm testing).
1998-01-29 20:45:16 +00:00
Brian Somers
63b7346316 Create a new MP branch for `multilink protocol'.
Do lots of initial shuffling and grouping.
Submitted by: Eivind Eklund <perhaps@yes.no>
1998-01-29 00:49:32 +00:00
cvs2svn
1ae349f52c This commit was manufactured by cvs2svn to create branch 'MP'. 1998-01-29 00:44:16 +00:00