diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-22 15:22:14 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-22 15:22:14 +0100 |
commit | 6b61629397e121de9e879ed31b9309e56f9286bc (patch) | |
tree | 9a52938f0c53370c35de45393b809f90bb91a61a | |
parent | dde8bdcc5bd6f25157ca5364b2991c837f1ef364 (diff) | |
download | busybox-w32-6b61629397e121de9e879ed31b9309e56f9286bc.tar.gz busybox-w32-6b61629397e121de9e879ed31b9309e56f9286bc.tar.bz2 busybox-w32-6b61629397e121de9e879ed31b9309e56f9286bc.zip |
udhcp: make rfc derived doc more readable (but it still is contradictory)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | networking/udhcp/common.h | 101 |
1 files changed, 41 insertions, 60 deletions
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h index 2ce67598d..2179c5395 100644 --- a/networking/udhcp/common.h +++ b/networking/udhcp/common.h | |||
@@ -176,67 +176,48 @@ uint8_t *dname_enc(const uint8_t *cstr, int clen, const char *src, int *retlen) | |||
176 | 176 | ||
177 | // RFC 2131 Table 5: Fields and options used by DHCP clients | 177 | // RFC 2131 Table 5: Fields and options used by DHCP clients |
178 | // | 178 | // |
179 | // Field DHCPDISCOVER DHCPREQUEST DHCPDECLINE, | 179 | // Fiels 'hops', 'yiaddr', 'siaddr', 'giaddr' are always zero |
180 | // DHCPINFORM DHCPRELEASE | ||
181 | // ----- ------------ ----------- ----------- | ||
182 | // 'op' BOOTREQUEST BOOTREQUEST BOOTREQUEST | ||
183 | // 'hops' 0 0 0 | ||
184 | // 'xid' selected by client 'xid' from server selected by | ||
185 | // DHCPOFFER message client | ||
186 | // 'secs' 0 or seconds since 0 or seconds since 0 | ||
187 | // DHCP process started DHCP process started | ||
188 | // 'flags' Set 'BROADCAST' Set 'BROADCAST' 0 | ||
189 | // flag if client flag if client | ||
190 | // requires broadcast requires broadcast | ||
191 | // reply reply | ||
192 | // 'ciaddr' 0 (DHCPDISCOVER) 0 or client's 0 (DHCPDECLINE) | ||
193 | // client's network address client's network | ||
194 | // network address (BOUND/RENEW/REBIND) address | ||
195 | // (DHCPINFORM) (DHCPRELEASE) | ||
196 | // 'yiaddr' 0 0 0 | ||
197 | // 'siaddr' 0 0 0 | ||
198 | // 'giaddr' 0 0 0 | ||
199 | // 'chaddr' client's hardware client's hardware client's hardware | ||
200 | // address address address | ||
201 | // 'sname' options, if options, if (unused) | ||
202 | // indicated in indicated in | ||
203 | // 'sname/file' 'sname/file' | ||
204 | // option; otherwise option; otherwise | ||
205 | // unused unused | ||
206 | // 'file' options, if options, if (unused) | ||
207 | // indicated in indicated in | ||
208 | // 'sname/file' 'sname/file' | ||
209 | // option; otherwise option; otherwise | ||
210 | // unused unused | ||
211 | // 'options' options options (unused) | ||
212 | // | 180 | // |
213 | // Option DHCPDISCOVER DHCPREQUEST DHCPDECLINE, | 181 | // Field DHCPDISCOVER DHCPINFORM DHCPREQUEST DHCPDECLINE DHCPRELEASE |
214 | // DHCPINFORM DHCPRELEASE | 182 | // ----- ------------ ------------ ----------- ----------- ----------- |
215 | // ------ ------------ ----------- ----------- | 183 | // 'xid' selected by client selected by client 'xid' from server selected by client selected by client |
216 | // Requested IP address MAY MUST (in MUST | 184 | // DHCPOFFER message |
217 | // (DISCOVER) SELECTING or (DHCPDECLINE), | 185 | // 'secs' 0 or seconds since 0 or seconds since 0 or seconds since 0 0 |
218 | // MUST NOT INIT-REBOOT) MUST NOT | 186 | // DHCP process started DHCP process started DHCP process started |
219 | // (INFORM) MUST NOT (in (DHCPRELEASE) | 187 | // 'flags' Set 'BROADCAST' Set 'BROADCAST' Set 'BROADCAST' 0 0 |
220 | // BOUND or | 188 | // flag if client flag if client flag if client |
221 | // RENEWING) | 189 | // requires broadcast requires broadcast requires broadcast |
222 | // IP address lease time MAY MAY MUST NOT | 190 | // reply reply reply |
223 | // (DISCOVER) | 191 | // 'ciaddr' 0 client's IP 0 or client's IP 0 client's IP |
224 | // MUST NOT | 192 | // (BOUND/RENEW/REBIND) |
225 | // (INFORM) | 193 | // 'chaddr' client's MAC client's MAC client's MAC client's MAC client's MAC |
226 | // Use 'file'/'sname' fields MAY MAY MAY | 194 | // 'sname' options or sname options or sname options or sname (unused) (unused) |
227 | // Client identifier MAY MAY MAY | 195 | // 'file' options or file options or file options or file (unused) (unused) |
228 | // Vendor class identifier MAY MAY MUST NOT | 196 | // 'options' options options options message type opt message type opt |
229 | // Server identifier MUST NOT MUST (after MUST | 197 | // |
230 | // SELECTING) | 198 | // Option DHCPDISCOVER DHCPINFORM DHCPREQUEST DHCPDECLINE DHCPRELEASE |
231 | // MUST NOT (after | 199 | // ------ ------------ ---------- ----------- ----------- ----------- |
232 | // INIT-REBOOT, | 200 | // Requested IP address MAY MUST NOT MUST (in MUST MUST NOT |
233 | // BOUND, RENEWING | 201 | // SELECTING or |
234 | // or REBINDING) | 202 | // INIT-REBOOT) |
235 | // Parameter request list MAY MAY MUST NOT | 203 | // MUST NOT (in |
236 | // Maximum message size MAY MAY MUST NOT | 204 | // BOUND or |
237 | // Message SHOULD NOT SHOULD NOT SHOULD | 205 | // RENEWING) |
238 | // Site-specific MAY MAY MUST NOT | 206 | // IP address lease time MAY MUST NOT MAY MUST NOT MUST NOT |
239 | // All others MAY MAY MUST NOT | 207 | // Use 'file'/'sname' fields MAY MAY MAY MAY MAY |
208 | // Client identifier MAY MAY MAY MAY MAY | ||
209 | // Vendor class identifier MAY MAY MAY MUST NOT MUST NOT | ||
210 | // Server identifier MUST NOT MUST NOT MUST (after MUST MUST | ||
211 | // SELECTING) | ||
212 | // MUST NOT (after | ||
213 | // INIT-REBOOT, | ||
214 | // BOUND, RENEWING | ||
215 | // or REBINDING) | ||
216 | // Parameter request list MAY MAY MAY MUST NOT MUST NOT | ||
217 | // Maximum message size MAY MAY MAY MUST NOT MUST NOT | ||
218 | // Message SHOULD NOT SHOULD NOT SHOULD NOT SHOULD SHOULD | ||
219 | // Site-specific MAY MAY MAY MUST NOT MUST NOT | ||
220 | // All others MAY MAY MAY MUST NOT MUST NOT | ||
240 | 221 | ||
241 | 222 | ||
242 | /*** Logging ***/ | 223 | /*** Logging ***/ |