d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename ipv4/ipv6 to tcp4/tcp6.

Browse Source 
MFC after:	3 weeks
This commit is contained in:
pjd 2011-05-20 11:15:27 +00:00
parent fadabb377a
commit 65d1a6f181
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/hastd/hast.h
View File

@ -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. */

16
sbin/hastd/parse.y
View File

@ -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 {