Standarize the ToS option across nc/ping/traceroute so that they'll

accept the same values as pf.conf. It accepts decimal, hexadecimal and
the dscp/tos keywords. The ping option was ripped of in SMALL.

ok mcbride@ sthen@

2 files changed, 77 insertions, 28 deletions

diff --git a/src/usr.bin/nc/nc.1 b/src/usr.bin/nc/nc.1
index f9bd5b153e..6a1538cb45 100644
--- a/src/usr.bin/nc/nc.1
+++ b/src/usr.bin/nc/nc.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: nc.1,v 1.57 2011/01/09 22:16:46 jeremy Exp $
+.\"     $OpenBSD: nc.1,v 1.58 2011/09/17 14:10:05 haesbaert Exp $
 .\"
 .\" Copyright (c) 1996 David Sacerdote
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 9 2011 $
+.Dd $Mdocdate: September 17 2011 $
 .Dt NC 1
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Op Fl P Ar proxy_username
 .Op Fl p Ar source_port
 .Op Fl s Ar source
-.Op Fl T Ar ToS
+.Op Fl T Ar toskeyword
 .Op Fl V Ar rtable
 .Op Fl w Ar timeout
 .Op Fl X Ar proxy_protocol
@@ -164,14 +164,21 @@ to create and use so that datagrams can be received.
 It is an error to use this option in conjunction with the
 .Fl l
 option.
-.It Fl T Ar ToS
-Specifies IP Type of Service (ToS) for the connection.
-Valid values are the tokens
-.Dq lowdelay ,
-.Dq throughput ,
-.Dq reliability ,
-or an 8-bit hexadecimal value preceded by
-.Dq 0x .
+.It Fl T Ar toskeyword
+Change IPv4 TOS value.
+.Ar toskeyword
+may be one of
+.Ar critical ,
+.Ar inetcontrol ,
+.Ar lowdelay ,
+.Ar netcontrol ,
+.Ar throughput ,
+.Ar reliability ,
+or one of the DiffServ Code Points:
+.Ar ef ,
+.Ar af11 ... af43 ,
+.Ar cs0 ... cs7 ;
+or a number in either hex or decimal.
 .It Fl t
 Causes
 .Nm
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c
index a5f5745f3a..952bfb7dda 100644
--- a/src/usr.bin/nc/netcat.c
+++ b/src/usr.bin/nc/netcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.101 2011/06/21 17:31:07 mikeb Exp $ */
+/* $OpenBSD: netcat.c,v 1.102 2011/09/17 14:10:05 haesbaert Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
  *
@@ -105,7 +105,7 @@ int	unix_bind(char *);
 int     unix_connect(char *);
 int     unix_listen(char *);
 void    set_common_sockopts(int);
-int     parse_iptos(char *);
+int     map_tos(char *, int *);
 void    usage(int);
 
 int
@@ -234,7 +234,18 @@ main(int argc, char *argv[])
                         Sflag = 1;
                         break;
                 case 'T':
-                        Tflag = parse_iptos(optarg);
+                        errstr = NULL;
+                        errno = 0;
+                        if (map_tos(optarg, &Tflag))
+                                break;
+                        if (strlen(optarg) > 1 && optarg[0] == '0' &&
+                            optarg[1] == 'x')
+                                Tflag = (int)strtol(optarg, NULL, 16);
+                        else
+                                Tflag = (int)strtonum(optarg, 0, 255,
+                                    &errstr);
+                        if (Tflag < 0 || Tflag > 255 || errstr || errno)
+                                errx(1, "illegal tos value %s", optarg);
                         break;
                 default:
                         usage(1);
@@ -874,20 +885,51 @@ set_common_sockopts(int s)
 }
 
 int
-parse_iptos(char *s)
+map_tos(char *s, int *val)
 {
-        int tos = -1;
-
-        if (strcmp(s, "lowdelay") == 0)
-                return (IPTOS_LOWDELAY);
-        if (strcmp(s, "throughput") == 0)
-                return (IPTOS_THROUGHPUT);
-        if (strcmp(s, "reliability") == 0)
-                return (IPTOS_RELIABILITY);
-
-        if (sscanf(s, "0x%x", &tos) != 1 || tos < 0 || tos > 0xff)
-                errx(1, "invalid IP Type of Service");
-        return (tos);
+        /* DiffServ Codepoints and other TOS mappings */
+        const struct toskeywords {
+                const char      *keyword;
+                int              val;
+        } *t, toskeywords[] = {
+                { "af11",               IPTOS_DSCP_AF11 },
+                { "af12",               IPTOS_DSCP_AF12 },
+                { "af13",               IPTOS_DSCP_AF13 },
+                { "af21",               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 },
+                { "critical",           IPTOS_PREC_CRITIC_ECP },
+                { "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 },
+                { "inetcontrol",        IPTOS_PREC_INTERNETCONTROL },
+                { "lowdelay",           IPTOS_LOWDELAY },
+                { "netcontrol",         IPTOS_PREC_NETCONTROL },
+                { "reliability",        IPTOS_RELIABILITY },
+                { "throughput",         IPTOS_THROUGHPUT },
+                { NULL,                 -1 },
+        };
+
+        for (t = toskeywords; t->keyword != NULL; t++) {
+                if (strcmp(s, t->keyword) == 0) {
+                        *val = t->val;
+                        return (1);
+                }
+        }
+
+        return (0);
 }
 
 void
@@ -911,7 +953,7 @@ help(void)
         \t-r            Randomize remote ports\n\
         \t-S            Enable the TCP MD5 signature option\n\
         \t-s addr\t     Local source address\n\
-        \t-T ToS\t      Set IP Type of Service\n\
+        \t-T toskeyword\tSet IP Type of Service\n\
         \t-t            Answer TELNET negotiation\n\
         \t-U            Use UNIX domain socket\n\
         \t-u            UDP mode\n\