diff options
| author | pjd <pjd@FreeBSD.org> | 2011-05-20 11:15:27 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2011-05-20 11:15:27 +0000 |
| commit | 65d1a6f181cbd79b0bc49fd90460671cb28d2091 (patch) | |
| tree | 6c7e9f209cdab28579791587e332fac93f8b69cd /sbin/hastd | |
| parent | fadabb377af6a4de411acfea06b2c0bb6a3579aa (diff) | |
| download | FreeBSD-src-65d1a6f181cbd79b0bc49fd90460671cb28d2091.zip FreeBSD-src-65d1a6f181cbd79b0bc49fd90460671cb28d2091.tar.gz | |
Rename ipv4/ipv6 to tcp4/tcp6.
MFC after: 3 weeks
Diffstat (limited to 'sbin/hastd')
| -rw-r--r-- | sbin/hastd/hast.h | 4 | ||||
| -rw-r--r-- | sbin/hastd/parse.y | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sbin/hastd/hast.h b/sbin/hastd/hast.h index 6768d4c..3f26162 100644 --- a/sbin/hastd/hast.h +++ b/sbin/hastd/hast.h @@ -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. */ diff --git a/sbin/hastd/parse.y b/sbin/hastd/parse.y index 221df50..7a725fe 100644 --- a/sbin/hastd/parse.y +++ b/sbin/hastd/parse.y @@ -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 exitonerror) 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 exitonerror) 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 exitonerror) 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 { |
