diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-10-12 13:43:05 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-10-12 13:43:05 +0000 |
| commit | aee474b0cf18922c8b21ca56aae4067835c6a860 (patch) | |
| tree | 47e06016a77cfa961e90b3255fbfcda9a8837f58 /c/src/libnetworking/pppd/rtemsmain.c | |
| parent | 2001-10-11 Alexandra Kossovsky <sasha@oktet.ru> (diff) | |
| download | rtems-aee474b0cf18922c8b21ca56aae4067835c6a860.tar.bz2 | |
2001-10-12 Mike Siers <mikes@poliac.com>
* Update to stable working state. Congratulations Mike! :)
* modem_example: Directory removed.
* modem_example/16550.h, modem_example/README, modem_example/modem.c,
modem_example/modem.h, modem_example/ppp.c, modem_example/ppp.h,
modem_example/pppcompress.c: Files removed.
* pppd/example/pppd.options: New file.
* pppd/README, pppd/STATUS, pppd/cbcp.c, pppd/cbcp.h, pppd/chat.c,
pppd/pppd.h, pppd/rtemsmain.c: Updated.
Diffstat (limited to '')
| -rw-r--r-- | c/src/libnetworking/pppd/rtemsmain.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/c/src/libnetworking/pppd/rtemsmain.c b/c/src/libnetworking/pppd/rtemsmain.c index 5a266a9ff3..38383c6e06 100644 --- a/c/src/libnetworking/pppd/rtemsmain.c +++ b/c/src/libnetworking/pppd/rtemsmain.c @@ -107,8 +107,6 @@ int phase; /* where the link is at */ int kill_link; int open_ccp_flag; -static int waiting; - char **script_env; /* Env. variable values for scripts */ int s_env_nalloc; /* # words avail at script_env */ @@ -234,8 +232,6 @@ pppdmain(argc, argv) setlogmask(LOG_UPTO(LOG_DEBUG)); */ - waiting = 0; - do_callback = 0; for (;;) { @@ -400,12 +396,10 @@ pppdmain(argc, argv) status = EXIT_NEGOTIATION_FAILED; new_phase(PHASE_ESTABLISH); while (phase != PHASE_DEAD) { - waiting = 1; wait_input(timeleft(&timo)); - waiting = 0; - calltimeout(); get_input(); + if (kill_link) { lcp_close(0, "User request"); kill_link = 0; @@ -469,9 +463,7 @@ pppdmain(argc, argv) new_phase(PHASE_HOLDOFF); TIMEOUT(holdoff_end, NULL, t); do { - waiting = 1; wait_input(timeleft(&timo)); - waiting = 0; calltimeout(); if (kill_link) { |