diff options
| author | Roy Marples <roy@marples.name> | 2008-07-02 17:05:41 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-07-02 17:05:41 +0000 |
| commit | 261eb2d41fd97a4bdfb04eac99af3c693701157b (patch) | |
| tree | aafba33df2b90524c2a444a71eded740544256a7 /config.h | |
| parent | 0951a1c048ca5da7f75c75cccaef8b538e511f11 (diff) | |
| download | dhcpcd-261eb2d41fd97a4bdfb04eac99af3c693701157b.tar.xz | |
Remove previous toggles for classid, clientid, userclass and vendor - they call *could* be required for DHCP. Add a string parser and process all user strings through it.
Diffstat (limited to 'config.h')
| -rw-r--r-- | config.h | 38 |
1 files changed, 1 insertions, 37 deletions
@@ -39,24 +39,12 @@ # ifndef DISABLE_ARP # define DISABLE_ARP # endif -# ifndef DISABLE_CLASSID -# define DISABLE_CLASSID -# endif -# ifndef DISABLE_CLIENTID -# define DISABLE_CLIENTID -# endif # ifndef DISABLE_IPV4LL # define DISABLE_IPV4LL # endif # ifndef DISABLE_DUID # define DISABLE_DUID # endif -# ifndef DISABLE_USERCLASS -# define DISABLE_USERCLASS -# endif -# ifndef DISABLE_VENDOR -# define DISABLE_VENDOR -# endif #endif /* Enable ARP by default. */ @@ -64,16 +52,6 @@ # define ENABLE_ARP #endif -/* Allow dhcpcd to send a ClassID */ -#ifndef DISABLE_CLASSID -# define ENABLE_CLASSID -#endif - -/* Send a ClientID in all messages. */ -#ifndef DISABLE_CLIENTID -# define ENABLE_CLIENTID -#endif - /* Allow dhcpcd to create a DUID (LLT) and use it to make an IAID for the * ClientID. Even enabled here, we need a config directive to actually use it * so this toggle is just to remove it from dhcpcd to make the binary smaller. @@ -81,9 +59,7 @@ * hex string that represents the DUID. * See RFC 3315 for details on this. */ #ifndef DISABLE_DUID -# ifdef ENABLE_CLIENTID -# define ENABLE_DUID -# endif +# define ENABLE_DUID #endif /* IPV4LL, aka ZeroConf, aka APIPA, aka RFC 3927. @@ -103,18 +79,6 @@ */ // #define ENABLE_IPV4LL_ALWAYSROUTE -/* Allow dhcpcd to send user class options. */ -#ifndef DISABLE_USERCLASS -# define ENABLE_USERCLASS -#endif - -/* Allow dhcpcd to send encapsulated vendor options (code 43). - * Although this is enabled by default, only custom networks would really - * need it. */ -#ifndef DISABLE_VENDOR -# define ENABLE_VENDOR -#endif - /* Some systems do not have a working fork. */ /* #define THERE_IS_NO_FORK */ |