sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00
Code Activity

Fix bug 5697 nmbd spins in reload_interfaces when only loopback has an IPv4 address

Browse Source 
reported by Ted Percival <ted@midg3t.net>.
Jeremy.
(This used to be commit ab06efccf3)
This commit is contained in:
Jeremy Allison
2008-08-19 17:30:30 -07:00
parent 477e6bb40d
commit f23a6b7c93
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/proto.h
View File

@ -623,7 +623,7 @@ bool is_local_net(const struct sockaddr_storage *from);
void setup_linklocal_scope_id(struct sockaddr_storage *pss);
bool is_local_net_v4(struct in_addr from);
int iface_count(void);
int iface_count_v4(void);
int iface_count_v4_nl(void);
const struct in_addr *first_ipv4_iface(void);
struct interface *get_interface(int n);
const struct sockaddr_storage *iface_n_sockaddr_storage(int n);

7
source3/lib/interface.c
View File

@ -131,15 +131,18 @@ int iface_count(void)
}
/****************************************************************************
How many interfaces do we have (v4 only) ?
How many non-loopback IPv4 interfaces do we have ?
**************************************************************************/
int iface_count_v4(void)
int iface_count_v4_nl(void)
{
int ret = 0;
struct interface *i;
for (i=local_interfaces;i;i=i->next) {
if (is_loopback_addr(&i->ip)) {
continue;
}
if (i->ip.ss_family == AF_INET) {
ret++;
}

4
source3/nmbd/nmbd.c
View File

@ -296,8 +296,8 @@ static void reload_interfaces(time_t t)
BlockSignals(false, SIGTERM);
/* We only count IPv4 interfaces here. */
while (iface_count_v4() == 0 && !got_sig_term) {
/* We only count IPv4, non-loopback interfaces here. */
while (iface_count_v4_nl() == 0 && !got_sig_term) {
sleep(5);
load_interfaces();
}

11
source3/nmbd/nmbd_subnetdb.c
View File

@ -195,19 +195,20 @@ struct subnet_record *make_normal_subnet(const struct interface *iface)
bool create_subnets(void)
{
/* We only count IPv4 interfaces whilst we're waiting. */
int num_interfaces = iface_count_v4();
int num_interfaces;
int i;
struct in_addr unicast_ip, ipzero;
try_interfaces_again:
if (iface_count_v4() == 0) {
DEBUG(0,("create_subnets: No local interfaces !\n"));
/* Only count IPv4, non-loopback interfaces. */
if (iface_count_v4_nl() == 0) {
DEBUG(0,("create_subnets: No local IPv4 non-loopback interfaces !\n"));
DEBUG(0,("create_subnets: Waiting for an interface to appear ...\n"));
}
/* We only count IPv4 interfaces here. */
while (iface_count_v4() == 0) {
/* We only count IPv4, non-loopback interfaces here. */
while (iface_count_v4_nl() == 0) {
void (*saved_handler)(int);
/*