- stevesk@cvs.openbsd.org 2009/12/29 16:38:41

[openssh.git] / misc.c

diff --git a/misc.c b/misc.c
index 8b303f16f7720f4a4cb5e344394a627f5bacb6a7..d4bdfc0eae5c2410b70e434746d5d853383c602a 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.69 2008/06/13 01:38:23 dtucker Exp $ */
+/* $OpenBSD: misc.c,v 1.74 2009/12/25 19:40:21 stevesk 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,31 @@ 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;
+       long long port;
+       const char *errstr;
 
-       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;
+       port = strtonum(s, 0, 65535, &errstr);
+       if (errstr != NULL)
+               return -1;
+       return (int)port;
+}
+
+int
+a2rdomain(const char *s)
+{
+       long long rdomain;
+       const char *errstr;
 
-       return port;
+       rdomain = strtonum(s, 0, RT_TABLEID_MAX, &errstr);
+       if (errstr != NULL)
+               return -1;
+       return (int)rdomain;
 }
 
 int
@@ -564,11 +609,11 @@ char *
 percent_expand(const char *string, ...)
 {
 #define EXPAND_MAX_KEYS        16
+       u_int num_keys, i, j;
        struct {
                const char *key;
                const char *repl;
        } keys[EXPAND_MAX_KEYS];
-       u_int num_keys, i, j;
        char buf[4096];
        va_list ap;
 
@@ -580,13 +625,12 @@ percent_expand(const char *string, ...)
                        break;
                keys[num_keys].repl = va_arg(ap, char *);
                if (keys[num_keys].repl == NULL)
-                       fatal("percent_expand: NULL replacement");
+                       fatal("%s: NULL replacement", __func__);
        }
+       if (num_keys == EXPAND_MAX_KEYS && va_arg(ap, char *) != NULL)
+               fatal("%s: too many keys", __func__);
        va_end(ap);
 
-       if (num_keys >= EXPAND_MAX_KEYS)
-               fatal("percent_expand: too many keys");
-
        /* Expand string */
        *buf = '\0';
        for (i = 0; *string != '\0'; string++) {
@@ -594,23 +638,24 @@ percent_expand(const char *string, ...)
  append:
                        buf[i++] = *string;
                        if (i >= sizeof(buf))
-                               fatal("percent_expand: string too long");
+                               fatal("%s: string too long", __func__);
                        buf[i] = '\0';
                        continue;
                }
                string++;
+               /* %% case */
                if (*string == '%')
                        goto append;
                for (j = 0; j < num_keys; j++) {
                        if (strchr(keys[j].key, *string) != NULL) {
                                i = strlcat(buf, keys[j].repl, sizeof(buf));
                                if (i >= sizeof(buf))
-                                       fatal("percent_expand: string too long");
+                                       fatal("%s: string too long", __func__);
                                break;
                        }
                }
                if (j >= num_keys)
-                       fatal("percent_expand: unknown key %%%c", *string);
+                       fatal("%s: unknown key %%%c", __func__, *string);
        }
        return (xstrdup(buf));
 #undef EXPAND_MAX_KEYS
@@ -718,7 +763,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 +772,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 +898,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
+}