X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/7631176f5c140b9c77fa865ef3b2287fd574e4d7..ef4a1ab72d88f8790c367b513863d4f9a101a34d:/tripe.c

diff --git a/tripe.c b/tripe.c
index adbd7a11..447a0c4c 100644
--- a/tripe.c
+++ b/tripe.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: tripe.c,v 1.11 2003/05/17 11:02:03 mdw Exp $
+ * $Id: tripe.c,v 1.12 2003/11/29 23:49:32 mdw Exp $
  *
  * Main program
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: tripe.c,v $
+ * Revision 1.12  2003/11/29 23:49:32  mdw
+ * Debianization.
+ *
  * Revision 1.11  2003/05/17 11:02:03  mdw
  * Document the new `-b' option.
  *
@@ -135,7 +138,7 @@ Options:\n\
 -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\
@@ -154,8 +157,8 @@ int main(int argc, char *argv[])
 {
   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 };
@@ -194,6 +197,7 @@ int main(int argc, char *argv[])
       { "trace",	OPTF_ARGREQ,	0,	'T' },
 #endif
 
+      { "tunnel",	0,		0,	'0' },
       { 0,		0,		0,	0 }
     };
 
@@ -282,6 +286,11 @@ int main(int argc, char *argv[])
 	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;