From owner-svn-ports-all@FreeBSD.ORG  Tue Oct 23 22:20:16 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 70883EDE;
 Tue, 23 Oct 2012 22:20:16 +0000 (UTC) (envelope-from zi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 58F018FC0C;
 Tue, 23 Oct 2012 22:20:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9NMKGtp070410;
 Tue, 23 Oct 2012 22:20:16 GMT (envelope-from zi@svn.freebsd.org)
Received: (from zi@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9NMKGhN070407;
 Tue, 23 Oct 2012 22:20:16 GMT (envelope-from zi@svn.freebsd.org)
Message-Id: <201210232220.q9NMKGhN070407@svn.freebsd.org>
From: Ryan Steinmetz <zi@FreeBSD.org>
Date: Tue, 23 Oct 2012 22:20:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r306333 - in head/net/mosh: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Oct 2012 22:20:16 -0000

Author: zi
Date: Tue Oct 23 22:20:15 2012
New Revision: 306333
URL: http://svn.freebsd.org/changeset/ports/306333

Log:
  - Fix calls to setsockopt.
  - Bump PORTREVISION
  
  Submitted by:	Jimmy Olgeni <olgeni@FreeBSD.org>, Bryan Drewery <bdrewery@freebsd.org>
  Obtained from:	Upstream github repo
  Feature safe:	yes

Added:
  head/net/mosh/files/
  head/net/mosh/files/patch-src__network__network.cc   (contents, props changed)
Modified:
  head/net/mosh/Makefile

Modified: head/net/mosh/Makefile
==============================================================================
--- head/net/mosh/Makefile	Tue Oct 23 21:16:56 2012	(r306332)
+++ head/net/mosh/Makefile	Tue Oct 23 22:20:15 2012	(r306333)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mosh
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://cloud.github.com/downloads/keithw/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/

Added: head/net/mosh/files/patch-src__network__network.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/mosh/files/patch-src__network__network.cc	Tue Oct 23 22:20:15 2012	(r306333)
@@ -0,0 +1,18 @@
+--- ./src/network/network.cc.orig	2012-10-19 15:45:18.000000000 -0400
++++ ./src/network/network.cc	2012-10-23 18:15:42.000000000 -0400
+@@ -158,13 +158,13 @@
+ 
+   /* set diffserv values to AF42 + ECT */
+   uint8_t dscp = 0x92;
+-  if ( setsockopt( _fd, IPPROTO_IP, IP_TOS, &dscp, 1) < 0 ) {
++  if ( setsockopt( _fd, IPPROTO_IP, IP_TOS, &dscp, sizeof (dscp)) < 0 ) {
+     //    perror( "setsockopt( IP_TOS )" );
+   }
+ 
+   /* request explicit congestion notification on received datagrams */
+ #ifdef HAVE_IP_RECVTOS
+-  char tosflag = true;
++  int tosflag = true;
+   socklen_t tosoptlen = sizeof( tosflag );
+   if ( setsockopt( _fd, IPPROTO_IP, IP_RECVTOS, &tosflag, tosoptlen ) < 0 ) {
+     perror( "setsockopt( IP_RECVTOS )" );