summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cs/src/Ice/ConnectionFactory.cs5
-rwxr-xr-xcs/src/Ice/EndpointI.cs2
-rwxr-xr-xcs/src/Ice/ObjectAdapterI.cs3
-rw-r--r--cs/src/Ice/PropertyNames.cs12
-rwxr-xr-xcs/src/Ice/TcpEndpointI.cs2
-rwxr-xr-xcs/src/Ice/UdpEndpointI.cs2
-rwxr-xr-xcs/src/Ice/UnknownEndpointI.cs2
-rwxr-xr-xcs/src/IceSSL/AcceptorI.cs8
-rwxr-xr-xcs/src/IceSSL/ConnectorI.cs2
-rwxr-xr-xcs/src/IceSSL/EndpointI.cs4
-rwxr-xr-xcs/src/IceSSL/Util.cs16
11 files changed, 40 insertions, 18 deletions
diff --git a/cs/src/Ice/ConnectionFactory.cs b/cs/src/Ice/ConnectionFactory.cs
index 48b550639b7..258590cb27c 100644
--- a/cs/src/Ice/ConnectionFactory.cs
+++ b/cs/src/Ice/ConnectionFactory.cs
@@ -855,7 +855,8 @@ namespace IceInternal
return _acceptor.ToString();
}
- public IncomingConnectionFactory(Instance instance, EndpointI endpoint, Ice.ObjectAdapter adapter)
+ public IncomingConnectionFactory(Instance instance, EndpointI endpoint, Ice.ObjectAdapter adapter,
+ string adapterName)
: base(instance)
{
_endpoint = endpoint;
@@ -914,7 +915,7 @@ namespace IceInternal
else
{
h = _endpoint;
- _acceptor = _endpoint.acceptor(ref h);
+ _acceptor = _endpoint.acceptor(ref h, adapterName);
_endpoint = h;
Debug.Assert(_acceptor != null);
_acceptor.listen();
diff --git a/cs/src/Ice/EndpointI.cs b/cs/src/Ice/EndpointI.cs
index 91a114b1861..08aaf846cae 100755
--- a/cs/src/Ice/EndpointI.cs
+++ b/cs/src/Ice/EndpointI.cs
@@ -116,7 +116,7 @@ namespace IceInternal
// from this endpoint, for example, if a dynamic port number is
// assigned.
//
- public abstract Acceptor acceptor(ref EndpointI endpoint);
+ public abstract Acceptor acceptor(ref EndpointI endpoint, string adapterName);
//
// Expand endpoint out in to separate endpoints for each local
diff --git a/cs/src/Ice/ObjectAdapterI.cs b/cs/src/Ice/ObjectAdapterI.cs
index b6e48d4a767..77082ff9042 100755
--- a/cs/src/Ice/ObjectAdapterI.cs
+++ b/cs/src/Ice/ObjectAdapterI.cs
@@ -827,7 +827,8 @@ namespace Ice
for(int i = 0; i < endpoints.Count; ++i)
{
IceInternal.EndpointI endp = (IceInternal.EndpointI)endpoints[i];
- _incomingConnectionFactories.Add(new IceInternal.IncomingConnectionFactory(instance, endp, this));
+ _incomingConnectionFactories.Add(
+ new IceInternal.IncomingConnectionFactory(instance, endp, this, _name));
}
//
diff --git a/cs/src/Ice/PropertyNames.cs b/cs/src/Ice/PropertyNames.cs
index 8cd9e2643cd..ed0ad751e5b 100644
--- a/cs/src/Ice/PropertyNames.cs
+++ b/cs/src/Ice/PropertyNames.cs
@@ -7,7 +7,7 @@
//
// **********************************************************************
-// Generated by makeprops.py from file `../config/PropertyNames.def', Wed May 24 12:10:31 2006
+// Generated by makeprops.py from file `/Users/matthew/cvs/ice/config/PropertyNames.def', Mon Jun 5 13:01:35 2006
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -242,6 +242,10 @@ namespace IceInternal
@"^IceSSL\.TruststoreType$",
@"^IceSSL\.VerifyDepthMax$",
@"^IceSSL\.VerifyPeer$",
+ @"^IceSSL\.TrustOnly$",
+ @"^IceSSL\.TrustOnly\.Client$",
+ @"^IceSSL\.TrustOnly\.Server$",
+ @"^IceSSL\.TrustOnly\.Server\.[^\s.]+$",
null
};
@@ -293,9 +297,9 @@ namespace IceInternal
@"^Glacier2\.Client\.Trace\.Override$",
@"^Glacier2\.Client\.Trace\.Reject$",
@"^Glacier2\.Client\.Trace\.Request$",
- @"^Glacier2\.Filter\.Regex\.Reject$",
- @"^Glacier2\.Filter\.Regex\.Accept$",
- @"^Glacier2\.Filter\.Regex\.AcceptOverride$",
+ @"^Glacier2\.Filter\.Address\.Reject$",
+ @"^Glacier2\.Filter\.Address\.Accept$",
+ @"^Glacier2\.Filter\.Address\.AcceptOverride$",
@"^Glacier2\.Filter\.MaxProxyLength$",
@"^Glacier2\.Filter\.Category\.Accept$",
@"^Glacier2\.Filter\.Category\.Reject$",
diff --git a/cs/src/Ice/TcpEndpointI.cs b/cs/src/Ice/TcpEndpointI.cs
index a906b0b4736..f18342179a2 100755
--- a/cs/src/Ice/TcpEndpointI.cs
+++ b/cs/src/Ice/TcpEndpointI.cs
@@ -358,7 +358,7 @@ namespace IceInternal
// from this endpoint, for example, if a dynamic port number is
// assigned.
//
- public override Acceptor acceptor(ref EndpointI endpoint)
+ public override Acceptor acceptor(ref EndpointI endpoint, string adapterName)
{
TcpAcceptor p = new TcpAcceptor(instance_, _host, _port);
endpoint = new TcpEndpointI(instance_, _host, p.effectivePort(), _timeout, _connectionId,
diff --git a/cs/src/Ice/UdpEndpointI.cs b/cs/src/Ice/UdpEndpointI.cs
index fe94511e5dd..58fb69ddd5f 100755
--- a/cs/src/Ice/UdpEndpointI.cs
+++ b/cs/src/Ice/UdpEndpointI.cs
@@ -509,7 +509,7 @@ namespace IceInternal
// from this endpoint, for example, if a dynamic port number is
// assigned.
//
- public override Acceptor acceptor(ref EndpointI endpoint)
+ public override Acceptor acceptor(ref EndpointI endpoint, string adapterName)
{
endpoint = this;
return null;
diff --git a/cs/src/Ice/UnknownEndpointI.cs b/cs/src/Ice/UnknownEndpointI.cs
index ebb27c1f6c3..810c9b1b2aa 100755
--- a/cs/src/Ice/UnknownEndpointI.cs
+++ b/cs/src/Ice/UnknownEndpointI.cs
@@ -160,7 +160,7 @@ namespace IceInternal
// from this endpoint, for example, if a dynamic port number is
// assigned.
//
- public override Acceptor acceptor(ref EndpointI endpoint)
+ public override Acceptor acceptor(ref EndpointI endpoint, string adapterName)
{
endpoint = null;
return null;
diff --git a/cs/src/IceSSL/AcceptorI.cs b/cs/src/IceSSL/AcceptorI.cs
index b2a6f97e656..0aaae071a22 100755
--- a/cs/src/IceSSL/AcceptorI.cs
+++ b/cs/src/IceSSL/AcceptorI.cs
@@ -132,7 +132,7 @@ namespace IceSSL
}
}
- connInfo = Util.populateConnectionInfo(stream, fd, cb.certs);
+ connInfo = Util.populateConnectionInfo(stream, fd, cb.certs, adapterName_, true);
instance_.verifyPeer(connInfo, fd, true);
}
catch(Ice.LocalException ex)
@@ -209,7 +209,7 @@ namespace IceSSL
instance_.traceStream(stream, IceInternal.Network.fdToString(fd));
}
- return new TransceiverI(instance_, fd, stream, connInfo);
+ return new TransceiverI(instance_, fd, stream, connInfo, adapterName_);
}
public virtual void connectToSelf()
@@ -237,9 +237,10 @@ namespace IceSSL
}
internal
- AcceptorI(Instance instance, string host, int port)
+ AcceptorI(Instance instance, string adapterName, string host, int port)
{
instance_ = instance;
+ adapterName_ = adapterName;
logger_ = instance.communicator().getLogger();
backlog_ = 0;
@@ -362,6 +363,7 @@ namespace IceSSL
}
private Instance instance_;
+ private string adapterName_;
private Ice.Logger logger_;
private Socket fd_;
private int backlog_;
diff --git a/cs/src/IceSSL/ConnectorI.cs b/cs/src/IceSSL/ConnectorI.cs
index 53df2f6c006..3db47449f4b 100755
--- a/cs/src/IceSSL/ConnectorI.cs
+++ b/cs/src/IceSSL/ConnectorI.cs
@@ -78,7 +78,7 @@ namespace IceSSL
}
}
- connInfo = Util.populateConnectionInfo(stream, fd, cb.certs);
+ connInfo = Util.populateConnectionInfo(stream, fd, cb.certs, "", false);
instance_.verifyPeer(connInfo, fd, false);
}
catch(Ice.LocalException ex)
diff --git a/cs/src/IceSSL/EndpointI.cs b/cs/src/IceSSL/EndpointI.cs
index d1688e626c6..38c7982d282 100755
--- a/cs/src/IceSSL/EndpointI.cs
+++ b/cs/src/IceSSL/EndpointI.cs
@@ -357,9 +357,9 @@ namespace IceSSL
// from this endpoint, for example, if a dynamic port number is
// assigned.
//
- public override IceInternal.Acceptor acceptor(ref IceInternal.EndpointI endpoint)
+ public override IceInternal.Acceptor acceptor(ref IceInternal.EndpointI endpoint, string adapterName)
{
- AcceptorI p = new AcceptorI(instance_, host_, port_);
+ AcceptorI p = new AcceptorI(instance_, adapterName, host_, port_);
endpoint = new EndpointI(instance_, host_, p.effectivePort(), timeout_, connectionId_, compress_, publish_);
return p;
}
diff --git a/cs/src/IceSSL/Util.cs b/cs/src/IceSSL/Util.cs
index 55be3d88661..3888f4351d3 100755
--- a/cs/src/IceSSL/Util.cs
+++ b/cs/src/IceSSL/Util.cs
@@ -41,6 +41,18 @@ namespace IceSSL
// The remote TCP/IP host & port.
//
public System.Net.IPEndPoint remoteAddr;
+
+ //
+ // If the connection is incoming this bool is true, false
+ // otherwise.
+ //
+ public bool incoming;
+
+ //
+ // The name of the object adapter that hosts this endpoint, if
+ // any.
+ //
+ public string adapterName;
}
public class ConnectionInvalidException : Ice.LocalException
@@ -171,13 +183,15 @@ namespace IceSSL
internal static ConnectionInfo
populateConnectionInfo(System.Net.Security.SslStream stream, System.Net.Sockets.Socket fd,
- X509Certificate2[] certs)
+ X509Certificate2[] certs, string adapterName, bool incoming)
{
ConnectionInfo info = new ConnectionInfo();
info.certs = certs;
info.cipher = stream.CipherAlgorithm.ToString();
info.localAddr = (System.Net.IPEndPoint)fd.LocalEndPoint;
info.remoteAddr = (System.Net.IPEndPoint)fd.RemoteEndPoint;
+ info.incoming = incoming;
+ info.adapterName = adapterName;
return info;
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 17:35:09 +0000