summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-04-13 18:55:52 +0000
committerMarc Laukien <marc@zeroc.com>2002-04-13 18:55:52 +0000
commit8e0274821a2486544876451d6fb24e2010c47867 (patch)
tree03b72e9862abd3ee1f4468e42f06bd60da12ef6a /cpp
parentbug fix (diff)
downloadice-8e0274821a2486544876451d6fb24e2010c47867.tar.bz2
ice-8e0274821a2486544876451d6fb24e2010c47867.tar.xz
ice-8e0274821a2486544876451d6fb24e2010c47867.zip
fix
Diffstat (limited to 'cpp')
-rw-r--r--cpp/demo/Ice/callback/config16
-rw-r--r--cpp/src/Ice/UdpTransceiver.cpp4
2 files changed, 16 insertions, 4 deletions
diff --git a/cpp/demo/Ice/callback/config b/cpp/demo/Ice/callback/config
index be76bde6c41..a70541b59e0 100644
--- a/cpp/demo/Ice/callback/config
+++ b/cpp/demo/Ice/callback/config
@@ -6,7 +6,19 @@ Ice.Trace.Network=1
Ice.Trace.Protocol=1
Ice.ConnectionWarnings=1
+#Ice.SSL.Client.CertPath=../../../certs
+#Ice.SSL.Client.Config=sslconfig.xml
+#Ice.SSL.Server.CertPath=../../../certs
+#Ice.SSL.Server.Config=sslconfig.xml
+
+Glacier.Router.Endpoints=default -p 10005
+Glacier.Client.Endpoints=tcp:udp -c#:ssl
+Glacier.Server.Endpoints=tcp:udp#:ssl
+Glacier.Trace.Client=2
+Glacier.Trace.Server=2
+Glacier.Trace.RoutingTable=1
+
# Uncomment the following lines if you want to run this demo with Glacier
-Ice.DefaultRouter=Glacier/router:default -h 66.92.73.247 -p 10005
-Ice.Adapter.CallbackReceiverAdapter.Router=Glacier/router:default -h 66.92.73.247 -p 10005
+Ice.DefaultRouter=Glacier/router:default -p 10005
+Ice.Adapter.CallbackReceiverAdapter.Router=Glacier/router:default -p 10005
Ice.Adapter.CallbackReceiverAdapter.Endpoints=
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index e5b74f31dbd..decb65b3acd 100644
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -177,7 +177,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s
try
{
_fd = createSocket(true);
- setBlock(_fd, false);
+ setBlock(_fd, true);
getAddress(host, port, _addr);
doConnect(_fd, _addr, -1);
_connect = false; // We're connected now
@@ -207,7 +207,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s
try
{
_fd = createSocket(true);
- setBlock(_fd, false);
+ setBlock(_fd, true);
getAddress(host, port, _addr);
doBind(_fd, _addr);