# Copyright (c) 2005, Neville-Neil Consulting
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# Neither the name of Neville-Neil Consulting nor the names of its 
# contributors may be used to endorse or promote products derived from 
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# File: $Id: udpv6.py,v 1.1 2006/07/06 09:31:57 gnn Exp $
#
# Author: George V. Neville-Neil
#
# Description: A class which implements UDP v6 packets

import sys
sys.path.append("../src")

import pcs

class udpv6(pcs.Packet):

    _layout = pcs.Layout()

    def __init__(self, bytes = None, **kv):
        """Initialize a UDP packet for IPv6"""
        sport = pcs.Field("sport", 16)
        dport = pcs.Field("dport", 16)
        length = pcs.Field("length", 16)
        checksum = pcs.Field("checksum", 16)
        pcs.Packet.__init__(self, [sport, dport, length, checksum], bytes, **kv)

    def cksum(self, ip, data = "", nx = 0):
        """Calculate the checksum for this UDPv6 header, outside
           of any existing chain."""
        from pcs.packets.ipv4 import ipv4
        from pcs.packets.pseudoipv6 import pseudoipv6
        p6 = pseudoipv6()
        p6.src = ip.src
        p6.dst = ip.dst
        p6.length = len(self.getbytes()) + len(data)
        if nx:
            p6.next_header = nx
        else:
            p6.next_header = ip.next_header
        tmpbytes = p6.getbytes() + self.getbytes() + data
        return ipv4.ipv4_cksum(tmpbytes)

    def calc_checksum(self):
        """Calculate and store the checksum for this UDPv6 datagram.
           The packet SHOULD be part of a chain, and have an IPv6 header."""
        from pcs.packets.ipv4 import ipv4
        ip6 = None
        if self._head is not None:
            ip6 = self._head.find_preceding(self, pcs.packets.ipv6.ipv6)
        if ip6 is None:
            self.checksum = 0
            self.checksum = ipv4.ipv4_cksum(self.getbytes())
            return
        pcs.packets.udp.udp.calc_checksum_v6(self, ip6)

@@ -1736,16 +1736,39 @@
 port pcs
+%0Aimport pcs.packets.udp
 %0A%0Aclass 
@@ -1777,22 +1777,31 @@
 pv6(pcs.
-P
+p
 acket
+s.udp.udp
 ):%0A%0A    
@@ -1822,16 +1822,32 @@
 Layout()
+%0A    _map = None
 %0A%0A    de
@@ -1876,16 +1876,34 @@
  = None,
+ timestamp = None,
  **kv):%0A
@@ -1961,237 +1961,59 @@
     
-sport = pcs.Field(%22sport%22, 16)%0A        dport = pcs.Field(%22dport%22, 16)%0A        length = pcs.Field(%22length%22, 16)%0A        checksum = pcs.Field(%22checksum%22, 16)%0A        pcs.Packet.__init__(self, %5Bsport, dport, length, checksum%5D, bytes
+pcs.packets.udp.udp.__init__(self, bytes, timestamp
 , **

Make udpv6 derive from udp.