1 files changed, 35 insertions, 25 deletions

diff --git a/networking/udhcp/options.h b/networking/udhcp/options.h
index 75087fa35..b7c9d8f8d 100644
--- a/networking/udhcp/options.h
+++ b/networking/udhcp/options.h
@@ -32,45 +32,55 @@ enum {
 /* Do not modify below here unless you know what you are doing!! */
 /*****************************************************************/
 
-/* DHCP protocol -- see RFC 2131 */
+/* DHCP protocol. See RFC 2131 */
 #define DHCP_MAGIC              0x63825363
 
-/* DHCP option codes (partial list) */
+/* DHCP option codes (partial list). See RFC 2132.
+ * Commented out options are handled by common option machinery,
+ * uncommented ones have spacial cases (grep for them to see).
+ */
 #define DHCP_PADDING            0x00
 #define DHCP_SUBNET             0x01
-#define DHCP_TIME_OFFSET        0x02
-#define DHCP_ROUTER             0x03
-#define DHCP_TIME_SERVER        0x04
-//#define DHCP_NAME_SERVER      0x05 /* _really_ ancient kind of NS */
-#define DHCP_DNS_SERVER         0x06
-#define DHCP_LOG_SERVER         0x07
+//#define DHCP_TIME_OFFSET      0x02 /* (localtime - UTC_time) in seconds. signed */
+//#define DHCP_ROUTER           0x03
+//#define DHCP_TIME_SERVER      0x04 /* RFC 868 time server (32-bit, 0 = 1.1.1900) */
+//#define DHCP_NAME_SERVER      0x05 /* IEN 116 _really_ ancient kind of NS */
+//#define DHCP_DNS_SERVER       0x06
+//#define DHCP_LOG_SERVER       0x07 /* port 704 UDP log (not syslog)
 //#define DHCP_COOKIE_SERVER    0x08 /* "quote of the day" server */
-#define DHCP_LPR_SERVER         0x09
+//#define DHCP_LPR_SERVER       0x09
 #define DHCP_HOST_NAME          0x0c /* either client informs server or server gives name to client */
-#define DHCP_BOOT_SIZE          0x0d
-#define DHCP_DOMAIN_NAME        0x0f /* server gives domain suffix */
-#define DHCP_SWAP_SERVER        0x10
-#define DHCP_ROOT_PATH          0x11
-#define DHCP_IP_TTL             0x17
-#define DHCP_MTU                0x1a
-#define DHCP_BROADCAST          0x1c
-#define DHCP_NTP_SERVER         0x2a
-#define DHCP_WINS_SERVER        0x2c
+//#define DHCP_BOOT_SIZE        0x0d
+//#define DHCP_DOMAIN_NAME      0x0f /* server gives domain suffix */
+//#define DHCP_SWAP_SERVER      0x10
+//#define DHCP_ROOT_PATH        0x11
+//#define DHCP_IP_TTL           0x17
+//#define DHCP_MTU              0x1a
+//#define DHCP_BROADCAST        0x1c
+//#define DHCP_NIS_DOMAIN       0x28
+//#define DHCP_NIS_SERVER       0x29
+//#define DHCP_NTP_SERVER       0x2a
+//#define DHCP_WINS_SERVER      0x2c
 #define DHCP_REQUESTED_IP       0x32 /* sent by client if specific IP is wanted */
 #define DHCP_LEASE_TIME         0x33
 #define DHCP_OPTION_OVERLOAD    0x34
 #define DHCP_MESSAGE_TYPE       0x35
 #define DHCP_SERVER_ID          0x36 /* by default server's IP */
 #define DHCP_PARAM_REQ          0x37 /* list of options client wants */
-#define DHCP_MESSAGE            0x38 /* error message when sending NAK etc */
+//#define DHCP_ERR_MESSAGE      0x38 /* error message when sending NAK etc */
 #define DHCP_MAX_SIZE           0x39
-//#define DHCP_T1               0x3a
-//#define DHCP_T2               0x3b
 #define DHCP_VENDOR             0x3c /* client's vendor (a string) */
 #define DHCP_CLIENT_ID          0x3d /* by default client's MAC addr, but may be arbitrarily long */
+//#define DHCP_TFTP_SERVER_NAME 0x42 /* same as 'sname' field */
+//#define DHCP_BOOT_FILE        0x43 /* same as 'file' field */
+//#define DHCP_USER_CLASS       0x4d /* RFC 3004. set of LASCII strings. "I am a printer" etc */
 #define DHCP_FQDN               0x51 /* client asks to update DNS to map its FQDN to its new IP */
-#define DHCP_STATIC_ROUTES      0x79
-#define DHCP_END                0xFF
+//#define DHCP_DOMAIN_SEARCH    0x77 /* RFC 3397. set of ASCIZ string, DNS-style compressed */
+//#define DHCP_STATIC_ROUTES    0x79 /* RFC 3442. (mask,ip,router) tuples */
+//#define DHCP_WPAD             0xfc /* MSIE's Web Proxy Autodiscovery Protocol */
+#define DHCP_END                0xff
+
+
 /* Offsets in option byte sequence */
 #define OPT_CODE                0
 #define OPT_LEN                 1
@@ -106,8 +116,8 @@ extern const uint8_t dhcp_option_lengths[];
 
 uint8_t *get_option(struct dhcp_packet *packet, int code) FAST_FUNC;
 int end_option(uint8_t *optionptr) FAST_FUNC;
-int add_option_string(uint8_t *optionptr, uint8_t *string) FAST_FUNC;
-int add_simple_option(uint8_t *optionptr, uint8_t code, uint32_t data) FAST_FUNC;
+void add_option_string(uint8_t *optionptr, uint8_t *string) FAST_FUNC;
+void add_simple_option(uint8_t *optionptr, uint8_t code, uint32_t data) FAST_FUNC;
 #if ENABLE_FEATURE_UDHCP_RFC3397
 char *dname_dec(const uint8_t *cstr, int clen, const char *pre) FAST_FUNC;
 uint8_t *dname_enc(const uint8_t *cstr, int clen, const char *src, int *retlen) FAST_FUNC;