Skip to content

Commit 52f6a29

Browse files
fxlbfxlb
committed
DHCP: Fix printing for option 116 "Auto-Configure" (RFC 2563)
1 parent 7328aad commit 52f6a29

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

‎print-bootp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ struct bootp {
179179
/* RFC 2485 */
180180
#define TAG_OPEN_GROUP_UAP ((uint8_t) 98)
181181
/* RFC 2563 */
182-
#define TAG_DISABLE_AUTOCONF ((uint8_t) 116)
182+
#define TAG_AUTO_CONFIGURE ((uint8_t) 116)
183183
/* RFC 2610 */
184184
#define TAG_SLP_DA ((uint8_t) 78)
185185
#define TAG_SLP_SCOPE ((uint8_t) 79)
@@ -493,7 +493,7 @@ static const struct tok tag2str[] = {
493493
/* RFC 2485 */
494494
{ TAG_OPEN_GROUP_UAP, "aUAP" },
495495
/* RFC 2563 */
496-
{ TAG_DISABLE_AUTOCONF, "BNOAUTO" },
496+
{ TAG_AUTO_CONFIGURE, "BAuto-Configure" },
497497
/* RFC 2610 */
498498
{ TAG_SLP_DA, "bSLP-DA" }, /*"b" is a little wrong */
499499
{ TAG_SLP_SCOPE, "bSLP-SCOPE" }, /*"b" is a little wrong */

‎tests/eapon1-v-nosmb.out

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
Vendor-rfc1048 Extensions
3838
Magic Cookie 0x63825363
3939
DHCP-Message (53), length 1: Discover
40-
NOAUTO (116), length 1: Y
40+
Auto-Configure (116), length 1: Y
4141
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
4242
Requested-IP (50), length 4: 192.168.1.249
4343
Hostname (12), length 8: "DJP95S0J"
@@ -52,7 +52,7 @@
5252
Vendor-rfc1048 Extensions
5353
Magic Cookie 0x63825363
5454
DHCP-Message (53), length 1: Discover
55-
NOAUTO (116), length 1: Y
55+
Auto-Configure (116), length 1: Y
5656
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
5757
Requested-IP (50), length 4: 192.168.1.249
5858
Hostname (12), length 8: "DJP95S0J"
@@ -83,7 +83,7 @@
8383
Vendor-rfc1048 Extensions
8484
Magic Cookie 0x63825363
8585
DHCP-Message (53), length 1: Discover
86-
NOAUTO (116), length 1: Y
86+
Auto-Configure (116), length 1: Y
8787
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
8888
Requested-IP (50), length 4: 192.168.1.249
8989
Hostname (12), length 8: "DJP95S0J"
@@ -98,7 +98,7 @@
9898
Vendor-rfc1048 Extensions
9999
Magic Cookie 0x63825363
100100
DHCP-Message (53), length 1: Discover
101-
NOAUTO (116), length 1: Y
101+
Auto-Configure (116), length 1: Y
102102
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
103103
Requested-IP (50), length 4: 192.168.1.249
104104
Hostname (12), length 8: "DJP95S0J"
@@ -113,7 +113,7 @@
113113
Vendor-rfc1048 Extensions
114114
Magic Cookie 0x63825363
115115
DHCP-Message (53), length 1: Discover
116-
NOAUTO (116), length 1: Y
116+
Auto-Configure (116), length 1: Y
117117
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
118118
Requested-IP (50), length 4: 192.168.1.249
119119
Hostname (12), length 8: "DJP95S0J"
@@ -159,7 +159,7 @@
159159
Vendor-rfc1048 Extensions
160160
Magic Cookie 0x63825363
161161
DHCP-Message (53), length 1: Discover
162-
NOAUTO (116), length 1: Y
162+
Auto-Configure (116), length 1: Y
163163
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
164164
Requested-IP (50), length 4: 192.168.1.249
165165
Hostname (12), length 8: "DJP95S0J"
@@ -202,7 +202,7 @@
202202
Vendor-rfc1048 Extensions
203203
Magic Cookie 0x63825363
204204
DHCP-Message (53), length 1: Discover
205-
NOAUTO (116), length 1: Y
205+
Auto-Configure (116), length 1: Y
206206
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
207207
Requested-IP (50), length 4: 192.168.1.249
208208
Hostname (12), length 8: "DJP95S0J"
@@ -245,7 +245,7 @@
245245
Vendor-rfc1048 Extensions
246246
Magic Cookie 0x63825363
247247
DHCP-Message (53), length 1: Discover
248-
NOAUTO (116), length 1: Y
248+
Auto-Configure (116), length 1: Y
249249
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
250250
Requested-IP (50), length 4: 192.168.1.249
251251
Hostname (12), length 8: "DJP95S0J"
@@ -302,7 +302,7 @@
302302
Vendor-rfc1048 Extensions
303303
Magic Cookie 0x63825363
304304
DHCP-Message (53), length 1: Discover
305-
NOAUTO (116), length 1: Y
305+
Auto-Configure (116), length 1: Y
306306
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
307307
Requested-IP (50), length 4: 192.168.1.249
308308
Hostname (12), length 8: "DJP95S0J"

‎tests/eapon1-v.out

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
Vendor-rfc1048 Extensions
3838
Magic Cookie 0x63825363
3939
DHCP-Message (53), length 1: Discover
40-
NOAUTO (116), length 1: Y
40+
Auto-Configure (116), length 1: Y
4141
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
4242
Requested-IP (50), length 4: 192.168.1.249
4343
Hostname (12), length 8: "DJP95S0J"
@@ -52,7 +52,7 @@
5252
Vendor-rfc1048 Extensions
5353
Magic Cookie 0x63825363
5454
DHCP-Message (53), length 1: Discover
55-
NOAUTO (116), length 1: Y
55+
Auto-Configure (116), length 1: Y
5656
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
5757
Requested-IP (50), length 4: 192.168.1.249
5858
Hostname (12), length 8: "DJP95S0J"
@@ -83,7 +83,7 @@
8383
Vendor-rfc1048 Extensions
8484
Magic Cookie 0x63825363
8585
DHCP-Message (53), length 1: Discover
86-
NOAUTO (116), length 1: Y
86+
Auto-Configure (116), length 1: Y
8787
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
8888
Requested-IP (50), length 4: 192.168.1.249
8989
Hostname (12), length 8: "DJP95S0J"
@@ -98,7 +98,7 @@
9898
Vendor-rfc1048 Extensions
9999
Magic Cookie 0x63825363
100100
DHCP-Message (53), length 1: Discover
101-
NOAUTO (116), length 1: Y
101+
Auto-Configure (116), length 1: Y
102102
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
103103
Requested-IP (50), length 4: 192.168.1.249
104104
Hostname (12), length 8: "DJP95S0J"
@@ -113,7 +113,7 @@
113113
Vendor-rfc1048 Extensions
114114
Magic Cookie 0x63825363
115115
DHCP-Message (53), length 1: Discover
116-
NOAUTO (116), length 1: Y
116+
Auto-Configure (116), length 1: Y
117117
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
118118
Requested-IP (50), length 4: 192.168.1.249
119119
Hostname (12), length 8: "DJP95S0J"
@@ -159,7 +159,7 @@
159159
Vendor-rfc1048 Extensions
160160
Magic Cookie 0x63825363
161161
DHCP-Message (53), length 1: Discover
162-
NOAUTO (116), length 1: Y
162+
Auto-Configure (116), length 1: Y
163163
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
164164
Requested-IP (50), length 4: 192.168.1.249
165165
Hostname (12), length 8: "DJP95S0J"
@@ -202,7 +202,7 @@
202202
Vendor-rfc1048 Extensions
203203
Magic Cookie 0x63825363
204204
DHCP-Message (53), length 1: Discover
205-
NOAUTO (116), length 1: Y
205+
Auto-Configure (116), length 1: Y
206206
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
207207
Requested-IP (50), length 4: 192.168.1.249
208208
Hostname (12), length 8: "DJP95S0J"
@@ -245,7 +245,7 @@
245245
Vendor-rfc1048 Extensions
246246
Magic Cookie 0x63825363
247247
DHCP-Message (53), length 1: Discover
248-
NOAUTO (116), length 1: Y
248+
Auto-Configure (116), length 1: Y
249249
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
250250
Requested-IP (50), length 4: 192.168.1.249
251251
Hostname (12), length 8: "DJP95S0J"
@@ -302,7 +302,7 @@
302302
Vendor-rfc1048 Extensions
303303
Magic Cookie 0x63825363
304304
DHCP-Message (53), length 1: Discover
305-
NOAUTO (116), length 1: Y
305+
Auto-Configure (116), length 1: Y
306306
Client-ID (61), length 7: ether 00:04:23:57:a5:7a
307307
Requested-IP (50), length 4: 192.168.1.249
308308
Hostname (12), length 8: "DJP95S0J"

0 commit comments

Comments
 (0)