Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/usr.bin/ftp/ftp_var.h,v rcsdiff: /ftp/cvs/cvsroot/src/usr.bin/ftp/ftp_var.h,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- src/usr.bin/ftp/ftp_var.h 1997/07/20 09:45:55 1.17 +++ src/usr.bin/ftp/ftp_var.h 1997/08/18 10:20:25 1.18 @@ -1,4 +1,4 @@ -/* $NetBSD: ftp_var.h,v 1.17 1997/07/20 09:45:55 lukem Exp $ */ +/* $NetBSD: ftp_var.h,v 1.18 1997/08/18 10:20:25 lukem Exp $ */ /* * Copyright (c) 1985, 1989, 1993, 1994 @@ -54,8 +54,14 @@ #define STALLTIME 5 /* # of seconds of no xfer before "stalling" */ -#define FTP_PORT 21 /* default if getservbyname("ftp/tcp") fails */ -#define HTTP_PORT 80 /* default if getservbyname("http/tcp") fails */ +#define FTP_PORT 21 /* default if ! getservbyname("ftp/tcp") */ +#define HTTP_PORT 80 /* default if ! getservbyname("http/tcp") */ +#ifndef GATE_PORT +#define GATE_PORT 21 /* default if ! getservbyname("ftpgate/tcp") */ +#endif +#ifndef GATE_SERVER +#define GATE_SERVER "" /* default server */ +#endif #define PAGER "less" /* default pager if $PAGER isn't set */ @@ -77,6 +83,8 @@ int doglob; /* glob local file names * int autologin; /* establish user account on connection */ int proxy; /* proxy server connection active */ int proxflag; /* proxy connection exists */ +int gatemode; /* use gate-ftp */ +char *gateserver; /* server to use for gate-ftp */ int sunique; /* store files on server with unique name */ int runique; /* store local files with unique name */ int mcase; /* map upper to lower case for mget names */ @@ -88,7 +96,7 @@ int code; /* return/reply code for ftp int crflag; /* if 1, strip car. rets. on ascii gets */ char pasv[64]; /* passive port for proxy data connection */ int passivemode; /* passive mode enabled */ -char *altarg; /* argv[1] with no shell-like preprocessing */ +char *altarg; /* argv[1] with no shell-like preprocessing */ char ntin[17]; /* input translation table */ char ntout[17]; /* output translation table */ char mapin[MAXPATHLEN]; /* input map template */ @@ -121,11 +129,13 @@ off_t bytes; /* current # of bytes rea off_t filesize; /* size of file being transferred */ char *direction; /* direction transfer is occurring */ -char *hostname; /* name of host connected to */ +char *hostname; /* name of host connected to */ int unix_server; /* server is unix, can use binary for ascii */ int unix_proxy; /* proxy is unix, can use binary for ascii */ -u_int16_t ftpport; /* port number to use for ftp connections */ -u_int16_t httpport; /* port number to use for http connections */ + +u_int16_t ftpport; /* port number to use for ftp connections */ +u_int16_t httpport; /* port number to use for http connections */ +u_int16_t gateport; /* port number to use for gateftp connections */ jmp_buf toplevel; /* non-local goto stuff for cmd scanner */