diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-02-21 15:07:53 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-02-21 15:07:53 +0100 |
| commit | 38cb400e33520d3c6305a730014b578d185c1526 (patch) | |
| tree | bfd9f565d99b4a81411b1a7594d054651754234d /scripts/IceGridUtil.py | |
| parent | Another build system fix for cppflags/ldflags (diff) | |
| download | ice-38cb400e33520d3c6305a730014b578d185c1526.tar.bz2 ice-38cb400e33520d3c6305a730014b578d185c1526.tar.xz ice-38cb400e33520d3c6305a730014b578d185c1526.zip | |
Don't use the loopback interface on Linux for multicast
Diffstat (limited to 'scripts/IceGridUtil.py')
| -rw-r--r-- | scripts/IceGridUtil.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py index 7fd689e085c..a60de105794 100644 --- a/scripts/IceGridUtil.py +++ b/scripts/IceGridUtil.py @@ -143,7 +143,6 @@ class IceGridRegistry(ProcessFromBinDir, Server): 'IceGrid.Registry.Server.Endpoints' : 'default', 'IceGrid.Registry.Internal.Endpoints' : 'default', 'IceGrid.Registry.Client.Endpoints' : self.getEndpoints(current), - 'IceGrid.Registry.Discovery.Interface' : '"::1"' if current.config.ipv6 else '', 'IceGrid.Registry.Discovery.Port' : current.driver.getTestPort(99), 'IceGrid.Registry.SessionManager.Endpoints' : 'default', 'IceGrid.Registry.AdminSessionManager.Endpoints' : 'default', @@ -159,6 +158,10 @@ class IceGridRegistry(ProcessFromBinDir, Server): 'IceGrid.Registry.DefaultTemplates' : '"' + os.path.abspath(os.path.join(toplevel, "cpp", "config", "templates.xml")) + '"' } + + if current.config.ipv6 and not isinstance(platform, Linux): + props['IceGrid.Registry.Discovery.Interface'] = '::1' + return props def getEndpoints(self, current): |