1 files changed, 25 insertions, 13 deletions

diff --git a/regress/netcat.c b/regress/netcat.c
index fe94dd908..d583176f1 100644
--- a/regress/netcat.c
+++ b/regress/netcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.126 2014/10/30 16:08:31 tedu Exp $ */
+/* $OpenBSD: netcat.c,v 1.131 2015/09/03 23:06:28 sobrado Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
  *
@@ -44,14 +44,15 @@
 #include <netinet/ip.h>
 
 #include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
 #include <netdb.h>
+#include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <fcntl.h>
-#include <limits.h>
 #include "atomicio.h"
 
 #ifdef HAVE_POLL_H
@@ -133,7 +134,7 @@ int	udptest(int);
 int     unix_bind(char *);
 int     unix_connect(char *);
 int     unix_listen(char *);
-void    set_common_sockopts(int);
+void    set_common_sockopts(int, int);
 int     map_tos(char *, int *);
 void    report_connect(const struct sockaddr *, socklen_t);
 void    usage(int);
@@ -162,6 +163,8 @@ main(int argc, char *argv[])
         uport = NULL;
         sv = NULL;
 
+        signal(SIGPIPE, SIG_IGN);
+
         while ((ch = getopt(argc, argv,
             "46DdFhI:i:klNnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
                 switch (ch) {
@@ -648,7 +651,7 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
                         freeaddrinfo(ares);
                 }
 
-                set_common_sockopts(s);
+                set_common_sockopts(s, res0->ai_family);
 
                 if (timeout_connect(s, res0->ai_addr, res0->ai_addrlen) == 0)
                         break;
@@ -748,7 +751,7 @@ local_listen(char *host, char *port, struct addrinfo hints)
                 if (ret == -1)
                         err(1, "setsockopt SO_REUSEADDR");
 #endif
-                set_common_sockopts(s);
+                set_common_sockopts(s, res0->ai_family);
 
                 if (bind(s, (struct sockaddr *)res0->ai_addr,
                     res0->ai_addrlen) == 0)
@@ -1034,17 +1037,17 @@ fdpass(int nfd)
 
         bzero(&pfd, sizeof(pfd));
         pfd.fd = STDOUT_FILENO;
+        pfd.events = POLLOUT;
         for (;;) {
                 r = sendmsg(STDOUT_FILENO, &msg, 0);
                 if (r == -1) {
                         if (errno == EAGAIN || errno == EINTR) {
-                                pfd.events = POLLOUT;
                                 if (poll(&pfd, 1, -1) == -1)
                                         err(1, "poll");
                                 continue;
                         }
                         err(1, "sendmsg");
-                } else if (r == -1)
+                } else if (r != 1)
                         errx(1, "sendmsg: unexpected return value %zd", r);
                 else
                         break;
@@ -1168,7 +1171,7 @@ udptest(int s)
 }
 
 void
-set_common_sockopts(int s)
+set_common_sockopts(int s, int af)
 {
         int x = 1;
 
@@ -1184,10 +1187,19 @@ set_common_sockopts(int s)
                         &x, sizeof(x)) == -1)
                         err(1, "setsockopt");
         }
-#ifdef IP_TOS
+#if defined(IP_TOS) && defined(IPV6_TCLASS)
         if (Tflag != -1) {
-                if (setsockopt(s, IPPROTO_IP, IP_TOS,
-                    &Tflag, sizeof(Tflag)) == -1)
+                int proto, option;
+
+                if (af == AF_INET6) {
+                        proto = IPPROTO_IPV6;
+                        option = IPV6_TCLASS;
+                } else {
+                        proto = IPPROTO_IP;
+                        option = IP_TOS;
+                }
+
+                if (setsockopt(s, proto, option, &Tflag, sizeof(Tflag)) == -1)
                         err(1, "set IP ToS");
         }
 #endif
@@ -1321,7 +1333,7 @@ usage(int ret)
 {
         fprintf(stderr,
             "usage: nc [-46DdFhklNnrStUuvz] [-I length] [-i interval] [-O length]\n"
-            "\t  [-P proxy_username] [-p source_port] [-s source] [-T ToS]\n"
+            "\t  [-P proxy_username] [-p source_port] [-s source] [-T toskeyword]\n"
             "\t  [-V rtable] [-w timeout] [-X proxy_protocol]\n"
             "\t  [-x proxy_address[:port]] [destination] [port]\n");
         if (ret)