~ubuntu-branches/ubuntu/gutsy/python-dns/gutsy-security

Viewing changes to DNS/Lib.py

Committer: Bazaar Package Importer
Author(s): Scott Kitterman
Date: 2007-05-11 10:29:03 UTC
Revision ID: james.westby@ubuntu.com-20070511102903-9qyhxe3d4cs5eera

Tags: 2.3.0-6

http://bugs.debian.org/373528

http://bugs.debian.org/326155

http://bugs.debian.org/378991

http://bugs.debian.org/411138

* New maintainer
* Acknowledge NMU, thanks Raphael Hertzog; (closes: #373528).
  - NMU also provided Python 2.4 packages (closes: #326155).
* debian/control:
  - Add Debian Python Modules Team as uploader
  - Update standards version to 3.7.2
  - Update python-support build-depends to version (>= 0.3) and move from
    Indep to build-depends
  - Add XS-Vcs-Svn
  - Removed XS-Python-Version and XB-Python-Version
* debian/pyversions and debian/pycompat added
* Add simple-patchsys.mk to debian/rules
* Bump compat to 5
* BTS Patches:
  - 01resolv-conf-parse patch, thanks to Arnaud Fontaine <arnaud@andesi.org>
    (closes: #378991)
* Changes from Ubuntu (SF = Sourceforge project bug #) (closes: #411138):
  - 02utf-8 patch for files with UTF-8 content
  - 03socket-error-trap patch, Added DNSError trap for socket.error.
  - 04lazy-init SF 1563723 lazy should initilize defaults['server']
  - 05addr2bin2addr SF 863364 Mac OS X, Win2000 DHCP, addr2bin and bin2addr.
  - 06win32-fix SF 1180344 win32dns.py fails on windows server 2003
  - 07unpacker SF 954095 Bug in DNS.Lib.Unpacker.getbyte()
  - 08import-lib SF 658601 Missing "import Lib"; for TCP protocol

Show diffs side-by-side

added added

removed removed

DNS/Lib.py

# -*- encoding: utf-8 -*-

"""

$Id: Lib.py,v 1.11 2002/03/19 13:05:02 anthonybaxter Exp $

from struct import pack as struct_pack

from struct import unpack as struct_unpack

# Sourceforge 863364

from socket import inet_ntoa, inet_aton

def pack16bit(n):

return struct_pack('!H', n)

return struct_unpack('!L', s)[0]

def addr2bin(addr):

# Sourceforge 863364

return struct_unpack('!l', inet_aton(addr))[0]

if type(addr) == type(0): return addr

bytes = addr.split('.')

if len(bytes) != 4: raise ValueError, 'bad IP address'

n = 0

for byte in bytes: n = n<<8 | int(byte)

return n

def bin2addr(n):

# Sourceforge 863364

return inet_ntoa(struct_pack('!L', n))

return '%d.%d.%d.%d' % ((n>>24)&0xFF, (n>>16)&0xFF,

(n>>8)&0xFF, n&0xFF)

# Packing class

164

165

self.buf = buf

165

166

self.offset = 0

166

167

def getbyte(self):

167

# Sourceforge #954095

168

if self.offset >= len(self.buf):

168

if self.offset > len(self.buf):

169

raise UnpackError, "Ran off end of data"

170

c = self.buf[self.offset]

171

self.offset = self.offset + 1

Older »