- djm@cvs.openbsd.org 2009/11/20 00:54:01

[openssh.git] / misc.c

diff --git a/misc.c b/misc.c
index 01986e8c12cd5425a0f87ec6650955f3fce2a731..f0f1fd8416e7981f969f42dda448e74e16bd154e 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.68 2008/06/12 20:38:28 dtucker Exp $ */
+/* $OpenBSD: misc.c,v 1.72 2009/10/28 16:38:18 reyk Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
@@ -151,6 +151,43 @@ set_nodelay(int fd)
                error("setsockopt TCP_NODELAY: %.100s", strerror(errno));
 }
 
+/* open a socket in the specified routing domain */
+int
+socket_rdomain(int domain, int type, int protocol, int rdomain)
+{
+       int sock, ipproto = IPPROTO_IP;
+
+       if ((sock = socket(domain, type, protocol)) == -1)
+               return (-1);
+
+       if (rdomain == -1)
+               return (sock);
+       
+       switch (domain) {
+       case AF_INET6:
+               ipproto = IPPROTO_IPV6;
+               /* FALLTHROUGH */
+       case AF_INET:
+               debug2("socket %d af %d setting rdomain %d",
+                   sock, domain, rdomain);
+               if (setsockopt(sock, ipproto, SO_RDOMAIN, &rdomain,
+                   sizeof(rdomain)) == -1) {
+                       debug("setsockopt SO_RDOMAIN: %.100s",
+                           strerror(errno));
+                       close(sock);
+                       return (-1);
+               }
+               break;
+       default:
+               debug("socket %d af %d does not support rdomain %d",
+                   sock, domain, rdomain);
+               close(sock);
+               return (-1);
+       }
+
+       return (sock);
+}
+
 /* Characters considered whitespace in strsep calls. */
 #define WHITESPACE " \t\r\n"
 #define QUOTE  "\""
@@ -221,23 +258,19 @@ pwcopy(struct passwd *pw)
 
 /*
  * Convert ASCII string to TCP/IP port number.
- * Port must be >0 and <=65535.
- * Return 0 if invalid.
+ * Port must be >=0 and <=65535.
+ * Return -1 if invalid.
  */
 int
 a2port(const char *s)
 {
-       long port;
-       char *endp;
-
-       errno = 0;
-       port = strtol(s, &endp, 0);
-       if (s == endp || *endp != '\0' ||
-           (errno == ERANGE && (port == LONG_MIN || port == LONG_MAX)) ||
-           port <= 0 || port > 65535)
-               return 0;
+       long long port;
+       const char *errstr;
 
-       return port;
+       port = strtonum(s, 0, 65535, &errstr);
+       if (errstr != NULL)
+               return -1;
+       return (int)port;
 }
 
 int
@@ -534,7 +567,7 @@ tilde_expand_filename(const char *filename, uid_t uid)
                if ((pw = getpwnam(user)) == NULL)
                        fatal("tilde_expand_filename: No such user %s", user);
        } else if ((pw = getpwuid(uid)) == NULL)        /* ~/path */
-               fatal("tilde_expand_filename: No such uid %d", uid);
+               fatal("tilde_expand_filename: No such uid %ld", (long)uid);
 
        if (strlcpy(ret, pw->pw_dir, sizeof(ret)) >= sizeof(ret))
                fatal("tilde_expand_filename: Path too long");
@@ -718,7 +751,8 @@ sanitise_stdfd(void)
        int nullfd, dupfd;
 
        if ((nullfd = dupfd = open(_PATH_DEVNULL, O_RDWR)) == -1) {
-               fprintf(stderr, "Couldn't open /dev/null: %s", strerror(errno));
+               fprintf(stderr, "Couldn't open /dev/null: %s\n",
+                   strerror(errno));
                exit(1);
        }
        while (++dupfd <= 2) {
@@ -726,7 +760,7 @@ sanitise_stdfd(void)
                if (fcntl(dupfd, F_GETFL, 0) >= 0)
                        continue;
                if (dup2(nullfd, dupfd) == -1) {
-                       fprintf(stderr, "dup2: %s", strerror(errno));
+                       fprintf(stderr, "dup2: %s\n", strerror(errno));
                        exit(1);
                }
        }
@@ -852,3 +886,14 @@ ms_to_timeval(struct timeval *tv, int ms)
        tv->tv_usec = (ms % 1000) * 1000;
 }
 
+void
+sock_set_v6only(int s)
+{
+#ifdef IPV6_V6ONLY
+       int on = 1;
+
+       debug3("%s: set socket %d IPV6_V6ONLY", __func__, s);
+       if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) == -1)
+               error("setsockopt IPV6_V6ONLY: %s", strerror(errno));
+#endif
+}