===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tcpbench/tcpbench.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/tcpbench/tcpbench.c	2009/12/11 17:20:50	1.16
--- src/usr.bin/tcpbench/tcpbench.c	2010/07/03 04:44:51	1.17
***************
*** 56,62 ****
  sig_atomic_t done = 0;
  sig_atomic_t proc_slice = 0;
  
! static u_int  rdomain;
  static char **kflag;
  static size_t Bflag;
  static int    Sflag;
--- 56,62 ----
  sig_atomic_t done = 0;
  sig_atomic_t proc_slice = 0;
  
! static u_int  rtableid;
  static char **kflag;
  static size_t Bflag;
  static int    Sflag;
***************
*** 137,145 ****
  	fprintf(stderr,
  	    "usage: tcpbench -l\n"
  	    "       tcpbench [-v] [-B buf] [-k kvars] [-n connections] [-p port]\n"
! 	    "                [-r rate] [-S space] [-V rdomain] hostname\n"
  	    "       tcpbench -s [-v] [-B buf] [-k kvars] [-p port]\n"
! 	    "                [-r rate] [-S space] [-V rdomain]\n");
  	exit(1);
  }
  
--- 137,145 ----
  	fprintf(stderr,
  	    "usage: tcpbench -l\n"
  	    "       tcpbench [-v] [-B buf] [-k kvars] [-n connections] [-p port]\n"
! 	    "                [-r rate] [-S space] [-V rtable] hostname\n"
  	    "       tcpbench -s [-v] [-B buf] [-k kvars] [-p port]\n"
! 	    "                [-r rate] [-S space] [-V rtable]\n");
  	exit(1);
  }
  
***************
*** 552,563 ****
  				warn("socket");
  			continue;
  		}
! 		if (rdomain && ai->ai_family == AF_INET) {
! 			if (setsockopt(sock, IPPROTO_IP, SO_RDOMAIN,
! 			    &rdomain, sizeof(rdomain)) == -1)
! 				err(1, "setsockopt SO_RDOMAIN");
! 		} else if (rdomain)
! 			warnx("rdomain only supported on AF_INET");
  		if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
  		    &on, sizeof(on)) == -1)
  			warn("reuse port");
--- 552,563 ----
  				warn("socket");
  			continue;
  		}
! 		if (rtableid && ai->ai_family == AF_INET) {
! 			if (setsockopt(sock, IPPROTO_IP, SO_RTABLE,
! 			    &rtableid, sizeof(rtableid)) == -1)
! 				err(1, "setsockopt SO_RTABLE");
! 		} else if (rtableid)
! 			warnx("rtable only supported on AF_INET");
  		if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
  		    &on, sizeof(on)) == -1)
  			warn("reuse port");
***************
*** 757,768 ****
  					warn("socket");
  				continue;
  			}
! 			if (rdomain && ai->ai_family == AF_INET) {
! 				if (setsockopt(sock, IPPROTO_IP, SO_RDOMAIN,
! 				    &rdomain, sizeof(rdomain)) == -1)
! 					err(1, "setsockopt SO_RDOMAIN");
! 			} else if (rdomain)
! 				warnx("rdomain only supported on AF_INET");
  			if (Sflag) {
  				if (setsockopt(sock, SOL_SOCKET, SO_SNDBUF,
  				    &Sflag, sizeof(Sflag)) == -1)
--- 757,768 ----
  					warn("socket");
  				continue;
  			}
! 			if (rtableid && ai->ai_family == AF_INET) {
! 				if (setsockopt(sock, IPPROTO_IP, SO_RTABLE,
! 				    &rtableid, sizeof(rtableid)) == -1)
! 					err(1, "setsockopt SO_RTABLE");
! 			} else if (rtableid)
! 				warnx("rtable only supported on AF_INET");
  			if (Sflag) {
  				if (setsockopt(sock, SOL_SOCKET, SO_SNDBUF,
  				    &Sflag, sizeof(Sflag)) == -1)
***************
*** 891,897 ****
  	int nconn = 1;
  
  	Bflag = DEFAULT_BUF;
! 	Sflag = sflag = vflag = rdomain = 0;
  	kflag = NULL;
  	rflag = DEFAULT_STATS_INTERVAL;
  
--- 891,897 ----
  	int nconn = 1;
  
  	Bflag = DEFAULT_BUF;
! 	Sflag = sflag = vflag = rtableid = 0;
  	kflag = NULL;
  	rflag = DEFAULT_STATS_INTERVAL;
  
***************
*** 937,946 ****
  			vflag++;
  			break;
  		case 'V':
! 			rdomain = (unsigned int)strtonum(optarg, 0,
  			    RT_TABLEID_MAX, &errstr);
  			if (errstr)
! 				errx(1, "rdomain value is %s: %s",
  				    errstr, optarg);
  			break;
  		case 'n':
--- 937,946 ----
  			vflag++;
  			break;
  		case 'V':
! 			rtableid = (unsigned int)strtonum(optarg, 0,
  			    RT_TABLEID_MAX, &errstr);
  			if (errstr)
! 				errx(1, "rtable value is %s: %s",
  				    errstr, optarg);
  			break;
  		case 'n':