/* -*-c-*-
*
- * $Id: tripe.c,v 1.10 2003/05/16 12:09:03 mdw Exp $
+ * $Id: tripe.c,v 1.15 2004/04/19 08:49:40 mdw Exp $
*
* Main program
*
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: tripe.c,v $
- * Revision 1.10 2003/05/16 12:09:03 mdw
- * Allow binding to a chosen address.
- *
- * Revision 1.9 2003/04/15 14:11:09 mdw
- * Rationalize the behaviour of the `-G' and `-U' options.
- *
- * Revision 1.8 2002/01/13 17:28:29 mdw
- * Don't turn tracing on if tracing is turned off (!).
- *
- * Revision 1.7 2002/01/13 17:14:05 mdw
- * Don't include the tracing option in the help if not compiled in.
- *
- * Revision 1.6 2001/06/19 22:08:37 mdw
- * Moved buffers to peer.c.
- *
- * Revision 1.5 2001/02/16 21:43:12 mdw
- * Provide a more helpful usage message.
- *
- * Revision 1.4 2001/02/16 21:41:31 mdw
- * Add a new buffer.
- *
- * Revision 1.3 2001/02/04 17:10:40 mdw
- * Remove a debugging @abort@ call.
- *
- * Revision 1.2 2001/02/03 22:33:00 mdw
- * Stuff more randomness into the pool in the interval timer.
- *
- * Revision 1.1 2001/02/03 20:26:37 mdw
- * Initial checkin.
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include "tripe.h"
{
struct timeval tvv;
T( trace(T_PEER, "peer: interval timer"); )
- rand_seed(RAND_GLOBAL, HASHSZ);
+ rand_seed(RAND_GLOBAL, MAXHASHSZ);
p_interval();
tvv = *tv;
tvv.tv_sec += T_INTERVAL;
static void usage(FILE *fp)
{
- pquis(fp, "Usage: $ [-D] [-d dir] [-p port] [-U user] [-G group]\n\
- [-k priv-keyring] [-K pub-keyring] [-t key-tag]\n\
- [-a socket] [-T trace-opts]\n");
+ pquis(fp, "Usage: $ [-D] [-d dir] [-b addr] [-p port]\n\
+ [-U user] [-G group] [-a socket] [-T trace-opts]\n\
+ [-k priv-keyring] [-K pub-keyring] [-t key-tag]\n");
}
static void version(FILE *fp)
-u, --usage Display pointless usage message.\n\
\n\
-D, --daemon Run in the background.\n\
--d, --directory=DIR Switch to directory DIR (default $TRIPEDIR).\n\
+-d, --directory=DIR Switch to directory DIR [default " CONFIGDIR "].\n\
+-b, --bind-address=ADDR Bind UDP socket to this IP ADDR.\n\
-p, --port=PORT Select UDP port to listen to.\n\
--u, --setuid=USER Set uid to USER after initialization.\n\
--g, --setgid=GROUP Set gid to GROUP after initialization.\n\
+-U, --setuid=USER Set uid to USER after initialization.\n\
+-G, --setgid=GROUP Set gid to GROUP after initialization.\n\
-k, --priv-keyring=FILE Get private key from FILE.\n\
-K, --pub-keyring=FILE Get public keys from FILE.\n\
-t, --tag=KEYTAG Use private key labelled TAG.\n\
{
const char *kr_priv = "keyring", *kr_pub = "keyring.pub";
const char *tag_priv = "tripe-dh";
- const char *csock = "tripesock";
- const char *dir = "/var/lib/tripe";
+ const char *csock = SOCKETDIR "/tripesock";
+ const char *dir = CONFIGDIR;
const char *p;
unsigned port = 0;
struct in_addr baddr = { INADDR_ANY };
{ "trace", OPTF_ARGREQ, 0, 'T' },
#endif
+ { "tunnel", 0, 0, '0' },
{ 0, 0, 0, 0 }
};
- int i = mdwopt(argc, argv, "hvu DU:G: b:p:d:k:K:t:a:" T("T:"),
+ int i = mdwopt(argc, argv, "hvuDU:G:b:p:d:k:K:t:a:" T("T:"),
opts, 0, 0, 0);
if (i < 0)
break;
trace_level(tr_flags);
break;
#endif
+ case '0': {
+ static const char *tun[] = { "notdef", "unet", "bsd", "linux" };
+ puts(tun[TUN_TYPE]);
+ exit(0);
+ } break;
default:
f |= f_bogus;
break;
sel_init(&sel);
sig_init(&sel);
rand_noisesrc(RAND_GLOBAL, &noise_source);
- rand_seed(RAND_GLOBAL, RMD160_HASHSZ);
+ rand_seed(RAND_GLOBAL, MAXHASHSZ);
signal(SIGPIPE, SIG_IGN);
tun_init();
p_init(baddr, port);