sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

Check interfaces: when reading the public addresses file to create the vnn list

Browse Source 
check that the actual interface exist, print error and fail startup if the interface does not exist.

(This used to be ctdb commit cd33bbe6454b7b0316bdfffbd06c67b29779e873)
This commit is contained in:
Ronnie Sahlberg 2011-09-06 16:11:00 +10:00
parent a3e0079568
commit 64378fea58
5 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ctdb/common/system_aix.c
View File

@ -357,4 +357,8 @@ int ctdb_sys_read_tcp_packet(int s, void *private_data,
}
bool ctdb_sys_check_iface_exists(const char *iface)
{
return true;
}

2
ctdb/common/system_common.c
View File

@ -73,3 +73,5 @@ bool ctdb_sys_have_ip(ctdb_sock_addr *_addr)
close(s);
return ret == 0;
}

22
ctdb/common/system_linux.c
View File

@ -537,3 +537,25 @@ int ctdb_sys_read_tcp_packet(int s, void *private_data,
}
bool ctdb_sys_check_iface_exists(const char *iface)
{
int s;
struct ifreq ifr;
s = socket(PF_PACKET, SOCK_RAW, 0);
if (s == -1){
/* We dont know if the interface exists, so assume yes */
DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket\n"));
return true;
}
strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name));
if (ioctl(s, SIOCGIFINDEX, &ifr) < 0 && errno == ENODEV) {
DEBUG(DEBUG_CRIT,(__location__ " interface '%s' not found\n", iface));
close(s);
return false;
}
close(s);
return true;
}

1
ctdb/include/ctdb_private.h
View File

@ -1111,6 +1111,7 @@ int ctdb_ctrl_set_iface_link(struct ctdb_context *ctdb,
uint32_t uint16_checksum(uint16_t *data, size_t n);
int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface);
bool ctdb_sys_have_ip(ctdb_sock_addr *addr);
bool ctdb_sys_check_iface_exists(const char *iface);
int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
const ctdb_sock_addr *src,
uint32_t seq, uint32_t ack, int rst);

10
ctdb/server/ctdb_takeover.c
View File

@ -880,6 +880,16 @@ static int ctdb_add_public_address(struct ctdb_context *ctdb,
int i;
int ret;
tmp = talloc_strdup(vnn, ifaces);
for (iface = strtok(tmp, ","); iface; iface = strtok(NULL, ",")) {
if (!ctdb_sys_check_iface_exists(iface)) {
DEBUG(DEBUG_CRIT,("Interface %s does not exist. Can not add public-address : %s\n", iface, ctdb_addr_to_str(addr)));
talloc_free(tmp);
return -1;
}
}
talloc_free(tmp);
/* Verify that we dont have an entry for this ip yet */
for (vnn=ctdb->vnn;vnn;vnn=vnn->next) {
if (ctdb_same_sockaddr(addr, &vnn->public_address)) {