NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-27 10:58:37 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Don't handle ip without host names in reverse DNS

Browse Source
This commit is contained in:
rdujardin 2016-07-26 11:28:31 +02:00
parent 89a0049532
commit 5282eee5ce
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
netbox/ipam/models.py
View File

@ -361,21 +361,22 @@ class Prefix(CreatedUpdatedModel):
ipaddresses = IPAddress.objects.filter(family=4) ipaddresses = IPAddress.objects.filter(family=4)
for ip in ipaddresses: for ip in ipaddresses:
ibytes = str(ip.address).split('/')[0].split('.') if ip.hostname:
islash = str(ip.address).split('/')[1] ibytes = str(ip.address).split('/')[0].split('.')
i = netaddr.IPAddress(unicode('.'.join(ibytes))) islash = str(ip.address).split('/')[1]
i = netaddr.IPAddress(unicode('.'.join(ibytes)))
if i in p: if i in p:
if zslash == 24: if zslash == 24:
zone_id = ibytes[2] + '.' + ibytes[1] + '.' + ibytes[0] + '.in-addr.arpa.' zone_id = ibytes[2] + '.' + ibytes[1] + '.' + ibytes[0] + '.in-addr.arpa.'
if not zone_id in zones: if not zone_id in zones:
zones[zone_id] = header(zone_id) zones[zone_id] = header(zone_id)
zones[zone_id] += ibytes[3].ljust(3) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' zones[zone_id] += ibytes[3].ljust(3) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n'
else: else:
zone_id = ibytes[1]+'.'+ibytes[0]+'.in-addr.arpa.' zone_id = ibytes[1]+'.'+ibytes[0]+'.in-addr.arpa.'
if not zone_id in zones: if not zone_id in zones:
zones[zone_id] = header(zone_id) zones[zone_id] = header(zone_id)
zones[zone_id] += (ibytes[3]+'.'+ibytes[2]).ljust(7) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' zones[zone_id] += (ibytes[3]+'.'+ibytes[2]).ljust(7) + ' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n'
@ -388,17 +389,18 @@ class Prefix(CreatedUpdatedModel):
zslash = pslash if pslash % 16 == 0 else pslash/16+16 zslash = pslash if pslash % 16 == 0 else pslash/16+16
for ip in ipaddresses: for ip in ipaddresses:
ifull = str(ipaddress.IPv6Address(unicode(str(ip.address).split('/')[0])).exploded) if ip.hostname:
inibbles = ifull.split(':') ifull = str(ipaddress.IPv6Address(unicode(str(ip.address).split('/')[0])).exploded)
idigits = ifull.replace(':','')[::-1] inibbles = ifull.split(':')
islash = int(str(ip.address).split('/')[1]) idigits = ifull.replace(':','')[::-1]
islash = int(str(ip.address).split('/')[1])
pdigitszone = pdigits[:zslash/4][::-1] pdigitszone = pdigits[:zslash/4][::-1]
zone_id = '.'.join(pdigitszone)+'.ip6.arpa.' zone_id = '.'.join(pdigitszone)+'.ip6.arpa.'
if not zone_id in zones: if not zone_id in zones:
zones[zone_id] = header(zone_id) zones[zone_id] = header(zone_id)
zones[zone_id] += ('.'.join(idigits[:32-zslash/4])).ljust(30)+' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n' zones[zone_id] += ('.'.join(idigits[:32-zslash/4])).ljust(30)+' IN PTR ' + ip.hostname.ljust(40) + ' ; ' + ip.description.ljust(20) + ' ; gen by netbox ( '+time.strftime('%A %B %d %Y %H:%M:%S',time.localtime())+' ) \n'
for z in zones: for z in zones: