X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fpppd.h;h=f4f53817e1e3f7464c61c3cb74a3d4a28019ce4c;hb=298bda129d41179121373122bce6c44c8f09e7d7;hp=dbb3e871634387e46588f41aa7716129526bcf29;hpb=b46005d557c870f1125f2fc4dd139adc0bdc54c5;p=ppp.git diff --git a/pppd/pppd.h b/pppd/pppd.h index dbb3e87..f4f5381 100644 --- a/pppd/pppd.h +++ b/pppd/pppd.h @@ -39,7 +39,7 @@ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: pppd.h,v 1.83 2004/10/28 00:32:32 paulus Exp $ + * $Id: pppd.h,v 1.86 2004/11/06 05:42:29 paulus Exp $ */ /* @@ -243,6 +243,7 @@ extern int error_count; /* # of times error() has been called */ extern char ppp_devnam[MAXPATHLEN]; extern char remote_number[MAXNAMELEN]; /* Remote telephone number, if avail. */ extern int ppp_session_number; /* Session number (eg PPPoE session) */ +extern int fd_devnull; /* fd open to /dev/null */ extern int listen_time; /* time to listen first (ms) */ extern struct notifier *pidchange; /* for notifications of pid changing */ @@ -309,6 +310,7 @@ extern bool noendpoint; /* don't send or accept endpt. discrim. */ extern char *bundle_name; /* bundle name for multilink */ extern bool dump_options; /* print out option values */ extern bool dryrun; /* check everything, print options, exit */ +extern int child_wait; /* # seconds to wait for children at end */ #ifdef MAXOCTETS extern unsigned int maxoctets; /* Maximum octetes per session (in bytes) */ @@ -347,13 +349,11 @@ extern bool ms_lanman; /* Use LanMan password instead of NT */ /* Values for auth_done only */ #define CHAP_MD5_WITHPEER 0x40 #define CHAP_MD5_PEER 0x80 -#ifdef CHAPMS #define CHAP_MS_SHIFT 8 /* LSB position for MS auths */ #define CHAP_MS_WITHPEER 0x100 #define CHAP_MS_PEER 0x200 #define CHAP_MS2_WITHPEER 0x400 #define CHAP_MS2_PEER 0x800 -#endif extern char *current_option; /* the name of the option being parsed */ extern int privileged_option; /* set iff the current option came from root */ @@ -466,7 +466,7 @@ void timeout __P((void (*func)(void *), void *arg, int s, int us)); void untimeout __P((void (*func)(void *), void *arg)); /* Cancel call to func(arg) */ void record_child __P((int, char *, void (*) (void *), void *)); -pid_t safe_fork __P((void)); /* Fork & close stuff in child */ +pid_t safe_fork __P((int, int, int)); /* Fork & close stuff in child */ int device_script __P((char *cmd, int in, int out, int dont_wait)); /* Run `cmd' with given stdin and stdout */ pid_t run_program __P((char *prog, char **args, int must_exist,