git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
split the various *Api classes into somethin more sensible
[sfa.git]
/
sfa
/
server
/
threadedserver.py
diff --git
a/sfa/server/threadedserver.py
b/sfa/server/threadedserver.py
index
03ba5b3
..
6dafa0b
100644
(file)
--- a/
sfa/server/threadedserver.py
+++ b/
sfa/server/threadedserver.py
@@
-22,7
+22,7
@@
from sfa.util.cache import Cache
from sfa.trust.certificate import Certificate
from sfa.trust.trustedroots import TrustedRoots
#can we get rid of that ?
from sfa.trust.certificate import Certificate
from sfa.trust.trustedroots import TrustedRoots
#can we get rid of that ?
-from sfa.plc.api import
SfaAPI
+from sfa.plc.api import
PlcSfaApi
##
# Verification callback for pyOpenSSL. We do our own checking of keys because
##
# Verification callback for pyOpenSSL. We do our own checking of keys because
@@
-95,7
+95,7
@@
class SecureXMLRpcRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
try:
peer_cert = Certificate()
peer_cert.load_from_pyopenssl_x509(self.connection.get_peer_certificate())
try:
peer_cert = Certificate()
peer_cert.load_from_pyopenssl_x509(self.connection.get_peer_certificate())
- self.api =
SfaAPI
(peer_cert = peer_cert,
+ self.api =
PlcSfaApi
(peer_cert = peer_cert,
interface = self.server.interface,
key_file = self.server.key_file,
cert_file = self.server.cert_file,
interface = self.server.interface,
key_file = self.server.key_file,
cert_file = self.server.cert_file,