summaryrefslogtreecommitdiff
path: root/ACE
diff options
context:
space:
mode:
authorvzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-10-13 14:38:52 +0000
committervzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-10-13 14:38:52 +0000
commite08f559df4ae35b1067ad0a573a3aaff79b51de9 (patch)
tree0cf45976f0a0b794b73bd2254fbf05e62c487b6f /ACE
parentfd31f6bb146a0ef4a9f60380323955ebdcc2ec08 (diff)
downloadATCD-e08f559df4ae35b1067ad0a573a3aaff79b51de9.tar.gz
ChangeLogTag: Mon Oct 13 14:23:06 UTC 2008 Vladimir Zykov <vzykov@prismtech.com>
Diffstat (limited to 'ACE')
-rw-r--r--ACE/ChangeLog9
-rw-r--r--ACE/ace/config-linux-common.h7
-rw-r--r--ACE/bin/tao_other_tests.lst4
3 files changed, 20 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index f9fd61fcfd2..2d14e37df3c 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,12 @@
+Mon Oct 13 14:23:06 UTC 2008 Vladimir Zykov <vzykov@prismtech.com>
+
+ * ace/config-linux-common.h:
+ * bin/tao_other_tests.lst:
+
+ Added 3 defines to reflect a difference of Linux in setting
+ IP_MULTICAST_TTL and IP(V6)_MULTICAST_LOOP. This is required by
+ Bug#3444. Added a test for Bug#3444.
+
Mon Oct 13 13:21:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
* rpmbuild/ace-tao-ciao.txt:
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
index c3d709c3645..b93118d999d 100644
--- a/ACE/ace/config-linux-common.h
+++ b/ACE/ace/config-linux-common.h
@@ -398,6 +398,13 @@
#define ACE_HAS_ICMP_SUPPORT 1
+// According to man pages Linux uses different (compared to UNIX systems) types
+// for setting IP_MULTICAST_TTL and IPV6_MULTICAST_LOOP / IP_MULTICAST_LOOP
+// in setsockopt/getsockopt.
+#define ACE_HAS_IP_MULTICAST_TTL_AS_INT 1
+#define ACE_HAS_IPV6_MULTICAST_LOOP_AS_BOOL 1
+#define ACE_HAS_IP_MULTICAST_LOOP_AS_INT 1
+
#if defined (ACE_LACKS_NETWORKING)
# include "ace/config-posix-nonetworking.h"
#else
diff --git a/ACE/bin/tao_other_tests.lst b/ACE/bin/tao_other_tests.lst
index 31de82bdfb0..19224014167 100644
--- a/ACE/bin/tao_other_tests.lst
+++ b/ACE/bin/tao_other_tests.lst
@@ -179,6 +179,10 @@ TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl: !ST !NO_MESSAGING !MINIMUM !C
TAO/orbsvcs/tests/Bug_2925_Regression/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !VxWorks !VxWorks_RTP
TAO/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl: IPV6 !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !VxWorks !VxWorks_RTP
TAO/orbsvcs/tests/Bug_2377_Regression/run_test_ipv6.pl: IPV6 !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !VxWorks !VxWorks_RTP
+TAO/orbsvcs/tests/Bug_3444_Regression/run_test.pl: !NO_DIOP !CORBA_E_MICRO !VxWorks !VxWorks_RTP
+TAO/orbsvcs/tests/Bug_3444_Regression/run_test.pl --sciop: SCTP !CORBA_E_MICRO !VxWorks !VxWorks_RTP
+TAO/orbsvcs/tests/Bug_3444_Regression/run_test_ipv6.pl: !NO_DIOP !CORBA_E_MICRO !VxWorks !VxWorks_RTP
+TAO/orbsvcs/tests/Bug_3444_Regression/run_test_ipv6.pl --sciop: SCTP !CORBA_E_MICRO !VxWorks !VxWorks_RTP
TAO/examples/PluggableUDP/tests/SimplePerformance/run_test_ipv6.pl: IPV6 !QNX !NO_DIOP !ACE_FOR_TAO
TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl: !QNX !NO_DIOP !ACE_FOR_TAO
TAO/examples/PluggableUDP/tests/Performance/run_test.pl: !QNX !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_COMPACT !CORBA_E_MICRO