*** draft-ietf-sip-dhcp-05.txt	Wed Nov 21 12:17:41 2001
--- draft-ietf-sip-dhcp-06.txt	Sun Feb  3 10:56:20 2002
***************
*** 6,17 ****
  
  Internet Engineering Task Force                                   SIP WG
  Internet Draft                                             H.Schulzrinne
! draft-ietf-sip-dhcp-05.txt                           Columbia University
! November 21, 2001
  Expires: May 2002
  
  
!                       DHCP Option for SIP Servers
  
--- 6,17 ----
  
  Internet Engineering Task Force                                   SIP WG
  Internet Draft                                             H.Schulzrinne
! draft-ietf-sip-dhcp-06.txt                           Columbia University
! February 3, 2002
  Expires: May 2002
  
  
!                      DHCPv4 Option for SIP Servers
  
***************
*** 37,46 ****
  
  Abstract
  
!    This document defines a DHCP option that contains a single name or
!    IPv4 address that can be mapped to one or more SIP outbound proxy
--- 37,46 ----
  
  Abstract
  
!    This document defines a DHCP-for-IPv4 option that contains a list of
!    domain names or IPv4 addresses that can be mapped to one or more SIP
***************
+    A DHCP server SHOULD only include one of the encodings in its answer,
+    unless explicitly requested by the DHCP client.
***************
*** 139,159 ****
     The minimum length for this encoding is 3.
  
     The option MAY contain multiple domain names, but these SHOULD refer
!    to different SRV records, rather than different A records. Domain
     names SHOULD be listed in order of preference.
  
     A SIP client obtains a domain name through the DHCP SIP server
     option, which the client then uses to locate the outbound proxy
!    server by the mechanism described in RFC XXXX [3]. In summary, the
!    domain name is used first in a DNS SRV lookup and, if that fails
!    because of a lack of matching DNS SRV records, the domain name is
!    used in an address record lookup. Normative details are contained in
!    RFC XXXX [3].
  
  
!         Use of multiple domain names is not meant to replace SRV
!         records, but rather to allow a single DHCP server to
!         indicate outbound proxy servers operated by multiple
          providers.
  
  
--- 143,159 ----
     The minimum length for this encoding is 3.
  
     The option MAY contain multiple domain names, but these SHOULD refer
!    to different NAPTR records, rather than different A records.  Domain
     names SHOULD be listed in order of preference.
  
     A SIP client obtains a domain name through the DHCP SIP server
     option, which the client then uses to locate the outbound proxy
!    server by the mechanism described in RFC XXXX [3].
  
  
!         Use of multiple domain names is not meant to replace NAPTR
!         and SRV records, but rather to allow a single DHCP server
!         to indicate outbound proxy servers operated by multiple
          providers.
  
  
***************
*** 169,180 ****
     within a single option (254 octets), then the domain list must be
!    represented in the DHCP message as specified in "Encoding Long DHCP
!    Options".
  
--- 169,179 ----
     within a single option (254 octets), then the domain list must be
!    represented in the DHCP message as specified in [7].
  
***************