Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Kea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
415
Issues
415
List
Boards
Labels
Service Desk
Milestones
Merge Requests
67
Merge Requests
67
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
Kea
Commits
e0689af0
Commit
e0689af0
authored
Sep 12, 2018
by
Francis Dupont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[116-interface-id-dhcpv4] regen flex/bison
parent
d32bb27f
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
2427 additions
and
2477 deletions
+2427
-2477
src/bin/dhcp4/dhcp4_lexer.cc
src/bin/dhcp4/dhcp4_lexer.cc
+805
-820
src/bin/dhcp4/dhcp4_parser.cc
src/bin/dhcp4/dhcp4_parser.cc
+1475
-1498
src/bin/dhcp4/dhcp4_parser.h
src/bin/dhcp4/dhcp4_parser.h
+144
-156
src/bin/dhcp4/location.hh
src/bin/dhcp4/location.hh
+1
-1
src/bin/dhcp4/position.hh
src/bin/dhcp4/position.hh
+1
-1
src/bin/dhcp4/stack.hh
src/bin/dhcp4/stack.hh
+1
-1
No files found.
src/bin/dhcp4/dhcp4_lexer.cc
View file @
e0689af0
This diff is collapsed.
Click to expand it.
src/bin/dhcp4/dhcp4_parser.cc
View file @
e0689af0
This diff is collapsed.
Click to expand it.
src/bin/dhcp4/dhcp4_parser.h
View file @
e0689af0
...
...
@@ -421,96 +421,95 @@ namespace isc { namespace dhcp {
TOKEN_COMMENT
=
328
,
TOKEN_SUBNET
=
329
,
TOKEN_INTERFACE
=
330
,
TOKEN_INTERFACE_ID
=
331
,
TOKEN_ID
=
332
,
TOKEN_RAPID_COMMIT
=
333
,
TOKEN_RESERVATION_MODE
=
334
,
TOKEN_DISABLED
=
335
,
TOKEN_OUT_OF_POOL
=
336
,
TOKEN_GLOBAL
=
337
,
TOKEN_ALL
=
338
,
TOKEN_HOST_RESERVATION_IDENTIFIERS
=
339
,
TOKEN_CLIENT_CLASSES
=
340
,
TOKEN_REQUIRE_CLIENT_CLASSES
=
341
,
TOKEN_TEST
=
342
,
TOKEN_ONLY_IF_REQUIRED
=
343
,
TOKEN_CLIENT_CLASS
=
344
,
TOKEN_RESERVATIONS
=
345
,
TOKEN_DUID
=
346
,
TOKEN_HW_ADDRESS
=
347
,
TOKEN_CIRCUIT_ID
=
348
,
TOKEN_CLIENT_ID
=
349
,
TOKEN_HOSTNAME
=
350
,
TOKEN_FLEX_ID
=
351
,
TOKEN_RELAY
=
352
,
TOKEN_IP_ADDRESS
=
353
,
TOKEN_IP_ADDRESSES
=
354
,
TOKEN_HOOKS_LIBRARIES
=
355
,
TOKEN_LIBRARY
=
356
,
TOKEN_PARAMETERS
=
357
,
TOKEN_EXPIRED_LEASES_PROCESSING
=
358
,
TOKEN_RECLAIM_TIMER_WAIT_TIME
=
359
,
TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME
=
360
,
TOKEN_HOLD_RECLAIMED_TIME
=
361
,
TOKEN_MAX_RECLAIM_LEASES
=
362
,
TOKEN_MAX_RECLAIM_TIME
=
363
,
TOKEN_UNWARNED_RECLAIM_CYCLES
=
364
,
TOKEN_DHCP4O6_PORT
=
365
,
TOKEN_CONTROL_SOCKET
=
366
,
TOKEN_SOCKET_TYPE
=
367
,
TOKEN_SOCKET_NAME
=
368
,
TOKEN_DHCP_DDNS
=
369
,
TOKEN_ENABLE_UPDATES
=
370
,
TOKEN_QUALIFYING_SUFFIX
=
371
,
TOKEN_SERVER_IP
=
372
,
TOKEN_SERVER_PORT
=
373
,
TOKEN_SENDER_IP
=
374
,
TOKEN_SENDER_PORT
=
375
,
TOKEN_MAX_QUEUE_SIZE
=
376
,
TOKEN_NCR_PROTOCOL
=
377
,
TOKEN_NCR_FORMAT
=
378
,
TOKEN_ALWAYS_INCLUDE_FQDN
=
379
,
TOKEN_OVERRIDE_NO_UPDATE
=
380
,
TOKEN_OVERRIDE_CLIENT_UPDATE
=
381
,
TOKEN_REPLACE_CLIENT_NAME
=
382
,
TOKEN_GENERATED_PREFIX
=
383
,
TOKEN_TCP
=
384
,
TOKEN_JSON
=
385
,
TOKEN_WHEN_PRESENT
=
386
,
TOKEN_NEVER
=
387
,
TOKEN_ALWAYS
=
388
,
TOKEN_WHEN_NOT_PRESENT
=
389
,
TOKEN_HOSTNAME_CHAR_SET
=
390
,
TOKEN_HOSTNAME_CHAR_REPLACEMENT
=
391
,
TOKEN_LOGGING
=
392
,
TOKEN_LOGGERS
=
393
,
TOKEN_OUTPUT_OPTIONS
=
394
,
TOKEN_OUTPUT
=
395
,
TOKEN_DEBUGLEVEL
=
396
,
TOKEN_SEVERITY
=
397
,
TOKEN_FLUSH
=
398
,
TOKEN_MAXSIZE
=
399
,
TOKEN_MAXVER
=
400
,
TOKEN_DHCP6
=
401
,
TOKEN_DHCPDDNS
=
402
,
TOKEN_CONTROL_AGENT
=
403
,
TOKEN_TOPLEVEL_JSON
=
404
,
TOKEN_TOPLEVEL_DHCP4
=
405
,
TOKEN_SUB_DHCP4
=
406
,
TOKEN_SUB_INTERFACES4
=
407
,
TOKEN_SUB_SUBNET4
=
408
,
TOKEN_SUB_POOL4
=
409
,
TOKEN_SUB_RESERVATION
=
410
,
TOKEN_SUB_OPTION_DEFS
=
411
,
TOKEN_SUB_OPTION_DEF
=
412
,
TOKEN_SUB_OPTION_DATA
=
413
,
TOKEN_SUB_HOOKS_LIBRARY
=
414
,
TOKEN_SUB_DHCP_DDNS
=
415
,
TOKEN_SUB_LOGGING
=
416
,
TOKEN_STRING
=
417
,
TOKEN_INTEGER
=
418
,
TOKEN_FLOAT
=
419
,
TOKEN_BOOLEAN
=
420
TOKEN_ID
=
331
,
TOKEN_RAPID_COMMIT
=
332
,
TOKEN_RESERVATION_MODE
=
333
,
TOKEN_DISABLED
=
334
,
TOKEN_OUT_OF_POOL
=
335
,
TOKEN_GLOBAL
=
336
,
TOKEN_ALL
=
337
,
TOKEN_HOST_RESERVATION_IDENTIFIERS
=
338
,
TOKEN_CLIENT_CLASSES
=
339
,
TOKEN_REQUIRE_CLIENT_CLASSES
=
340
,
TOKEN_TEST
=
341
,
TOKEN_ONLY_IF_REQUIRED
=
342
,
TOKEN_CLIENT_CLASS
=
343
,
TOKEN_RESERVATIONS
=
344
,
TOKEN_DUID
=
345
,
TOKEN_HW_ADDRESS
=
346
,
TOKEN_CIRCUIT_ID
=
347
,
TOKEN_CLIENT_ID
=
348
,
TOKEN_HOSTNAME
=
349
,
TOKEN_FLEX_ID
=
350
,
TOKEN_RELAY
=
351
,
TOKEN_IP_ADDRESS
=
352
,
TOKEN_IP_ADDRESSES
=
353
,
TOKEN_HOOKS_LIBRARIES
=
354
,
TOKEN_LIBRARY
=
355
,
TOKEN_PARAMETERS
=
356
,
TOKEN_EXPIRED_LEASES_PROCESSING
=
357
,
TOKEN_RECLAIM_TIMER_WAIT_TIME
=
358
,
TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME
=
359
,
TOKEN_HOLD_RECLAIMED_TIME
=
360
,
TOKEN_MAX_RECLAIM_LEASES
=
361
,
TOKEN_MAX_RECLAIM_TIME
=
362
,
TOKEN_UNWARNED_RECLAIM_CYCLES
=
363
,
TOKEN_DHCP4O6_PORT
=
364
,
TOKEN_CONTROL_SOCKET
=
365
,
TOKEN_SOCKET_TYPE
=
366
,
TOKEN_SOCKET_NAME
=
367
,
TOKEN_DHCP_DDNS
=
368
,
TOKEN_ENABLE_UPDATES
=
369
,
TOKEN_QUALIFYING_SUFFIX
=
370
,
TOKEN_SERVER_IP
=
371
,
TOKEN_SERVER_PORT
=
372
,
TOKEN_SENDER_IP
=
373
,
TOKEN_SENDER_PORT
=
374
,
TOKEN_MAX_QUEUE_SIZE
=
375
,
TOKEN_NCR_PROTOCOL
=
376
,
TOKEN_NCR_FORMAT
=
377
,
TOKEN_ALWAYS_INCLUDE_FQDN
=
378
,
TOKEN_OVERRIDE_NO_UPDATE
=
379
,
TOKEN_OVERRIDE_CLIENT_UPDATE
=
380
,
TOKEN_REPLACE_CLIENT_NAME
=
381
,
TOKEN_GENERATED_PREFIX
=
382
,
TOKEN_TCP
=
383
,
TOKEN_JSON
=
384
,
TOKEN_WHEN_PRESENT
=
385
,
TOKEN_NEVER
=
386
,
TOKEN_ALWAYS
=
387
,
TOKEN_WHEN_NOT_PRESENT
=
388
,
TOKEN_HOSTNAME_CHAR_SET
=
389
,
TOKEN_HOSTNAME_CHAR_REPLACEMENT
=
390
,
TOKEN_LOGGING
=
391
,
TOKEN_LOGGERS
=
392
,
TOKEN_OUTPUT_OPTIONS
=
393
,
TOKEN_OUTPUT
=
394
,
TOKEN_DEBUGLEVEL
=
395
,
TOKEN_SEVERITY
=
396
,
TOKEN_FLUSH
=
397
,
TOKEN_MAXSIZE
=
398
,
TOKEN_MAXVER
=
399
,
TOKEN_DHCP6
=
400
,
TOKEN_DHCPDDNS
=
401
,
TOKEN_CONTROL_AGENT
=
402
,
TOKEN_TOPLEVEL_JSON
=
403
,
TOKEN_TOPLEVEL_DHCP4
=
404
,
TOKEN_SUB_DHCP4
=
405
,
TOKEN_SUB_INTERFACES4
=
406
,
TOKEN_SUB_SUBNET4
=
407
,
TOKEN_SUB_POOL4
=
408
,
TOKEN_SUB_RESERVATION
=
409
,
TOKEN_SUB_OPTION_DEFS
=
410
,
TOKEN_SUB_OPTION_DEF
=
411
,
TOKEN_SUB_OPTION_DATA
=
412
,
TOKEN_SUB_HOOKS_LIBRARY
=
413
,
TOKEN_SUB_DHCP_DDNS
=
414
,
TOKEN_SUB_LOGGING
=
415
,
TOKEN_STRING
=
416
,
TOKEN_INTEGER
=
417
,
TOKEN_FLOAT
=
418
,
TOKEN_BOOLEAN
=
419
};
};
...
...
@@ -921,10 +920,6 @@ namespace isc { namespace dhcp {
symbol_type
make_INTERFACE
(
const
location_type
&
l
);
static
inline
symbol_type
make_INTERFACE_ID
(
const
location_type
&
l
);
static
inline
symbol_type
make_ID
(
const
location_type
&
l
);
...
...
@@ -1488,12 +1483,12 @@ namespace isc { namespace dhcp {
enum
{
yyeof_
=
0
,
yylast_
=
9
65
,
///< Last index in yytable_.
yynnts_
=
36
3
,
///< Number of nonterminal symbols.
yylast_
=
9
71
,
///< Last index in yytable_.
yynnts_
=
36
1
,
///< Number of nonterminal symbols.
yyfinal_
=
28
,
///< Termination state number.
yyterror_
=
1
,
yyerrcode_
=
256
,
yyntokens_
=
16
6
///< Number of tokens.
yyntokens_
=
16
5
///< Number of tokens.
};
...
...
@@ -1551,10 +1546,9 @@ namespace isc { namespace dhcp {
125
,
126
,
127
,
128
,
129
,
130
,
131
,
132
,
133
,
134
,
135
,
136
,
137
,
138
,
139
,
140
,
141
,
142
,
143
,
144
,
145
,
146
,
147
,
148
,
149
,
150
,
151
,
152
,
153
,
154
,
155
,
156
,
157
,
158
,
159
,
160
,
161
,
162
,
163
,
164
,
165
155
,
156
,
157
,
158
,
159
,
160
,
161
,
162
,
163
,
164
};
const
unsigned
user_token_number_max_
=
4
20
;
const
unsigned
user_token_number_max_
=
4
19
;
const
token_number_type
undef_token_
=
2
;
if
(
static_cast
<
int
>
(
t
)
<=
yyeof_
)
...
...
@@ -1585,30 +1579,30 @@ namespace isc { namespace dhcp {
{
switch
(
other
.
type_get
())
{
case
18
1
:
// value
case
18
5
:
// map_value
case
22
3
:
// socket_type
case
22
6
:
// outbound_interface_value
case
24
8
:
// db_type
case
3
32
:
// hr_mode
case
4
80
:
// ncr_protocol_value
case
48
8
:
// replace_client_name_value
case
18
0
:
// value
case
18
4
:
// map_value
case
22
2
:
// socket_type
case
22
5
:
// outbound_interface_value
case
24
7
:
// db_type
case
3
29
:
// hr_mode
case
4
77
:
// ncr_protocol_value
case
48
5
:
// replace_client_name_value
value
.
copy
<
ElementPtr
>
(
other
.
value
);
break
;
case
16
5
:
// "boolean"
case
16
4
:
// "boolean"
value
.
copy
<
bool
>
(
other
.
value
);
break
;
case
16
4
:
// "floating point"
case
16
3
:
// "floating point"
value
.
copy
<
double
>
(
other
.
value
);
break
;
case
16
3
:
// "integer"
case
16
2
:
// "integer"
value
.
copy
<
int64_t
>
(
other
.
value
);
break
;
case
16
2
:
// "constant string"
case
16
1
:
// "constant string"
value
.
copy
<
std
::
string
>
(
other
.
value
);
break
;
...
...
@@ -1627,30 +1621,30 @@ namespace isc { namespace dhcp {
(
void
)
v
;
switch
(
this
->
type_get
())
{
case
18
1
:
// value
case
18
5
:
// map_value
case
22
3
:
// socket_type
case
22
6
:
// outbound_interface_value
case
24
8
:
// db_type
case
3
32
:
// hr_mode
case
4
80
:
// ncr_protocol_value
case
48
8
:
// replace_client_name_value
case
18
0
:
// value
case
18
4
:
// map_value
case
22
2
:
// socket_type
case
22
5
:
// outbound_interface_value
case
24
7
:
// db_type
case
3
29
:
// hr_mode
case
4
77
:
// ncr_protocol_value
case
48
5
:
// replace_client_name_value
value
.
copy
<
ElementPtr
>
(
v
);
break
;
case
16
5
:
// "boolean"
case
16
4
:
// "boolean"
value
.
copy
<
bool
>
(
v
);
break
;
case
16
4
:
// "floating point"
case
16
3
:
// "floating point"
value
.
copy
<
double
>
(
v
);
break
;
case
16
3
:
// "integer"
case
16
2
:
// "integer"
value
.
copy
<
int64_t
>
(
v
);
break
;
case
16
2
:
// "constant string"
case
16
1
:
// "constant string"
value
.
copy
<
std
::
string
>
(
v
);
break
;
...
...
@@ -1728,30 +1722,30 @@ namespace isc { namespace dhcp {
// Type destructor.
switch
(
yytype
)
{
case
18
1
:
// value
case
18
5
:
// map_value
case
22
3
:
// socket_type
case
22
6
:
// outbound_interface_value
case
24
8
:
// db_type
case
3
32
:
// hr_mode
case
4
80
:
// ncr_protocol_value
case
48
8
:
// replace_client_name_value
case
18
0
:
// value
case
18
4
:
// map_value
case
22
2
:
// socket_type
case
22
5
:
// outbound_interface_value
case
24
7
:
// db_type
case
3
29
:
// hr_mode
case
4
77
:
// ncr_protocol_value
case
48
5
:
// replace_client_name_value
value
.
template
destroy
<
ElementPtr
>
();
break
;
case
16
5
:
// "boolean"
case
16
4
:
// "boolean"
value
.
template
destroy
<
bool
>
();
break
;
case
16
4
:
// "floating point"
case
16
3
:
// "floating point"
value
.
template
destroy
<
double
>
();
break
;
case
16
3
:
// "integer"
case
16
2
:
// "integer"
value
.
template
destroy
<
int64_t
>
();
break
;
case
16
2
:
// "constant string"
case
16
1
:
// "constant string"
value
.
template
destroy
<
std
::
string
>
();
break
;
...
...
@@ -1776,30 +1770,30 @@ namespace isc { namespace dhcp {
super_type
::
move
(
s
);
switch
(
this
->
type_get
())
{
case
18
1
:
// value
case
18
5
:
// map_value
case
22
3
:
// socket_type
case
22
6
:
// outbound_interface_value
case
24
8
:
// db_type
case
3
32
:
// hr_mode
case
4
80
:
// ncr_protocol_value
case
48
8
:
// replace_client_name_value
case
18
0
:
// value
case
18
4
:
// map_value
case
22
2
:
// socket_type
case
22
5
:
// outbound_interface_value
case
24
7
:
// db_type
case
3
29
:
// hr_mode
case
4
77
:
// ncr_protocol_value
case
48
5
:
// replace_client_name_value
value
.
move
<
ElementPtr
>
(
s
.
value
);
break
;
case
16
5
:
// "boolean"
case
16
4
:
// "boolean"
value
.
move
<
bool
>
(
s
.
value
);
break
;
case
16
4
:
// "floating point"
case
16
3
:
// "floating point"
value
.
move
<
double
>
(
s
.
value
);
break
;
case
16
3
:
// "integer"
case
16
2
:
// "integer"
value
.
move
<
int64_t
>
(
s
.
value
);
break
;
case
16
2
:
// "constant string"
case
16
1
:
// "constant string"
value
.
move
<
std
::
string
>
(
s
.
value
);
break
;
...
...
@@ -1874,7 +1868,7 @@ namespace isc { namespace dhcp {
385
,
386
,
387
,
388
,
389
,
390
,
391
,
392
,
393
,
394
,
395
,
396
,
397
,
398
,
399
,
400
,
401
,
402
,
403
,
404
,
405
,
406
,
407
,
408
,
409
,
410
,
411
,
412
,
413
,
414
,
415
,
416
,
417
,
418
,
419
,
420
415
,
416
,
417
,
418
,
419
};
return
static_cast
<
token_type
>
(
yytoken_number_
[
type
]);
}
...
...
@@ -2323,12 +2317,6 @@ namespace isc { namespace dhcp {
return
symbol_type
(
token
::
TOKEN_INTERFACE
,
l
);
}
Dhcp4Parser
::
symbol_type
Dhcp4Parser
::
make_INTERFACE_ID
(
const
location_type
&
l
)
{
return
symbol_type
(
token
::
TOKEN_INTERFACE_ID
,
l
);
}
Dhcp4Parser
::
symbol_type
Dhcp4Parser
::
make_ID
(
const
location_type
&
l
)
{
...
...
@@ -2866,7 +2854,7 @@ namespace isc { namespace dhcp {
#line 14 "dhcp4_parser.yy" // lalr1.cc:379
}
}
// isc::dhcp
#line 28
70
"dhcp4_parser.h" // lalr1.cc:379
#line 28
58
"dhcp4_parser.h" // lalr1.cc:379
...
...
src/bin/dhcp4/location.hh
View file @
e0689af0
// Generated 20180
8161137
// Generated 20180
9121854
// A Bison parser, made by GNU Bison 3.0.5.
// Locations for Bison parsers in C++
...
...
src/bin/dhcp4/position.hh
View file @
e0689af0
// Generated 20180
8161137
// Generated 20180
9121854
// A Bison parser, made by GNU Bison 3.0.5.
// Positions for Bison parsers in C++
...
...
src/bin/dhcp4/stack.hh
View file @
e0689af0
// Generated 20180
8161137
// Generated 20180
9121854
// A Bison parser, made by GNU Bison 3.0.5.
// Stack handling for Bison parsers in C++
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment