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

make nameserver port configurable

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2009-02-18 12:04:35 +01:00
parent 8ac7cd78c2
commit bba48f8d3a
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/DnsHandler.py
View File

@ -15,11 +15,12 @@ class LocalDnsHandlerException(Exception):
Exception.__init__(self, msg) Exception.__init__(self, msg)
class DnsHandler(threading.Thread): class DnsHandler(threading.Thread):
def __init__(self, msgQueue, dnsDummy, tsigKey, nsAddress, ttl, actionlogDir): def __init__(self, msgQueue, dnsDummy, tsigKey, nsAddress, nsPort, ttl, actionlogDir):
threading.Thread.__init__(self) threading.Thread.__init__(self)
self.msgQueue = msgQueue self.msgQueue = msgQueue
self.dnsDummy = dnsDummy self.dnsDummy = dnsDummy
self.nsAddress = nsAddress self.nsAddress = nsAddress
self.nsPort = nsPort
self.ttl = ttl self.ttl = ttl
self.keyring = dns.tsigkeyring.from_text(tsigKey) self.keyring = dns.tsigkeyring.from_text(tsigKey)
self.actionlogDir = actionlogDir self.actionlogDir = actionlogDir
@ -53,7 +54,7 @@ class DnsHandler(threading.Thread):
rr = dns.rdtypes.IN.A.A(dns.rdataclass.IN, dns.rdatatype.A, address) rr = dns.rdtypes.IN.A.A(dns.rdataclass.IN, dns.rdatatype.A, address)
u = dns.update.Update(zone, keyring=self.keyring) u = dns.update.Update(zone, keyring=self.keyring)
u.add(name, self.ttl, rr) u.add(name, self.ttl, rr)
r = dns.query.tcp(u, self.nsAddress) r = dns.query.tcp(u, self.nsAddress, port=self.nsPort)
rc = r.rcode() rc = r.rcode()
if rc != 0: if rc != 0:
@ -66,7 +67,7 @@ class DnsHandler(threading.Thread):
# send A-RR deletion for ip to DNS server # send A-RR deletion for ip to DNS server
u = dns.update.Update(zone, keyring=self.keyring) u = dns.update.Update(zone, keyring=self.keyring)
u.delete(name) u.delete(name)
r = dns.query.tcp(u, self.nsAddress) r = dns.query.tcp(u, self.nsAddress, port=self.nsPort)
rc = r.rcode() rc = r.rcode()
if rc != 0: if rc != 0:

13
server/yadyn
View File

@ -24,14 +24,15 @@ EVENT_LIFE_TIME = 300
NULL_ADDRESS = '0.0.0.0' NULL_ADDRESS = '0.0.0.0'
TTL = 120 TTL = 120
EXPIRY_PERIOD = 300 EXPIRY_PERIOD = 300
NAMESERVER = '88.198.170.2' NAMESERVER = '127.0.0.1'
NAMESERVER_PORT = 5300
TSIGKEY = { "yadyn." : "+xLH8GuZnEgBljuIEM/iDA==" } TSIGKEY = { "yadyn." : "+xLH8GuZnEgBljuIEM/iDA==" }
PID_FILE = "/var/db/yadyn/yadyn.pid" PID_FILE = "/tmp/yadyn/yadyn.pid"
ENTRIES_FILE = "/var/db/yadyn/entries" ENTRIES_FILE = "/tmp/yadyn/entries"
ACTIONLOG_DIR = "/var/db/yadyn/actionlog" ACTIONLOG_DIR = "/tmp/yadyn/actionlog"
ADMIN_PWD = 'test123' ADMIN_PWD = 'test123'
DNS_DUMMY = False DNS_DUMMY = False
DEBUG = False DEBUG = True
@ -68,7 +69,7 @@ try:
dynHandler.start() dynHandler.start()
Logger.debug("DynHandler started") Logger.debug("DynHandler started")
dnsHandler = DnsHandler.DnsHandler(dnsq, DNS_DUMMY, TSIGKEY, NAMESERVER, TTL, ACTIONLOG_DIR) dnsHandler = DnsHandler.DnsHandler(dnsq, DNS_DUMMY, TSIGKEY, NAMESERVER, NAMESERVER_PORT, TTL, ACTIONLOG_DIR)
dnsHandler.start() dnsHandler.start()
Logger.debug("DnsHandler started") Logger.debug("DnsHandler started")