Changeset 923:9174613795d6

Timestamp:

09/12/08 17:57:20 (4 months ago)

Author:

Phil <phil@secdev.org>

Message:

Split DHCP6

Files:

• scapy/config.py (modified) (1 diff)
• scapy/layers/dhcp6.py (added)
• scapy/layers/inet6.py (modified) (1 diff)

scapy/config.py

@@ -316 +316 @@
-    load_layers = ["l2", "inet", "dhcp", "dns", "dot11", "gprs", "hsrp", "inet6", "ir", "isakmp", "l2tp",
-                   "mgcp", "mobileip", "netbios", "netflow", "ntp", "ppp", "radius", "rip", "rtp",
-
+, "dhcp6"
-    
-

scapy/layers/inet6.py

@@ -2280 +2280 @@
-    return cls
-
-#############################################################################
-#############################################################################
-###                                DHCPv6                                 ###
-#############################################################################
-#############################################################################
-
-All_DHCP_Relay_Agents_and_Servers = "ff02::1:2" 
-All_DHCP_Servers = "ff05::1:3"  # Site-Local scope : deprecated by 3879
-
-dhcp6opts = { 1: "CLIENTID",  
-              2: "SERVERID",
-              3: "IA_NA",
-              4: "IA_TA",
-              5: "IAADDR",
-              6: "ORO",
-              7: "PREFERENCE",
-              8: "ELAPSED_TIME",
-              9: "RELAY_MSG",
-             11: "AUTH",
-             12: "UNICAST",
-             13: "STATUS_CODE",
-             14: "RAPID_COMMIT",
-             15: "USER_CLASS",
-             16: "VENDOR_CLASS",
-             17: "VENDOR_OPTS",
-             18: "INTERFACE_ID",
-             19: "RECONF_MSG",
-             20: "RECONF_ACCEPT",
-             21: "SIP Servers Domain Name List",     #RFC3319
-             22: "SIP Servers IPv6 Address List",    #RFC3319
-             23: "DNS Recursive Name Server Option", #RFC3646
-             24: "Domain Search List option",        #RFC3646
-             25: "OPTION_IA_PD",                     #RFC3633
-             26: "OPTION_IAPREFIX",                  #RFC3633
-             27: "OPTION_NIS_SERVERS",               #RFC3898
-             28: "OPTION_NISP_SERVERS",              #RFC3898
-             29: "OPTION_NIS_DOMAIN_NAME",           #RFC3898
-             30: "OPTION_NISP_DOMAIN_NAME",          #RFC3898
-             31: "OPTION_SNTP_SERVERS",              #RFC4075
-             32: "OPTION_INFORMATION_REFRESH_TIME",  #RFC4242
-             33: "OPTION_BCMCS_SERVER_D",            #RFC4280         
-             34: "OPTION_BCMCS_SERVER_A",            #RFC4280
-             36: "OPTION_GEOCONF_CIVIC",             #RFC-ietf-geopriv-dhcp-civil-09.txt
-             37: "OPTION_REMOTE_ID",                 #RFC4649
-             38: "OPTION_SUBSCRIBER_ID",             #RFC4580
-             39: "OPTION_CLIENT_FQDN" }              #RFC4704
-
-dhcp6opts_by_code = {  1: "DHCP6OptClientId", 
-                       2: "DHCP6OptServerId",
-                       3: "DHCP6OptIA_NA",
-                       4: "DHCP6OptIA_TA",
-                       5: "DHCP6OptIAAddress",
-                       6: "DHCP6OptOptReq",
-                       7: "DHCP6OptPref",
-                       8: "DHCP6OptElapsedTime",
-                       9: "DHCP6OptRelayMsg",
-                       11: "DHCP6OptAuth",
-                       12: "DHCP6OptServerUnicast",
-                       13: "DHCP6OptStatusCode",
-                       14: "DHCP6OptRapidCommit",
-                       15: "DHCP6OptUserClass",
-                       16: "DHCP6OptVendorClass",
-                       17: "DHCP6OptVendorSpecificInfo",
-                       18: "DHCP6OptIfaceId",
-                       19: "DHCP6OptReconfMsg",
-                       20: "DHCP6OptReconfAccept",
-                       21: "DHCP6OptSIPDomains",          #RFC3319
-                       22: "DHCP6OptSIPServers",          #RFC3319
-                       23: "DHCP6OptDNSServers",          #RFC3646
-                       24: "DHCP6OptDNSDomains",          #RFC3646
-                       25: "DHCP6OptIA_PD",               #RFC3633
-                       26: "DHCP6OptIAPrefix",            #RFC3633
-                       27: "DHCP6OptNISServers",          #RFC3898
-                       28: "DHCP6OptNISPServers",         #RFC3898
-                       29: "DHCP6OptNISDomain",           #RFC3898
-                       30: "DHCP6OptNISPDomain",          #RFC3898
-                       31: "DHCP6OptSNTPServers",         #RFC4075
-                       32: "DHCP6OptInfoRefreshTime",     #RFC4242
-                       33: "DHCP6OptBCMCSDomains",        #RFC4280         
-                       34: "DHCP6OptBCMCSServers",        #RFC4280
-                       #36: "DHCP6OptGeoConf",            #RFC-ietf-geopriv-dhcp-civil-09.txt
-                       37: "DHCP6OptRemoteID",            #RFC4649
-                       38: "DHCP6OptSubscriberID",        #RFC4580
-                       39: "DHCP6OptClientFQDN",          #RFC4704
-                       #40: "DHCP6OptPANAAgent",          #RFC-ietf-dhc-paa-option-05.txt
-                       #41: "DHCP6OptNewPOSIXTimeZone,    #RFC4833
-                       #42: "DHCP6OptNewTZDBTimeZone,     #RFC4833
-                       43: "DHCP6OptRelayAgentERO"        #RFC4994
-                       #44: "DHCP6OptLQQuery",            #RFC5007
-                       #45: "DHCP6OptLQClientData",       #RFC5007
-                       #46: "DHCP6OptLQClientTime",       #RFC5007
-                       #47: "DHCP6OptLQRelayData",        #RFC5007
-                       #48: "DHCP6OptLQClientLink",       #RFC5007
-}
-
-
-# sect 5.3 RFC 3315 : DHCP6 Messages types
-dhcp6types = {   1:"SOLICIT",
-                 2:"ADVERTISE",
-                 3:"REQUEST",
-                 4:"CONFIRM",
-                 5:"RENEW",
-                 6:"REBIND",
-                 7:"REPLY",
-                 8:"RELEASE",
-                 9:"DECLINE",
-                10:"RECONFIGURE",
-                11:"INFORMATION-REQUEST",
-                12:"RELAY-FORW",
-                13:"RELAY-REPL" }
-
-
-#####################################################################
-###                  DHCPv6 DUID related stuff                    ###
-#####################################################################
-
-duidtypes = { 1: "Link-layer address plus time", 
-              2: "Vendor-assigned unique ID based on Enterprise Number",
-              3: "Link-layer Address" }
-
-# DUID hardware types - RFC 826 - Extracted from 
-# http://www.iana.org/assignments/arp-parameters on 31/10/06
-# We should add the length of every kind of address.
-duidhwtypes = {  0: "NET/ROM pseudo", # Not referenced by IANA
-                 1: "Ethernet (10Mb)",
-                 2: "Experimental Ethernet (3Mb)",
-                 3: "Amateur Radio AX.25",
-                 4: "Proteon ProNET Token Ring",
-                 5: "Chaos",
-                 6: "IEEE 802 Networks",
-                 7: "ARCNET",
-                 8: "Hyperchannel",
-                 9: "Lanstar",
-                10: "Autonet Short Address",
-                11: "LocalTalk",
-                12: "LocalNet (IBM PCNet or SYTEK LocalNET)",
-                13: "Ultra link",
-                14: "SMDS",
-                15: "Frame Relay",
-                16: "Asynchronous Transmission Mode (ATM)",
-                17: "HDLC",
-                18: "Fibre Channel",
-                19: "Asynchronous Transmission Mode (ATM)",
-                20: "Serial Line",
-                21: "Asynchronous Transmission Mode (ATM)",
-                22: "MIL-STD-188-220",
-                23: "Metricom",
-                24: "IEEE 1394.1995",
-                25: "MAPOS",
-                26: "Twinaxial",
-                27: "EUI-64",
-                28: "HIPARP",
-                29: "IP and ARP over ISO 7816-3",
-                30: "ARPSec",
-                31: "IPsec tunnel",
-                32: "InfiniBand (TM)",
-                33: "TIA-102 Project 25 Common Air Interface (CAI)" }
-
-class UTCTimeField(IntField):
-    epoch = (2000, 1, 1, 0, 0, 0, 5, 1, 0) # required Epoch
-    def i2repr(self, pkt, x):
-        x = self.i2h(pkt, x)
-        from time import gmtime, strftime, mktime
-        delta = mktime(self.epoch) - mktime(gmtime(0))
-        x = x + delta
-        t = strftime("%a, %d %b %Y %H:%M:%S +0000", gmtime(x))
-        return "%s (%d)" % (t, x)
-
-class _LLAddrField(MACField):
-    pass
-
-# XXX We only support Ethernet addresses at the moment. _LLAddrField 
-#     will be modified when needed. Ask us. --arno
-class DUID_LLT(Packet):  # sect 9.2 RFC 3315
-    name = "DUID - Link-layer address plus time"
-    fields_desc = [ ShortEnumField("type", 1, duidtypes),
-                    XShortEnumField("hwtype", 1, duidhwtypes), 
-                    UTCTimeField("timeval", 0), # i.e. 01 Jan 2000
-                    _LLAddrField("lladdr", ETHER_ANY) ]
-
-# In fact, IANA enterprise-numbers file available at 
-# http//www.iana.org/asignments/enterprise-numbers)
-# is simply huge (more than 2Mo and 600Ko in bz2). I'll
-# add only most common vendors, and encountered values.
-# -- arno
-iana_enterprise_num = {    9: "ciscoSystems",
-                          35: "Nortel Networks",
-                          43: "3Com",
-                         311: "Microsoft",
-                        2636: "Juniper Networks, Inc.",
-                        4526: "Netgear",
-                        5771: "Cisco Systems, Inc.",
-                        5842: "Cisco Systems",
-                       16885: "Nortel Networks" }
-
-class DUID_EN(Packet):  # sect 9.3 RFC 3315
-    name = "DUID - Assigned by Vendor Based on Enterprise Number"
-    fields_desc = [ ShortEnumField("type", 2, duidtypes),
-                    IntEnumField("enterprisenum", 311, iana_enterprise_num),
-                    StrField("id","") ] 
-
-class DUID_LL(Packet):  # sect 9.4 RFC 3315
-    name = "DUID - Based on Link-layer Address"
-    fields_desc = [ ShortEnumField("type", 3, duidtypes),
-                    XShortEnumField("hwtype", 1, duidhwtypes), 
-                    _LLAddrField("lladdr", ETHER_ANY) ]
-
-duid_cls = { 1: "DUID_LLT",
-             2: "DUID_EN",
-             3: "DUID_LL"}
-
-#####################################################################
-###                   DHCPv6 Options classes                      ###
-#####################################################################
-
-class _DHCP6OptGuessPayload(Packet):
-    def guess_payload_class(self, payload):
-        cls = Raw
-        if len(payload) > 2 :
-            opt = struct.unpack("!H", payload[:2])[0]
-            cls = get_cls(dhcp6opts_by_code.get(opt, "DHCP6OptUnknown"), DHCP6OptUnknown)
-        return cls
-
-class DHCP6OptUnknown(_DHCP6OptGuessPayload): # A generic DHCPv6 Option
-    name = "Unknown DHCPv6 OPtion"
-    fields_desc = [ ShortEnumField("optcode", 0, dhcp6opts), 
-                    FieldLenField("optlen", None, length_of="data", fmt="!H"),
-                    StrLenField("data", "",
-                                length_from = lambda pkt: pkt.optlen)]
-
-class _DUIDField(PacketField):
-    holds_packets=1
-    def __init__(self, name, default, length_from=None):
-        StrField.__init__(self, name, default)
-        self.length_from = length_from
-
-    def i2m(self, pkt, i):
-        return str(i)
-
-    def m2i(self, pkt, x):
-        cls = Raw 
-        if len(x) > 4:
-            o = struct.unpack("!H", x[:2])[0]
-            cls = get_cls(duid_cls.get(o, Raw), "Raw")
-        return cls(x)
-
-    def getfield(self, pkt, s):
-        l = self.length_from(pkt)
-        return s[l:], self.m2i(pkt,s[:l])
- 
-
-class DHCP6OptClientId(_DHCP6OptGuessPayload):     # RFC sect 22.2
-    name = "DHCP6 Client Identifier Option"
-    fields_desc = [ ShortEnumField("optcode", 1, dhcp6opts), 
-                    FieldLenField("optlen", None, length_of="duid", fmt="!H"),
-                    _DUIDField("duid", "",
-                               length_from = lambda pkt: pkt.optlen) ]
-
-
-class DHCP6OptServerId(DHCP6OptClientId):     # RFC sect 22.3
-    name = "DHCP6 Server Identifier Option"
-    __metaclass__ = NewDefaultValues
-    optcode = 2
-
-# Should be encapsulated in the option field of IA_NA or IA_TA options
-# Can only appear at that location.
-# TODO : last field IAaddr-options is not defined in the reference document
-class DHCP6OptIAAddress(_DHCP6OptGuessPayload):    # RFC sect 22.6
-    name = "DHCP6 IA Address Option (IA_TA or IA_NA suboption)"
-    fields_desc = [ ShortEnumField("optcode", 5, dhcp6opts), 
-                    FieldLenField("optlen", None, length_of="iaaddropts",
-                                  fmt="!H", adjust = lambda pkt,x: x+24),
-                    IP6Field("addr", "::"),
-                    IntField("preflft", 0),
-                    IntField("validlft", 0),
-                    XIntField("iaid", None),
-                    StrLenField("iaaddropts", "",
-                                length_from  = lambda pkt: pkt.optlen - 24) ]
-    def guess_payload_class(self, payload):
-        return Padding
-
-class _IANAOptField(PacketListField):
-    def i2len(self, pkt, z):
-        if z is None or z == []:
-            return 0
-        return sum(map(lambda x: len(str(x)) ,z))
-
-    def getfield(self, pkt, s):
-        l = self.length_from(pkt)
-        lst = []
-        remain, payl = s[:l], s[l:]
-        while len(remain)>0:
-            p = self.m2i(pkt,remain)
-            if Padding in p:
-                pad = p[Padding]
-                remain = pad.load
-                del(pad.underlayer.payload)
-            else:
-                remain = ""
-            lst.append(p)
-        return payl,lst
-
-class DHCP6OptIA_NA(_DHCP6OptGuessPayload):         # RFC sect 22.4
-    name = "DHCP6 Identity Association for Non-temporary Addresses Option"
-    fields_desc = [ ShortEnumField("optcode", 3, dhcp6opts), 
-                    FieldLenField("optlen", None, length_of="ianaopts",
-                                  fmt="!H", adjust = lambda pkt,x: x+12),
-                    XIntField("iaid", None),
-                    IntField("T1", None),
-                    IntField("T2", None),
-                    _IANAOptField("ianaopts", [], DHCP6OptIAAddress,
-                                  length_from = lambda pkt: pkt.optlen-12) ]
-
-class _IATAOptField(_IANAOptField):
-    pass
-
-class DHCP6OptIA_TA(_DHCP6OptGuessPayload):         # RFC sect 22.5
-    name = "DHCP6 Identity Association for Temporary Addresses Option"
-    fields_desc = [ ShortEnumField("optcode", 4, dhcp6opts), 
-                    FieldLenField("optlen", None, length_of="iataopts",
-                                  fmt="!H", adjust = lambda pkt,x: x+4),
-                    XIntField("iaid", None),
-                    _IATAOptField("iataopts", [], DHCP6OptIAAddress,
-                                  length_from = lambda pkt: pkt.optlen-4) ]
-
-
-#### DHCPv6 Option Request Option ###################################
-
-class _OptReqListField(StrLenField):
-    islist = 1
-    def i2h(self, pkt, x):
-        if x is None:
-            return []
-        return x
-
-    def i2len(self, pkt, x):
-        return 2*len(x)
-
-    def any2i(self, pkt, x):
-        return x
-
-    def i2repr(self, pkt, x):
-        s = []
-        for y in self.i2h(pkt, x):
-            if dhcp6opts.has_key(y):
-                s.append(dhcp6opts[y])
-            else:
-                s.append("%d" % y)
-        return "[%s]" % ", ".join(s) 
-
-    def m2i(self, pkt, x):
-        r = []
-        while len(x) != 0:
-            if len(x)<2:
-                warning("Odd length for requested option field. Rejecting last byte")
-                return r
-            r.append(struct.unpack("!H", x[:2])[0])
-            x = x[2:]
-        return r
-    
-    def i2m(self, pkt, x):
-        return "".join(map(lambda y: struct.pack("!H", y), x))
-
-# A client may include an ORO in a solicit, Request, Renew, Rebind,
-# Confirm or Information-request
-class DHCP6OptOptReq(_DHCP6OptGuessPayload):       # RFC sect 22.7
-    name = "DHCP6 Option Request Option"
-    fields_desc = [ ShortEnumField("optcode", 6, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="reqopts", fmt="!H"),
-                    _OptReqListField("reqopts", [23, 24],
-                                     length_from = lambda pkt: pkt.optlen) ]
-
-
-#### DHCPv6 Preference Option #######################################
-
-# emise par un serveur pour affecter le choix fait par le client. Dans
-# les messages Advertise, a priori
-class DHCP6OptPref(_DHCP6OptGuessPayload):       # RFC sect 22.8
-    name = "DHCP6 Preference Option"
-    fields_desc = [ ShortEnumField("optcode", 7, dhcp6opts), 
-                    ShortField("optlen", 1 ),
-                    ByteField("prefval",255) ]
-
-
-#### DHCPv6 Elapsed Time Option #####################################
-
-class _ElapsedTimeField(ShortField):
-    def i2repr(self, pkt, x):
-        if x == 0xffff:
-            return "infinity (0xffff)"
-        return "%.2f sec" % (self.i2h(pkt, x)/100.)
-
-class DHCP6OptElapsedTime(_DHCP6OptGuessPayload):# RFC sect 22.9
-    name = "DHCP6 Elapsed Time Option"
-    fields_desc = [ ShortEnumField("optcode", 8, dhcp6opts), 
-                    ShortField("optlen", 2),
-                    _ElapsedTimeField("elapsedtime", 0) ]
-
-
-#### DHCPv6 Relay Message Option ####################################
-
-# Relayed message is seen as a payload.
-class DHCP6OptRelayMsg(_DHCP6OptGuessPayload):# RFC sect 22.10
-    name = "DHCP6 Relay Message Option"
-    fields_desc = [ ShortEnumField("optcode", 9, dhcp6opts), 
-                    ShortField("optlen", None ) ]
-    def post_build(self, p, pay):
-        if self.optlen is None:
-            l = len(pay) 
-            p = p[:2]+struct.pack("!H", l)
-        return p + pay
-
-
-#### DHCPv6 Authentication Option ###################################
-
-#    The following fields are set in an Authentication option for the
-#    Reconfigure Key Authentication Protocol:
-#
-#       protocol    3
-#
-#       algorithm   1
-#
-#       RDM         0
-#
-#    The format of the Authentication information for the Reconfigure Key
-#    Authentication Protocol is:
-#
-#      0                   1                   2                   3
-#      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-#     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-#     |     Type      |                 Value (128 bits)              |
-#     +-+-+-+-+-+-+-+-+                                               |
-#     .                                                               .
-#     .                                                               .
-#     .                                               +-+-+-+-+-+-+-+-+
-#     |                                               |
-#     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-#
-#       Type    Type of data in Value field carried in this option:
-#
-#                  1   Reconfigure Key value (used in Reply message).
-#
-#                  2   HMAC-MD5 digest of the message (used in Reconfigure
-#                      message).
-#
-#       Value   Data as defined by field.
-
-
-# TODO : Decoding only at the moment
-class DHCP6OptAuth(_DHCP6OptGuessPayload):    # RFC sect 22.11
-    name = "DHCP6 Option - Authentication"
-    fields_desc = [ ShortEnumField("optcode", 11, dhcp6opts), 
-                    FieldLenField("optlen", None, length_of="authinfo",
-                                  adjust = lambda pkt,x: x+11),
-                    ByteField("proto", 3), # TODO : XXX
-                    ByteField("alg", 1), # TODO : XXX
-                    ByteField("rdm", 0), # TODO : XXX
-                    StrFixedLenField("replay", "A"*8, 8), # TODO: XXX
-                    StrLenField("authinfo", "",
-                                length_from = lambda pkt: pkt.optlen - 11) ]
-
-#### DHCPv6 Server Unicast Option ###################################
-
-class _SrvAddrField(IP6Field):
-    def i2h(self, pkt, x):
-        if x is None:
-            return "::"
-        return x
-    
-    def i2m(self, pkt, x):
-        return inet_pton(socket.AF_INET6, self.i2h(pkt,x))
-
-class DHCP6OptServerUnicast(_DHCP6OptGuessPayload):# RFC sect 22.12
-    name = "DHCP6 Server Unicast Option"
-    fields_desc = [ ShortEnumField("optcode", 12, dhcp6opts), 
-                    ShortField("optlen", 16 ),
-                    _SrvAddrField("srvaddr",None) ]
-
-
-#### DHCPv6 Status Code Option ######################################
-
-dhcp6statuscodes = { 0:"Success",      # sect 24.4
-                     1:"UnspecFail",
-                     2:"NoAddrsAvail",
-                     3:"NoBinding",
-                     4:"NotOnLink",
-                     5:"UseMulticast",
-                     6:"NoPrefixAvail"} # From RFC3633
-
-class DHCP6OptStatusCode(_DHCP6OptGuessPayload):# RFC sect 22.13
-    name = "DHCP6 Status Code Option"
-    fields_desc = [ ShortEnumField("optcode", 13, dhcp6opts), 
-                    FieldLenField("optlen", None, length_of="statusmsg",
-                                  fmt="!H", adjust = lambda pkt,x:x+2),
-                    ShortEnumField("statuscode",None,dhcp6statuscodes),
-                    StrLenField("statusmsg", "",
-                                length_from = lambda pkt: pkt.optlen-2) ]
-
-
-#### DHCPv6 Rapid Commit Option #####################################
-
-class DHCP6OptRapidCommit(_DHCP6OptGuessPayload):   # RFC sect 22.14
-    name = "DHCP6 Rapid Commit Option"
-    fields_desc = [ ShortEnumField("optcode", 14, dhcp6opts),
-                    ShortField("optlen", 0)]
-
-
-#### DHCPv6 User Class Option #######################################
-
-class _UserClassDataField(PacketListField):
-    def i2len(self, pkt, z):
-        if z is None or z == []:
-            return 0
-        return sum(map(lambda x: len(str(x)) ,z))
-
-    def getfield(self, pkt, s):
-        l = self.length_from(pkt)
-        lst = []
-        remain, payl = s[:l], s[l:]
-        while len(remain)>0:
-            p = self.m2i(pkt,remain)
-            if Padding in p:
-                pad = p[Padding]
-                remain = pad.load
-                del(pad.underlayer.payload)
-            else:
-                remain = ""
-            lst.append(p)
-        return payl,lst
-
-
-class USER_CLASS_DATA(Packet):
-    name = "user class data"
-    fields_desc = [ FieldLenField("len", None, length_of="data"),
-                    StrLenField("data", "",
-                                length_from = lambda pkt: pkt.len) ]
-    def guess_payload_class(self, payload):
-        return Padding
-
-class DHCP6OptUserClass(_DHCP6OptGuessPayload):# RFC sect 22.15
-    name = "DHCP6 User Class Option"
-    fields_desc = [ ShortEnumField("optcode", 15, dhcp6opts), 
-                    FieldLenField("optlen", None, fmt="!H",
-                                  length_of="userclassdata"),
-                    _UserClassDataField("userclassdata", [], USER_CLASS_DATA,
-                                        length_from = lambda pkt: pkt.optlen) ]
-
-
-#### DHCPv6 Vendor Class Option #####################################
-
-class _VendorClassDataField(_UserClassDataField):
-    pass
-
-class VENDOR_CLASS_DATA(USER_CLASS_DATA):
-    name = "vendor class data"
-
-class DHCP6OptVendorClass(_DHCP6OptGuessPayload):# RFC sect 22.16
-    name = "DHCP6 Vendor Class Option"
-    fields_desc = [ ShortEnumField("optcode", 16, dhcp6opts), 
-                    FieldLenField("optlen", None, length_of="vcdata", fmt="!H",
-                                  adjust = lambda pkt,x: x+4),
-                    IntEnumField("enterprisenum",None , iana_enterprise_num ),
-                    _VendorClassDataField("vcdata", [], VENDOR_CLASS_DATA,
-                                          length_from = lambda pkt: pkt.optlen-4) ]
-
-#### DHCPv6 Vendor-Specific Information Option ######################
-
-class VENDOR_SPECIFIC_OPTION(_DHCP6OptGuessPayload):
-    name = "vendor specific option data"
-    fields_desc = [ ShortField("optcode", None),
-                    FieldLenField("optlen", None, length_of="optdata"),
-                    StrLenField("optdata", "",
-                                length_from = lambda pkt: pkt.optlen) ]
-    def guess_payload_class(self, payload):
-        return Padding
-
-# The third one that will be used for nothing interesting
-class DHCP6OptVendorSpecificInfo(_DHCP6OptGuessPayload):# RFC sect 22.17
-    name = "DHCP6 Vendor-specific Information Option"
-    fields_desc = [ ShortEnumField("optcode", 17, dhcp6opts), 
-                    FieldLenField("optlen", None, length_of="vso", fmt="!H",
-                                  adjust = lambda pkt,x: x+4),
-                    IntEnumField("enterprisenum",None , iana_enterprise_num),
-                    _VendorClassDataField("vso", [], VENDOR_SPECIFIC_OPTION,
-                                          length_from = lambda pkt: pkt.optlen-4) ]
-
-#### DHCPv6 Interface-ID Option #####################################
-
-# Repasser sur cette option a la fin. Elle a pas l'air d'etre des
-# masses critique.
-class DHCP6OptIfaceId(_DHCP6OptGuessPayload):# RFC sect 22.18
-    name = "DHCP6 Interface-Id Option"
-    fields_desc = [ ShortEnumField("optcode", 18, dhcp6opts),
-                    FieldLenField("optlen", None, fmt="!H",
-                                  length_of="ifaceid"),
-                    StrLenField("ifaceid", "",
-                                length_from = lambda pkt: pkt.optlen) ]
-
-
-#### DHCPv6 Reconfigure Message Option ##############################
-
-# A server includes a Reconfigure Message option in a Reconfigure
-# message to indicate to the client whether the client responds with a
-# renew message or an Informatiion-request message.
-class DHCP6OptReconfMsg(_DHCP6OptGuessPayload):       # RFC sect 22.19
-    name = "DHCP6 Reconfigure Message Option"
-    fields_desc = [ ShortEnumField("optcode", 19, dhcp6opts), 
-                    ShortField("optlen", 1 ),
-                    ByteEnumField("msgtype", 11, {  5:"Renew Message", 
-                                                   11:"Information Request"}) ]
-
-
-#### DHCPv6 Reconfigure Accept Option ###############################
-
-# A client uses the Reconfigure Accept option to announce to the
-# server whether the client is willing to accept Recoonfigure
-# messages, and a server uses this option to tell the client whether
-# or not to accept Reconfigure messages. The default behavior in the
-# absence of this option, means unwillingness to accept reconfigure
-# messages, or instruction not to accept Reconfigure messages, for the
-# client and server messages, respectively.
-class DHCP6OptReconfAccept(_DHCP6OptGuessPayload):   # RFC sect 22.20
-    name = "DHCP6 Reconfigure Accept Option"
-    fields_desc = [ ShortEnumField("optcode", 20, dhcp6opts),
-                    ShortField("optlen", 0)]
-
-# As required in Sect 8. of RFC 3315, Domain Names must be encoded as 
-# described in section 3.1 of RFC 1035
-# XXX Label should be at most 63 octets in length : we do not enforce it
-#     Total length of domain should be 255 : we do not enforce it either
-class DomainNameListField(StrLenField):
-    islist = 1
-
-    def i2len(self, pkt, x):
-        return len(self.i2m(pkt, x))
-
-    def m2i(self, pkt, x):
-        res = []
-        while x:
-            cur = []
-            while x and x[0] != '\x00':
-                l = ord(x[0])
-                cur.append(x[1:l+1])
-                x = x[l+1:]
-            res.append(".".join(cur))
-            if x and x[0] == '\x00':
-                x = x[1:]
-        return res
-
-    def i2m(self, pkt, x):
-        def conditionalTrailingDot(z):
-            if z and z[-1] == '\x00':
-                return z
-            return z+'\x00'
-        res = ""
-        tmp = map(lambda y: map((lambda z: chr(len(z))+z), y.split('.')), x)
-        return "".join(map(lambda x: conditionalTrailingDot("".join(x)), tmp))
-
-class DHCP6OptSIPDomains(_DHCP6OptGuessPayload):       #RFC3319
-    name = "DHCP6 Option - SIP Servers Domain Name List"
-    fields_desc = [ ShortEnumField("optcode", 21, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="sipdomains"),
-                    DomainNameListField("sipdomains", [],
-                                        length_from = lambda pkt: pkt.optlen) ]
-
-class DHCP6OptSIPServers(_DHCP6OptGuessPayload):          #RFC3319
-    name = "DHCP6 Option - SIP Servers IPv6 Address List"
-    fields_desc = [ ShortEnumField("optcode", 22, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="sipservers"),
-                    IP6ListField("sipservers", [], 
-                                 length_from = lambda pkt: pkt.optlen) ]
-
-class DHCP6OptDNSServers(_DHCP6OptGuessPayload):          #RFC3646
-    name = "DHCP6 Option - DNS Recursive Name Server"
-    fields_desc = [ ShortEnumField("optcode", 23, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="dnsservers"),
-                    IP6ListField("dnsservers", [],
-                                 length_from = lambda pkt: pkt.optlen) ]
-
-class DHCP6OptDNSDomains(_DHCP6OptGuessPayload): #RFC3646
-    name = "DHCP6 Option - Domain Search List option"
-    fields_desc = [ ShortEnumField("optcode", 24, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="dnsdomains"),
-                    DomainNameListField("dnsdomains", [],
-                                        length_from = lambda pkt: pkt.optlen) ]
-
-# TODO: Implement iaprefopts correctly when provided with more 
-#       information about it.
-class DHCP6OptIAPrefix(_DHCP6OptGuessPayload):                    #RFC3633
-    name = "DHCP6 Option - IA_PD Prefix option"
-    fields_desc = [ ShortEnumField("optcode", 26, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="iaprefopts",
-                                  adjust = lambda pkt,x: x+26),
-                    IntField("preflft", 0),
-                    IntField("validlft", 0),
-                    ByteField("plen", 48),  # TODO: Challenge that default value
-                    IP6Field("prefix", "2001:db8::"), # At least, global and won't hurt
-                    StrLenField("iaprefopts", "",
-                                length_from = lambda pkt: pkt.optlen-26) ]
-
-class DHCP6OptIA_PD(_DHCP6OptGuessPayload):                       #RFC3633
-    name = "DHCP6 Option - Identity Association for Prefix Delegation"
-    fields_desc = [ ShortEnumField("optcode", 25, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="iapdopt",
-                                  adjust = lambda pkt,x: x+12),
-                    IntField("iaid", 0),
-                    IntField("T1", 0),
-                    IntField("T2", 0),
-                    PacketListField("iapdopt", [], DHCP6OptIAPrefix,
-                                    length_from = lambda pkt: pkt.optlen-12) ]
-
-class DHCP6OptNISServers(_DHCP6OptGuessPayload):                 #RFC3898
-    name = "DHCP6 Option - NIS Servers"
-    fields_desc = [ ShortEnumField("optcode", 27, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="nisservers"),
-                    IP6ListField("nisservers", [],
-                                 length_from = lambda pkt: pkt.optlen) ]
-
-class DHCP6OptNISPServers(_DHCP6OptGuessPayload):                #RFC3898
-    name = "DHCP6 Option - NIS+ Servers"
-    fields_desc = [ ShortEnumField("optcode", 28, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="nispservers"),
-                    IP6ListField("nispservers", [],
-                                 length_from = lambda pkt: pkt.optlen) ]
-
-class DomainNameField(StrLenField):
-    def getfield(self, pkt, s):
-        l = self.length_from(pkt)
-        return s[l:], self.m2i(pkt,s[:l])
-
-    def i2len(self, pkt, x):
-        return len(self.i2m(pkt, x))
-
-    def m2i(self, pkt, x):
-        save = x
-        cur = []
-        while x and x[0] != '\x00':
-            l = ord(x[0])
-            cur.append(x[1:1+l])
-            x = x[l+1:]
-        if x[0] != '\x00':
-            print "Found weird domain: '%s'. Keeping %s" % (save, x)
-        return ".".join(cur)
-
-    def i2m(self, pkt, x):
-        def conditionalTrailingDot(z):
-            if (z and z[-1] == '\x00'):
-                return z
-            return z+'\x00'
-        if not x:
-            return ""
-        tmp = "".join(map(lambda z: chr(len(z))+z, x.split('.')))
-        return conditionalTrailingDot(tmp)
-
-class DHCP6OptNISDomain(_DHCP6OptGuessPayload):             #RFC3898
-    name = "DHCP6 Option - NIS Domain Name"
-    fields_desc = [ ShortEnumField("optcode", 29, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="nisdomain"),
-                    DomainNameField("nisdomain", "",
-                                    length_from = lambda pkt: pkt.optlen) ]
-
-class DHCP6OptNISPDomain(_DHCP6OptGuessPayload):            #RFC3898
-    name = "DHCP6 Option - NIS+ Domain Name"
-    fields_desc = [ ShortEnumField("optcode", 30, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="nispdomain"),
-                    DomainNameField("nispdomain", "",
-                                    length_from= lambda pkt: pkt.optlen) ]
-
-class DHCP6OptSNTPServers(_DHCP6OptGuessPayload):                #RFC4075
-    name = "DHCP6 option - SNTP Servers"
-    fields_desc = [ ShortEnumField("optcode", 31, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="sntpservers"),
-                    IP6ListField("sntpservers", [],
-                                 length_from = lambda pkt: pkt.optlen) ]
-
-IRT_DEFAULT=86400
-IRT_MINIMUM=600
-class DHCP6OptInfoRefreshTime(_DHCP6OptGuessPayload):    #RFC4242
-    name = "DHCP6 Option - Information Refresh Time"
-    fields_desc = [ ShortEnumField("optcode", 32, dhcp6opts),
-                    ShortField("optlen", 4),
-                    IntField("reftime", IRT_DEFAULT)] # One day
-
-class DHCP6OptBCMCSDomains(_DHCP6OptGuessPayload):              #RFC4280         
-    name = "DHCP6 Option - BCMCS Domain Name List"
-    fields_desc = [ ShortEnumField("optcode", 33, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="bcmcsdomains"),
-                    DomainNameListField("bcmcsdomains", [],
-                                        length_from = lambda pkt: pkt.optlen) ]
-
-class DHCP6OptBCMCSServers(_DHCP6OptGuessPayload):              #RFC4280
-    name = "DHCP6 Option - BCMCS Addresses List"
-    fields_desc = [ ShortEnumField("optcode", 34, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="bcmcsservers"),
-                    IP6ListField("bcmcsservers", [],
-                                 length_from= lambda pkt: pkt.optlen) ]
-
-# TODO : Does Nothing at the moment
-class DHCP6OptGeoConf(_DHCP6OptGuessPayload):               #RFC-ietf-geopriv-dhcp-civil-09.txt
-    name = ""
-    fields_desc = [ ShortEnumField("optcode", 36, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="optdata"),
-                    StrLenField("optdata", "",
-                                length_from = lambda pkt: pkt.optlen) ]
-
-# TODO: see if we encounter opaque values from vendor devices
-class DHCP6OptRemoteID(_DHCP6OptGuessPayload):                   #RFC4649
-    name = "DHCP6 Option - Relay Agent Remote-ID"
-    fields_desc = [ ShortEnumField("optcode", 37, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="remoteid",
-                                  adjust = lambda pkt,x: x+4),
-                    IntEnumField("enterprisenum", None, iana_enterprise_num),
-                    StrLenField("remoteid", "",
-                                length_from = lambda pkt: pkt.optlen-4) ]
-
-# TODO : 'subscriberid' default value should be at least 1 byte long
-class DHCP6OptSubscriberID(_DHCP6OptGuessPayload):               #RFC4580
-    name = "DHCP6 Option - Subscriber ID"
-    fields_desc = [ ShortEnumField("optcode", 38, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="subscriberid"),
-                    StrLenField("subscriberid", "",
-                                length_from = lambda pkt: pkt.optlen) ]
-
-# TODO :  "The data in the Domain Name field MUST be encoded
-#          as described in Section 8 of [5]"
-class DHCP6OptClientFQDN(_DHCP6OptGuessPayload):                 #RFC4704
-    name = "DHCP6 Option - Client FQDN"
-    fields_desc = [ ShortEnumField("optcode", 39, dhcp6opts),
-                    FieldLenField("optlen", None, length_of="fqdn",
-                                  adjust = lambda pkt,x: x+1),
-                    BitField("res", 0, 5),
-                    FlagsField("flags", 0, 3, "SON" ),
-                    DomainNameField("fqdn", "",
-                                    length_from = lambda pkt: pkt.optlen-1) ]
-
-class DHCP6OptRelayAgentERO(_DHCP6OptGuessPayload):       # RFC4994
-    name = "DHCP6 Option - RelayRequest Option"
-    fields_desc = [ ShortEnumField("optcode", 43, dhcp6opts),
-                    Field