Browse files

*** empty log message ***

  • Loading branch information...
1 parent eb546d8 commit 4616ab2b4484c4493b0093ae369f8ff3f4f67d0a massie committed Feb 3, 2005
Showing with 12 additions and 6 deletions.
  1. +2 −2 monitor-core/configure.in
  2. +4 −0 monitor-core/gmond/conf.pod
  3. +6 −4 monitor-core/lib/apr_net.c
View
4 monitor-core/configure.in
@@ -39,8 +39,8 @@ AC_CONFIG_AUX_DIR(config)
# GANGLIA_MINOR_VERSION and GANGLIA_MICRO_VERSION
# to 0 (zero)
GANGLIA_RELEASE_NAME="Kittyhawk"
-GANGLIA_MAJOR_VERSION=2
-GANGLIA_MINOR_VERSION=6
+GANGLIA_MAJOR_VERSION=3
+GANGLIA_MINOR_VERSION=0
GANGLIA_MICRO_VERSION=0
# If we are releasing a snapshot (beta), set GANGLIA_SNAPSHOT to "yes"
View
4 monitor-core/gmond/conf.pod
@@ -199,6 +199,8 @@ B<inet6> for a particular port, explicitly state it with the following:
}
If you specify a bind address, the family of that address takes precedence.
+f your IPv6 stack doesn't support IPV6_V6ONLY, a warning will be issued
+but gmond will continue working (this should rarely happen).
Multicast Note: for multicast, specifying a B<bind> address that equals the B<mcast_join>
address will prevent unicast UDP messages to the same B<port> from being
@@ -243,6 +245,8 @@ B<inet6> for a particular port, explicitly state it with the following:
}
If you specify a bind address, the family of that address takes precedence.
+If your IPv6 stack doesn't support IPV6_V6ONLY, a warning will be issued
+but gmond will continue working (this should rarely happen).
The B<interface> is not implemented at this time (use B<bind>).
View
10 monitor-core/lib/apr_net.c
@@ -145,11 +145,13 @@ create_net_server(apr_pool_t *context, int32_t ofamily, int type, apr_port_t por
int one = 1;
/* Don't accept IPv4 connections on an IPv6 listening socket */
stat = apr_socket_opt_set(sock, APR_IPV6_V6ONLY, one);
- if (stat != APR_SUCCESS && stat != APR_ENOTIMPL)
+ if(stat == APR_ENOTIMPL)
{
- apr_socket_close(sock);
- return NULL;
- }
+ fprintf(stderr,"Warning: your operating system does not support IPV6_V6ONLY!\n");
+ fprintf(stderr,"This means that you are also listening to IPv4 traffic on port %d\n",
+ port);
+ fprintf(stderr,"This IPv6=>IPv4 mapping may be a security risk.\n");
+ }
}
#endif

0 comments on commit 4616ab2

Please sign in to comment.