- djm@cvs.openbsd.org 2010/11/13 23:27:51

     [clientloop.c misc.c misc.h packet.c packet.h readconf.c readconf.h]
     [servconf.c servconf.h session.c ssh.c ssh_config.5 sshd_config.5]
     allow ssh and sshd to set arbitrary TOS/DSCP/QoS values instead of
     hardcoding lowdelay/throughput.

     bz#1733 patch from philipp AT redfish-solutions.com; ok markus@ deraadt@

1 files changed, 55 insertions, 1 deletions

diff --git a/misc.c b/misc.c
index ff09becf9..b88f5aaa8 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.82 2010/09/24 13:33:00 matthew Exp $ */
+/* $OpenBSD: misc.c,v 1.83 2010/11/13 23:27:50 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
@@ -38,6 +38,8 @@
 #include <unistd.h>
 
 #include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
 #include <netinet/tcp.h>
 
 #include <errno.h>
@@ -913,6 +915,58 @@ bandwidth_limit(struct bwlimit *bw, size_t read_len)
         bw->lamt = 0;
         gettimeofday(&bw->bwstart, NULL);
 }
+
+static const struct {
+        const char *name;
+        int value;
+} ipqos[] = {
+        { "af11", IPTOS_DSCP_AF11 },
+        { "af12", IPTOS_DSCP_AF12 },
+        { "af13", IPTOS_DSCP_AF13 },
+        { "af14", IPTOS_DSCP_AF21 },
+        { "af22", IPTOS_DSCP_AF22 },
+        { "af23", IPTOS_DSCP_AF23 },
+        { "af31", IPTOS_DSCP_AF31 },
+        { "af32", IPTOS_DSCP_AF32 },
+        { "af33", IPTOS_DSCP_AF33 },
+        { "af41", IPTOS_DSCP_AF41 },
+        { "af42", IPTOS_DSCP_AF42 },
+        { "af43", IPTOS_DSCP_AF43 },
+        { "cs0", IPTOS_DSCP_CS0 },
+        { "cs1", IPTOS_DSCP_CS1 },
+        { "cs2", IPTOS_DSCP_CS2 },
+        { "cs3", IPTOS_DSCP_CS3 },
+        { "cs4", IPTOS_DSCP_CS4 },
+        { "cs5", IPTOS_DSCP_CS5 },
+        { "cs6", IPTOS_DSCP_CS6 },
+        { "cs7", IPTOS_DSCP_CS7 },
+        { "ef", IPTOS_DSCP_EF },
+        { "lowdelay", IPTOS_LOWDELAY },
+        { "throughput", IPTOS_THROUGHPUT },
+        { "reliability", IPTOS_RELIABILITY },
+        { NULL, -1 }
+};
+
+int
+parse_ipqos(const char *cp)
+{
+        u_int i;
+        char *ep;
+        long val;
+
+        if (cp == NULL)
+                return -1;
+        for (i = 0; ipqos[i].name != NULL; i++) {
+                if (strcasecmp(cp, ipqos[i].name) == 0)
+                        return ipqos[i].value;
+        }
+        /* Try parsing as an integer */
+        val = strtol(cp, &ep, 0);
+        if (*cp == '\0' || *ep != '\0' || val < 0 || val > 255)
+                return -1;
+        return val;
+}
+
 void
 sock_set_v6only(int s)
 {