wn/yadyn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some changes

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2009-02-19 10:58:56 +01:00
parent bba48f8d3a
commit beba6a5806
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/d/yadynd.d
View File

@ -6,10 +6,10 @@ import std.md5;
void main() { void main() {
const char[] DYN_ID = "omega"; const char[] DYN_ID = "test";
const char[] SHARED_SECRET = "0m3g@"; const char[] SHARED_SECRET = "geheim";
const char[] SERVER_IP = "88.198.170.2"; const char[] SERVER_IP = "172.16.2.1";
const int SERVER_PORT = 8053; const int SERVER_PORT = 8053;

1
server/Entry.py
View File

@ -1,4 +1,3 @@
class Entry(object): class Entry(object):
def __init__(self, dynid, sharedSecret, name, zone): def __init__(self, dynid, sharedSecret, name, zone):
self.dynid = dynid self.dynid = dynid

23
server/HttpCmdReceiver.py
View File

@ -18,9 +18,10 @@ class HttpCmdHandler(BaseHTTPServer.BaseHTTPRequestHandler):
server_version = "YadynCMDHTTP/1.0" server_version = "YadynCMDHTTP/1.0"
@classmethod @classmethod
def setClassParams(cls, entries, adminPwd): def setClassParams(cls, entries, adminPwd, dnsq):
cls.entries = entries cls.entries = entries
cls.adminPwd = adminPwd cls.adminPwd = adminPwd
cls.dnsq = dnsq
def do_GET(self): def do_GET(self):
Logger.log("Request: %s" % self.path) Logger.log("Request: %s" % self.path)
@ -34,6 +35,10 @@ class HttpCmdHandler(BaseHTTPServer.BaseHTTPRequestHandler):
Logger.log("Cmd: " + cmd) Logger.log("Cmd: " + cmd)
if cmd == 'register': if cmd == 'register':
self.register(c) self.register(c)
elif cmd == 'start':
self.start(c)
elif cmd == 'stop':
self.stop(c)
else: else:
raise LocalException('unknown cmd') raise LocalException('unknown cmd')
@ -61,6 +66,18 @@ class HttpCmdHandler(BaseHTTPServer.BaseHTTPRequestHandler):
newEntry = Entry.Entry(dynid, sharedSecret, subdomain, zone) newEntry = Entry.Entry(dynid, sharedSecret, subdomain, zone)
HttpCmdHandler.entries[dynid] = newEntry HttpCmdHandler.entries[dynid] = newEntry
def start(self, c):
try:
dynId = c['dynid'][0]
sharedSecret = c['sharedsecret'][0]
except KeyError, e:
raise LocalException('Parameter missing: ' + str(e))
if not Event.entries.has_key(self.dynid):
raise IllegalEventException("unknown dynid in event %s" % str(self))
entry = Event.entries[self.dynid]
class HttpCmdServer(SocketServer.ThreadingTCPServer): class HttpCmdServer(SocketServer.ThreadingTCPServer):
def __init__(self, serverAddr): def __init__(self, serverAddr):
@ -69,10 +86,10 @@ class HttpCmdServer(SocketServer.ThreadingTCPServer):
class HttpCmdReceiver(threading.Thread): class HttpCmdReceiver(threading.Thread):
def __init__(self, httpCmdRecvAddr, entries, adminPwd): def __init__(self, httpCmdRecvAddr, entries, adminPwd, dnsq):
threading.Thread.__init__(self) threading.Thread.__init__(self)
self.httpCmdRecvAddr = httpCmdRecvAddr self.httpCmdRecvAddr = httpCmdRecvAddr
HttpCmdHandler.setClassParams(entries, adminPwd) HttpCmdHandler.setClassParams(entries, adminPwd, dnsq)
self.setDaemon(True) self.setDaemon(True)
def run(self): def run(self):

2
server/yadyn
View File

@ -89,7 +89,7 @@ try:
xmlRpcReceiver.start() xmlRpcReceiver.start()
Logger.debug("XmlRpcReceiver started") Logger.debug("XmlRpcReceiver started")
httpCmdReceiver = HttpCmdReceiver.HttpCmdReceiver(("", 8025), entries, ADMIN_PWD) httpCmdReceiver = HttpCmdReceiver.HttpCmdReceiver(("", 8025), entries, ADMIN_PWD, dnsq)
httpCmdReceiver.start() httpCmdReceiver.start()
Logger.debug("httpCmdReceiver started") Logger.debug("httpCmdReceiver started")