* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: tripe.c,v $
- * 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.
- *
- */
-
p_interval();
tvv = *tv;
tvv.tv_sec += T_INTERVAL;
sel_addtimer(&sel, &it, &tvv, interval, v);
}
p_interval();
tvv = *tv;
tvv.tv_sec += T_INTERVAL;
sel_addtimer(&sel, &it, &tvv, interval, v);
}
+/* --- @mystrieq@ --- *
+ *
+ * Arguments: @const char *x, *y@ = two strings
+ *
+ * Returns: True if @x@ and @y are equal, up to case.
+ */
+
+int mystrieq(const char *x, const char *y)
+{
+ for (;;) {
+ if (!*x && !*y) return (1);
+ if (tolower((unsigned char)*x) != tolower((unsigned char)*y))
+ return (0);
+ x++; y++;
+ }
+}
+
- pquis(fp, "Usage: $ [-options]\n");
+ pquis(fp, "Usage: $ [-D] [-d DIR] [-b ADDR] [-p PORT] [-n TUNNEL]\n\
+ [-U USER] [-G GROUP] [-a SOCKET] [-T TRACE-OPTS]\n\
+ [-k PRIV-KEYRING] [-K PUB-KEYRING] [-t KEY-TAG]\n");
-h, --help Display this help text.\n\
-v, --version Display version number.\n\
-u, --usage Display pointless usage message.\n\
-h, --help Display this help text.\n\
-v, --version Display version number.\n\
-u, --usage Display pointless usage message.\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\
+-n, --tunnel=TUNNEL Seelect default tunnel driver.\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\
-a, --admin-socket=FILE Use FILE as the adminstration socket.\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\
-a, --admin-socket=FILE Use FILE as the adminstration socket.\n\
{
const char *kr_priv = "keyring", *kr_pub = "keyring.pub";
const char *tag_priv = "tripe-dh";
{
const char *kr_priv = "keyring", *kr_pub = "keyring.pub";
const char *tag_priv = "tripe-dh";
for (;;) {
static const struct option opts[] = {
{ "help", 0, 0, 'h' },
{ "version", 0, 0, 'v' },
{ "usage", 0, 0, 'u' },
for (;;) {
static const struct option opts[] = {
{ "help", 0, 0, 'h' },
{ "version", 0, 0, 'v' },
{ "usage", 0, 0, 'u' },
{ "daemon", 0, 0, 'D' },
{ "uid", OPTF_ARGREQ, 0, 'U' },
{ "setuid", OPTF_ARGREQ, 0, 'U' },
{ "gid", OPTF_ARGREQ, 0, 'G' },
{ "setgid", OPTF_ARGREQ, 0, 'G' },
{ "daemon", 0, 0, 'D' },
{ "uid", OPTF_ARGREQ, 0, 'U' },
{ "setuid", OPTF_ARGREQ, 0, 'U' },
{ "gid", OPTF_ARGREQ, 0, 'G' },
{ "setgid", OPTF_ARGREQ, 0, 'G' },
+ { "bind-address", OPTF_ARGREQ, 0, 'b' },
+ { "tunnel", OPTF_ARGREQ, 0, 'n' },
{ "port", OPTF_ARGREQ, 0, 'p' },
{ "directory", OPTF_ARGREQ, 0, 'd' },
{ "priv-keyring", OPTF_ARGREQ, 0, 'k' },
{ "port", OPTF_ARGREQ, 0, 'p' },
{ "directory", OPTF_ARGREQ, 0, 'd' },
{ "priv-keyring", OPTF_ARGREQ, 0, 'k' },
- int i = mdwopt(argc, argv, "hvu DU:G: p:d:k:K:t:a:" T("T:"),
- opts, 0, 0, 0);
+ i = mdwopt(argc, argv, "hvuDU:G:b:p:d:k:K:t:a:" T("T:"),
+ opts, 0, 0, 0);
- u = i;
- else {
- struct passwd *pw;
- if ((pw = getpwnam(optarg)) == 0)
- die(EXIT_FAILURE, "user name `%s' not found", optarg);
- u = pw->pw_uid;
- }
+ pw = getpwuid(i);
+ else
+ pw = getpwnam(optarg);
+ if (!pw)
+ die(EXIT_FAILURE, "user `%s' not found", optarg);
+ u = pw->pw_uid;
+ if (g == -1)
+ g = pw->pw_gid;
- g = i;
- else {
- struct group *gr;
- if ((gr = getgrnam(optarg)) == 0)
- die(EXIT_FAILURE, "group name `%s' not found", optarg);
- g = gr->gr_gid;
- }
+ gr = getgrgid(i);
+ else
+ gr = getgrnam(optarg);
+ if (!gr)
+ die(EXIT_FAILURE, "group `%s' not found", optarg);
+ g = gr->gr_gid;
+ } break;
+
+ case 'b': {
+ struct hostent *h = gethostbyname(optarg);
+ if (!h)
+ die(EXIT_FAILURE, "unknown host name `%s'", optarg);
+ memcpy(&baddr, h->h_addr, sizeof(struct in_addr));
+ case 'n': {
+ int i;
+ for (i = 0;; i++) {
+ if (!tunnels[i])
+ die(EXIT_FAILURE, "unknown tunnel `%s'", optarg);
+ if (mystrieq(optarg, tunnels[i]->name))
+ break;
+ }
+ tun_default = tunnels[i];
+ } break;
- tun_init();
- p_init(port);
- if (!(f & f_daemon))
- a_create(STDIN_FILENO, STDOUT_FILENO);
- if (g != -1) {
- if (setgid(g)) {
+ for (i = 0; tunnels[i]; i++)
+ tunnels[i]->init();
+ p_init(baddr, port);
+ if (!(f & f_daemon)) {
+#ifndef NTRACE
+ a_create(STDIN_FILENO, STDOUT_FILENO, AF_TRACE | AF_WARN);
+#else
+ a_create(STDIN_FILENO, STDOUT_FILENO, AF_WARN);
+#endif
+ }
+ if (g != (gid_t)-1) {
+ if (setgid(g) || (getuid() == 0 && setgroups(1, &g))) {
die(EXIT_FAILURE, "couldn't setgid to %u: %s",
(unsigned)g, strerror(errno));
}
}
die(EXIT_FAILURE, "couldn't setgid to %u: %s",
(unsigned)g, strerror(errno));
}
}
if (setuid(u)) {
die(EXIT_FAILURE, "couldn't setuid to %u: %s",
(unsigned)u, strerror(errno));
if (setuid(u)) {
die(EXIT_FAILURE, "couldn't setuid to %u: %s",
(unsigned)u, strerror(errno));
- {
- struct timeval tv;
- tv.tv_sec = time(0) + T_INTERVAL;
- tv.tv_usec = 0;
- sel_addtimer(&sel, &it, &tv, interval, 0);
- }
+ tv.tv_sec = time(0) + T_INTERVAL;
+ tv.tv_usec = 0;
+ sel_addtimer(&sel, &it, &tv, interval, 0);
- {
- int selerr = 0;
- for (;;) {
- if (!sel_select(&sel))
- selerr = 0;
- else if (errno != EINTR && errno != EAGAIN) {
- a_warn("select failed: %s", strerror(errno));
- selerr++;
- if (selerr > 8) {
- a_warn("too many select errors: bailing out");
- a_quit();
- }
+ for (;;) {
+ if (!sel_select(&sel))
+ selerr = 0;
+ else if (errno != EINTR && errno != EAGAIN) {
+ a_warn("SERVER", "select-error", "?ERRNO", A_END);
+ selerr++;
+ if (selerr > 8) {
+ a_warn("ABORT", "repeated-select-errors", A_END);
+ abort();