Guess I need to commit the move.

ACKNOWLEDGEMENTS

@@ -14,4 +14,4 @@ pydhcplib : http://pydhcplib.tuxfamily.org/pmwiki/
 
     staticDHCPd features a completely overhauled, fully updated, and
     stripped-down version of this library, rebranded as 'libpydhcpserver'.
-
+

README

@@ -0,0 +1 @@
+staticDHCPd/doc/README

libpydhcpserver/libpydhcpserver/__init__.py

@@ -22,7 +22,8 @@
  You should have received a copy of the GNU General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>.
  
- (C) Neil Tallim, 2011 <red.hamsterx@gmail.com>
+ (C) Neil Tallim, 2013 <flan@uguu.ca>
  (C) Mathieu Ignacio, 2008 <mignacio@april.org>
 """
-VERSION = '1.1.5'
+VERSION = '1.1.7'
+URL = 'http://uguu.ca/'

libpydhcpserver/libpydhcpserver/dhcp_constants.py

@@ -33,7 +33,7 @@
   0: 'ERROR_UNDEF',
   1: 'DHCP_DISCOVER', 2: 'DHCP_OFFER',
   3: 'DHCP_REQUEST', 4:'DHCP_DECLINE',
-  5: 'DHCP_ACK', 6: 'DHCP_NACK',
+  5: 'DHCP_ACK', 6: 'DHCP_NAK',
   7: 'DHCP_RELEASE',
   8: 'DHCP_INFORM',
   9: 'DHCP_FORCERENEW',
@@ -46,7 +46,7 @@
  'BOOTREQUEST': 1, 'BOOTREPLY': 2,
  'DHCP_DISCOVER': 1, 'DHCP_OFFER': 2,
  'DHCP_REQUEST': 3, 'DHCP_DECLINE': 4,
- 'DHCP_ACK': 5, 'DHCP_NACK': 6,
+ 'DHCP_ACK': 5, 'DHCP_NAK': 6,
  'DHCP_RELEASE': 7,
  'DHCP_INFORM': 8,
  'DHCP_FORCERENEW': 9,

libpydhcpserver/libpydhcpserver/dhcp_network.py

@@ -122,10 +122,13 @@ def _getNextDHCPPacket(self, timeout=60):
         @type timeout: int
         @param timeout: The number of seconds to wait before returning.
         
-        @rtype: bool
-        @return: True if something was received; False otherwise.
+        @rtype: tuple(2)
+        @return: (received:bool, (address:basestring, port:int)|None), with received
+            indicating whether a DHCP packet was received or not and the tuple
+            reflecting the source of the received packet, if any.
         """
         active_sockets = None
+        source_address = None
         if self._pxe_socket:
             active_sockets = select.select([self._dhcp_socket, self._pxe_socket], [], [], timeout)[0]
         else:
@@ -149,8 +152,8 @@ def _getNextDHCPPacket(self, timeout=60):
                         threading.Thread(target=self._handleDHCPDecline, args=(packet, source_address, pxe)).start()
                     elif packet.isDHCPLeaseQueryPacket():
                         threading.Thread(target=self._handleDHCPLeaseQuery, args=(packet, source_address, pxe)).start()
-                    return True
-        return False
+                    return (True, source_address)
+        return (False, source_address)
 
     def _handleDHCPDecline(self, packet, source_address, pxe):
         """
@@ -164,7 +167,6 @@ def _handleDHCPDecline(self, packet, source_address, pxe):
         @type pxe: bool
         @param pxe: True if the packet was received on the PXE port.
         """
-        pass
 
     def _handleDHCPDiscover(self, packet, source_address, pxe):
         """
@@ -178,7 +180,6 @@ def _handleDHCPDiscover(self, packet, source_address, pxe):
         @type pxe: bool
         @param pxe: True if the packet was received on the PXE port.
         """
-        pass
 
     def _handleDHCPInform(self, packet, source_address, pxe):
         """
@@ -192,7 +193,6 @@ def _handleDHCPInform(self, packet, source_address, pxe):
         @type pxe: bool
         @param pxe: True if the packet was received on the PXE port.
         """
-        pass
 
     def _handleDHCPLeaseQuery(self, packet, source_address, pxe):
         """
@@ -206,7 +206,6 @@ def _handleDHCPLeaseQuery(self, packet, source_address, pxe):
         @type pxe: bool
         @param pxe: True if the packet was received on the PXE port.
         """
-        pass
 
     def _handleDHCPRelease(self, packet, source_address):
         """
@@ -218,7 +217,6 @@ def _handleDHCPRelease(self, packet, source_address):
         @param source_address: The address (host, port) from which the request
             was received.
         """
-        pass
 
     def _handleDHCPRequest(self, packet, source_address, pxe):
         """
@@ -232,7 +230,6 @@ def _handleDHCPRequest(self, packet, source_address, pxe):
         @type pxe: bool
         @param pxe: True if the packet was received on the PXE port.
         """
-        pass
 
     def _sendDHCPPacketTo(self, packet, ip, port, pxe):
         """