From owner-svn-src-all@FreeBSD.ORG Fri May 20 11:15:27 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C258F1065674; Fri, 20 May 2011 11:15:27 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 97CB68FC1D; Fri, 20 May 2011 11:15:27 +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 p4KBFRm9081657; Fri, 20 May 2011 11:15:27 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4KBFRdM081654; Fri, 20 May 2011 11:15:27 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201105201115.p4KBFRdM081654@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Fri, 20 May 2011 11:15:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222119 - head/sbin/hastd X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 May 2011 11:15:27 -0000 Author: pjd Date: Fri May 20 11:15:27 2011 New Revision: 222119 URL: http://svn.freebsd.org/changeset/base/222119 Log: Rename ipv4/ipv6 to tcp4/tcp6. MFC after: 3 weeks Modified: head/sbin/hastd/hast.h head/sbin/hastd/parse.y Modified: head/sbin/hastd/hast.h ============================================================================== --- head/sbin/hastd/hast.h Fri May 20 11:14:05 2011 (r222118) +++ head/sbin/hastd/hast.h Fri May 20 11:15:27 2011 (r222119) @@ -86,8 +86,8 @@ #define HAST_TIMEOUT 20 #define HAST_CONFIG "/etc/hast.conf" #define HAST_CONTROL "/var/run/hastctl" -#define HASTD_LISTEN_IPV4 "tcp4://0.0.0.0:8457" -#define HASTD_LISTEN_IPV6 "tcp6://[::]:8457" +#define HASTD_LISTEN_TCP4 "tcp4://0.0.0.0:8457" +#define HASTD_LISTEN_TCP6 "tcp6://[::]:8457" #define HASTD_PIDFILE "/var/run/hastd.pid" /* Default extent size. */ Modified: head/sbin/hastd/parse.y ============================================================================== --- head/sbin/hastd/parse.y Fri May 20 11:14:05 2011 (r222118) +++ head/sbin/hastd/parse.y Fri May 20 11:15:27 2011 (r222119) @@ -61,8 +61,8 @@ static struct hast_resource *curres; static bool mynode, hadmynode; static char depth0_control[HAST_ADDRSIZE]; -static char depth0_listen_ipv4[HAST_ADDRSIZE]; -static char depth0_listen_ipv6[HAST_ADDRSIZE]; +static char depth0_listen_tcp4[HAST_ADDRSIZE]; +static char depth0_listen_tcp6[HAST_ADDRSIZE]; static TAILQ_HEAD(, hastd_listen) depth0_listen; static int depth0_replication; static int depth0_checksum; @@ -193,10 +193,10 @@ yy_config_parse(const char *config, bool depth0_compression = HAST_COMPRESSION_HOLE; strlcpy(depth0_control, HAST_CONTROL, sizeof(depth0_control)); TAILQ_INIT(&depth0_listen); - strlcpy(depth0_listen_ipv4, HASTD_LISTEN_IPV4, - sizeof(depth0_listen_ipv4)); - strlcpy(depth0_listen_ipv6, HASTD_LISTEN_IPV6, - sizeof(depth0_listen_ipv6)); + strlcpy(depth0_listen_tcp4, HASTD_LISTEN_TCP4, + sizeof(depth0_listen_tcp4)); + strlcpy(depth0_listen_tcp6, HASTD_LISTEN_TCP6, + sizeof(depth0_listen_tcp6)); depth0_exec[0] = '\0'; lconfig = calloc(1, sizeof(*lconfig)); @@ -250,7 +250,7 @@ yy_config_parse(const char *config, bool exit(EX_TEMPFAIL); return (NULL); } - (void)strlcpy(lst->hl_addr, depth0_listen_ipv4, + (void)strlcpy(lst->hl_addr, depth0_listen_tcp4, sizeof(lst->hl_addr)); TAILQ_INSERT_TAIL(&lconfig->hc_listen, lst, hl_next); } else { @@ -267,7 +267,7 @@ yy_config_parse(const char *config, bool exit(EX_TEMPFAIL); return (NULL); } - (void)strlcpy(lst->hl_addr, depth0_listen_ipv6, + (void)strlcpy(lst->hl_addr, depth0_listen_tcp6, sizeof(lst->hl_addr)); TAILQ_INSERT_TAIL(&lconfig->hc_listen, lst, hl_next); } else {