Skip to content

Commit

Permalink
Fix treatment of link local ipv6 addresses: set the scope id.
Browse files Browse the repository at this point in the history 
metze / Michael

Signed-off-by: Michael Adam <[email protected]>

(This used to be ctdb commit 9d12de1ca6107801dada927729e755c0949d73bf)
  • Loading branch information
@obnoxxx
obnoxxx committed Jan 19, 2009
1 parent b6828ab commit 3cca0f7
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 20 deletions.
16 changes: 10 additions & 6 deletions ctdb/common/ctdb_util.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ bool parse_ipv4(const char *s, unsigned port, struct sockaddr_in *sin)
return true;
}

static bool parse_ipv6(const char *s, unsigned port, ctdb_sock_addr *saddr)
static bool parse_ipv6(const char *s, const char *iface, unsigned port, ctdb_sock_addr *saddr)
{
saddr->ip6.sin6_family = AF_INET6;
saddr->ip6.sin6_port = htons(port);
Expand All @@ -393,6 +393,10 @@ static bool parse_ipv6(const char *s, unsigned port, ctdb_sock_addr *saddr)
return false;
}

if (iface && IN6_IS_ADDR_LINKLOCAL(&saddr->ip6.sin6_addr)) {
saddr->ip6.sin6_scope_id = if_nametoindex(iface);
}

return true;
}
/*
Expand Down Expand Up @@ -431,7 +435,7 @@ bool parse_ip_port(const char *addr, ctdb_sock_addr *saddr)


/* now is this a ipv4 or ipv6 address ?*/
ret = parse_ip(s, addr);
ret = parse_ip(s, NULL, addr);

talloc_free(tmp_ctx);
return ret;
Expand All @@ -440,7 +444,7 @@ bool parse_ip_port(const char *addr, ctdb_sock_addr *saddr)
/*
parse an ip
*/
bool parse_ip(const char *addr, ctdb_sock_addr *saddr)
bool parse_ip(const char *addr, const char *iface, ctdb_sock_addr *saddr)
{
char *p;
bool ret;
Expand All @@ -450,7 +454,7 @@ bool parse_ip(const char *addr, ctdb_sock_addr *saddr)
if (p == NULL) {
ret = parse_ipv4(addr, 0, &saddr->ip);
} else {
ret = parse_ipv6(addr, 0, saddr);
ret = parse_ipv6(addr, iface, 0, saddr);
}

return ret;
Expand All @@ -459,7 +463,7 @@ bool parse_ip(const char *addr, ctdb_sock_addr *saddr)
/*
parse a ip/mask pair
*/
bool parse_ip_mask(const char *str, ctdb_sock_addr *addr, unsigned *mask)
bool parse_ip_mask(const char *str, const char *iface, ctdb_sock_addr *addr, unsigned *mask)
{
TALLOC_CTX *tmp_ctx = talloc_new(NULL);
char *s, *p;
Expand Down Expand Up @@ -492,7 +496,7 @@ bool parse_ip_mask(const char *str, ctdb_sock_addr *addr, unsigned *mask)


/* now is this a ipv4 or ipv6 address ?*/
ret = parse_ip(s, addr);
ret = parse_ip(s, iface, addr);

talloc_free(tmp_ctx);
return ret;
Expand Down
4 changes: 2 additions & 2 deletions ctdb/include/ctdb_private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1281,9 +1281,9 @@ int ctdb_ctrl_get_all_tunables(struct ctdb_context *ctdb,

void ctdb_start_freeze(struct ctdb_context *ctdb);

bool parse_ip_mask(const char *s, ctdb_sock_addr *addr, unsigned *mask);
bool parse_ip_mask(const char *s, const char *iface, ctdb_sock_addr *addr, unsigned *mask);
bool parse_ip_port(const char *s, ctdb_sock_addr *addr);
bool parse_ip(const char *s, ctdb_sock_addr *addr);
bool parse_ip(const char *s, const char *iface, ctdb_sock_addr *addr);
bool parse_ipv4(const char *s, unsigned port, struct sockaddr_in *sin);


Expand Down
5 changes: 4 additions & 1 deletion ctdb/server/ctdb_recover.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,10 @@ ctdb_control_getnodemap(struct ctdb_context *ctdb, uint32_t opcode, TDB_DATA ind
node_map = (struct ctdb_node_map *)outdata->dptr;
node_map->num = num_nodes;
for (i=0; i<num_nodes; i++) {
if (parse_ip(ctdb->nodes[i]->address.address, &node_map->nodes[i].addr) == 0) {
if (parse_ip(ctdb->nodes[i]->address.address,
NULL, /* TODO: pass in the correct interface here*/
&node_map->nodes[i].addr) == 0)
{
DEBUG(DEBUG_ERR, (__location__ " Failed to parse %s into a sockaddr\n", ctdb->nodes[i]->address.address));
}

Expand Down
12 changes: 7 additions & 5 deletions ctdb/server/ctdb_takeover.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,7 @@ int ctdb_set_public_addresses(struct ctdb_context *ctdb, const char *alist)
for (i=0;i<nlines;i++) {
unsigned mask;
ctdb_sock_addr addr;
const char *addrstr;
const char *iface;
char *tok, *line;

Expand All @@ -499,11 +500,7 @@ int ctdb_set_public_addresses(struct ctdb_context *ctdb, const char *alist)
continue;
}
tok = strtok(line, " \t");
if (!tok || !parse_ip_mask(tok, &addr, &mask)) {
DEBUG(DEBUG_CRIT,("Badly formed line %u in public address list\n", i+1));
talloc_free(lines);
return -1;
}
addrstr = tok;
tok = strtok(NULL, " \t");
if (tok == NULL) {
if (NULL == ctdb->default_public_interface) {
Expand All @@ -517,6 +514,11 @@ int ctdb_set_public_addresses(struct ctdb_context *ctdb, const char *alist)
iface = tok;
}

if (!addrstr || !parse_ip_mask(addrstr, iface, &addr, &mask)) {
DEBUG(DEBUG_CRIT,("Badly formed line %u in public address list\n", i+1));
talloc_free(lines);
return -1;
}
if (ctdb_add_public_address(ctdb, &addr, mask, iface)) {
DEBUG(DEBUG_CRIT,("Failed to add line %u to the public address list\n", i+1));
talloc_free(lines);
Expand Down
1 change: 1 addition & 0 deletions ctdb/server/ctdbd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ int main(int argc, const char *argv[])
CTDB_NO_MEMORY(ctdb, svnn->iface);

if (parse_ip(options.single_public_ip,
svnn->iface,
&svnn->public_address) == 0) {
DEBUG(DEBUG_ALERT,("Invalid --single-public-ip argument : %s . This is not a valid ip address. Exiting.\n", options.single_public_ip));
exit(10);
Expand Down
2 changes: 1 addition & 1 deletion ctdb/tcp/tcp_connect.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ static void ctdb_node_connect_write(struct event_context *ev, struct fd_event *f
static int ctdb_tcp_get_address(struct ctdb_context *ctdb,
const char *address, ctdb_sock_addr *addr)
{
if (parse_ip(address, addr) == 0) {
if (parse_ip(address, NULL, addr) == 0) {
DEBUG(DEBUG_CRIT, (__location__ " Unparsable address : %s.\n", address));
return -1;
}
Expand Down
10 changes: 5 additions & 5 deletions ctdb/tools/ctdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ static int control_get_tickles(struct ctdb_context *ctdb, int argc, const char *
usage();
}

if (parse_ip(argv[0], &addr) == 0) {
if (parse_ip(argv[0], NULL, &addr) == 0) {
DEBUG(DEBUG_ERR,("Wrongly formed ip address '%s'\n", argv[0]));
return -1;
}
Expand Down Expand Up @@ -574,7 +574,7 @@ static int control_moveip(struct ctdb_context *ctdb, int argc, const char **argv
usage();
}

if (parse_ip(argv[0], &addr) == 0) {
if (parse_ip(argv[0], NULL, &addr) == 0) {
DEBUG(DEBUG_ERR,("Wrongly formed ip address '%s'\n", argv[0]));
return -1;
}
Expand Down Expand Up @@ -809,7 +809,7 @@ static int control_addip(struct ctdb_context *ctdb, int argc, const char **argv)
usage();
}

if (!parse_ip_mask(argv[0], &addr, &mask)) {
if (!parse_ip_mask(argv[0], argv[1], &addr, &mask)) {
DEBUG(DEBUG_ERR, ("Badly formed ip/mask : %s\n", argv[0]));
talloc_free(tmp_ctx);
return -1;
Expand Down Expand Up @@ -950,7 +950,7 @@ static int control_delip(struct ctdb_context *ctdb, int argc, const char **argv)
usage();
}

if (parse_ip(argv[0], &addr) == 0) {
if (parse_ip(argv[0], NULL, &addr) == 0) {
DEBUG(DEBUG_ERR,("Wrongly formed ip address '%s'\n", argv[0]));
return -1;
}
Expand Down Expand Up @@ -1048,7 +1048,7 @@ static int control_gratious_arp(struct ctdb_context *ctdb, int argc, const char
usage();
}

if (!parse_ip(argv[0], &addr)) {
if (!parse_ip(argv[0], NULL, &addr)) {
DEBUG(DEBUG_ERR, ("Bad IP '%s'\n", argv[0]));
return -1;
}
Expand Down

0 comments on commit 3cca0f7

Please sign in to comment.