From owner-cvs-src-old@FreeBSD.ORG  Thu Apr 29 15:36:45 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E29011065793
	for <cvs-src-old@freebsd.org>; Thu, 29 Apr 2010 15:36:45 +0000 (UTC)
	(envelope-from pjd@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CF44D8FC24
	for <cvs-src-old@freebsd.org>; Thu, 29 Apr 2010 15:36:45 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3TFajPm025487
	for <cvs-src-old@freebsd.org>; Thu, 29 Apr 2010 15:36:45 GMT
	(envelope-from pjd@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3TFajGn025486
	for cvs-src-old@freebsd.org; Thu, 29 Apr 2010 15:36:45 GMT
	(envelope-from pjd@repoman.freebsd.org)
Message-Id: <201004291536.o3TFajGn025486@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	pjd@repoman.freebsd.org using -f
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Thu, 29 Apr 2010 15:36:32 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sbin/hastd hast.conf.5 hast.h hastd.c parse.y
 primary.c proto.c proto.h proto_common.c secondary.c token.l
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Apr 2010 15:36:46 -0000

pjd         2010-04-29 15:36:32 UTC

  FreeBSD src repository

  Modified files:
    sbin/hastd           hast.conf.5 hast.h hastd.c parse.y 
                         primary.c proto.c proto.h proto_common.c 
                         secondary.c token.l 
  Log:
  SVN rev 207371 on 2010-04-29 15:36:32Z by pjd
  
  Fix a problem where hastd will stuck in recv(2) after sending request to
  secondary, which died between send(2) and recv(2). Do it by adding timeout
  to recv(2) for primary incoming and outgoing sockets and secondary outgoing
  socket.
  
  Reported by:    Mikolaj Golub <to.my.trociny@gmail.com>
  Tested by:      Mikolaj Golub <to.my.trociny@gmail.com>
  MFC after:      3 days
  
  Revision  Changes    Path
  1.2       +7 -0      src/sbin/hastd/hast.conf.5
  1.2       +3 -0      src/sbin/hastd/hast.h
  1.5       +4 -0      src/sbin/hastd/hastd.c
  1.2       +31 -1     src/sbin/hastd/parse.y
  1.5       +6 -0      src/sbin/hastd/primary.c
  1.2       +26 -0     src/sbin/hastd/proto.c
  1.2       +1 -0      src/sbin/hastd/proto.h
  1.2       +2 -2      src/sbin/hastd/proto_common.c
  1.2       +6 -0      src/sbin/hastd/secondary.c
  1.2       +1 -0      src/sbin/hastd/token.l