Skip to content

Commit b2c452b

Browse files
author
agrabil
committed
Updates for v3.1.0
Update documentation to show examples in XML, JSON, and YAML. Update sample configuration files for XML, JSON, and YAML. Update POM to version 3.1.0
1 parent 7152073 commit b2c452b

File tree

9 files changed

+2807
-602
lines changed

9 files changed

+2807
-602
lines changed

‎Jagornet-DHCP/dhcp-server/config/dhcpserver-basic.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
},
2424
"v4RoutersOption" : {
2525
"ipAddressList" : [ "10.0.0.1" ]
26+
},
27+
"v4DomainServersOption" : {
28+
"ipAddressList" : [ "1.1.1.1", "8.8.8.8" ]
29+
},
30+
"v4DomainNameOption" : {
31+
"domainName" : "foo.com."
2632
}
2733
},
2834
"v4AddrPools" : {

‎Jagornet-DHCP/dhcp-server/config/dhcpserver-basic.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@
3939
<v4RoutersOption>
4040
<ipAddressList>10.0.0.1</ipAddressList>
4141
</v4RoutersOption>
42+
<v4DomainServersOption>
43+
<ipAddressList>1.1.1.1</ipAddressList>
44+
<ipAddressList>8.8.8.8</ipAddressList>
45+
</v4DomainServersOption>
46+
<v4DomainNameOption>
47+
<domainName>foo.com.</domainName>
48+
</v4DomainNameOption>
4249
</v4ConfigOptions>
4350
<v4AddrPools>
4451
<poolList>

‎Jagornet-DHCP/dhcp-server/config/dhcpserver-basic.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ links:
2525
v4RoutersOption:
2626
ipAddressList:
2727
- "10.0.0.1"
28+
v4DomainServersOption:
29+
ipAddressList:
30+
- "1.1.1.1"
31+
- "8.8.8.8"
32+
v4DomainNameOption:
33+
domainName: "foo.com."
2834
v4AddrPools:
2935
poolList:
3036
- range: "10.0.0.100-10.0.0.199"

‎Jagornet-DHCP/dhcp-server/config/dhcpserver-sample.json‎

Lines changed: 69 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"asciiValue" : "MyUserClass"
5151
} ]
5252
},
53-
"operator" : "equals"
53+
"operator" : "EQUALS"
5454
}
5555
} ]
5656
},
@@ -70,14 +70,14 @@
7070
"asciiValue" : "VendorXYZ"
7171
} ]
7272
},
73-
"operator" : "equals"
73+
"operator" : "EQUALS"
7474
}
7575
} ]
7676
},
7777
"v6MsgConfigOptions" : {
7878
"v6VendorInfoOption" : {
7979
"enterpriseNumber" : 12345,
80-
"suboptionList" : {
80+
"subOptions" : {
8181
"optionDefList" : [ {
8282
"stringOption" : {
8383
"string" : "hello"
@@ -93,7 +93,44 @@
9393
}
9494
}
9595
}, {
96-
"name" : "DHCPv4 VendorClass Filter",
96+
"name" : "DHCPv4 VendorClass Filter 1",
97+
"filterExpressions" : {
98+
"filterExpressionList" : [ {
99+
"clientClassExpression" : {
100+
"v4VendorClassOption" : {
101+
"opaqueData" : {
102+
"asciiValue" : "VendorXYZ"
103+
}
104+
},
105+
"operator" : "EQUALS"
106+
}
107+
} ]
108+
},
109+
"v4ConfigOptions" : {
110+
"v4VendorSpecificOption" : {
111+
"opaqueData" : {
112+
"subOptions" : {
113+
"optionDefList" : [ {
114+
"stringOption" : {
115+
"string" : "VendorSpecial"
116+
},
117+
"v4" : true,
118+
"code" : 1,
119+
"name" : "VendorXYZSubopt1"
120+
}, {
121+
"ipAddressOption" : {
122+
"ipAddress" : "10.11.12.13"
123+
},
124+
"v4" : true,
125+
"code" : 2,
126+
"name" : "VendorXYZSubopt2"
127+
} ]
128+
}
129+
}
130+
}
131+
}
132+
}, {
133+
"name" : "DHCPv4 VendorClass Filter 2",
97134
"filterExpressions" : {
98135
"filterExpressionList" : [ {
99136
"clientClassExpression" : {
@@ -102,7 +139,7 @@
102139
"asciiValue" : "MyVendorPrefix"
103140
}
104141
},
105-
"operator" : "startsWith"
142+
"operator" : "STARTS_WITH"
106143
}
107144
} ]
108145
},
@@ -131,6 +168,12 @@
131168
},
132169
"v4RoutersOption" : {
133170
"ipAddressList" : [ "10.0.0.1" ]
171+
},
172+
"v4DomainServersOption" : {
173+
"ipAddressList" : [ "1.1.1.1", "8.8.8.8" ]
174+
},
175+
"v4DomainNameOption" : {
176+
"domainName" : "foo.com."
134177
}
135178
},
136179
"v4AddrPools" : {
@@ -145,6 +188,16 @@
145188
"configOptions" : {
146189
"v4RoutersOption" : {
147190
"ipAddressList" : [ "10.0.0.11" ]
191+
},
192+
"v4OtherOptions" : {
193+
"optionDefList" : [ {
194+
"stringOption" : {
195+
"string" : "AnyOtherV4Option-Value"
196+
},
197+
"v4" : true,
198+
"code" : 194,
199+
"name" : "AnyOtherV4Option"
200+
} ]
148201
}
149202
}
150203
} ]
@@ -176,6 +229,17 @@
176229
"ipAddress" : "2001:db8:1::100",
177230
"duid" : {
178231
"hexValue" : "0A1B2C3D4E5F"
232+
},
233+
"msgConfigOptions" : {
234+
"v6OtherOptions" : {
235+
"optionDefList" : [ {
236+
"stringOption" : {
237+
"string" : "AnyOtherV6Option-Value"
238+
},
239+
"code" : 196,
240+
"name" : "AnyOtherV6Option"
241+
} ]
242+
}
179243
}
180244
} ]
181245
},

‎Jagornet-DHCP/dhcp-server/config/dhcpserver-sample.xml‎

Lines changed: 59 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<v6MsgConfigOptions>
103103
<v6VendorInfoOption>
104104
<enterpriseNumber>12345</enterpriseNumber>
105-
<suboptionList>
105+
<subOptions>
106106
<optionDefList code="1">
107107
<stringOption>
108108
<string>hello</string>
@@ -113,13 +113,46 @@
113113
<ipAddress>2001:db8::1</ipAddress>
114114
</ipAddressOption>
115115
</optionDefList>
116-
</suboptionList>
116+
</subOptions>
117117
</v6VendorInfoOption>
118118
</v6MsgConfigOptions>
119119
</filterList>
120120

121121
<filterList>
122-
<name>DHCPv4 VendorClass Filter</name>
122+
<name>DHCPv4 VendorClass Filter 1</name>
123+
<filterExpressions>
124+
<filterExpressionList>
125+
<clientClassExpression operator="equals">
126+
<v4VendorClassOption>
127+
<opaqueData>
128+
<asciiValue>VendorXYZ</asciiValue>
129+
</opaqueData>
130+
</v4VendorClassOption>
131+
</clientClassExpression>
132+
</filterExpressionList>
133+
</filterExpressions>
134+
<v4ConfigOptions>
135+
<v4VendorSpecificOption>
136+
<opaqueData>
137+
<subOptions>
138+
<optionDefList v4="true" code="1" name="VendorXYZSubopt1">
139+
<stringOption>
140+
<string>VendorSpecial</string>
141+
</stringOption>
142+
</optionDefList>
143+
<optionDefList v4="true" code="2" name="VendorXYZSubopt2">
144+
<ipAddressOption>
145+
<ipAddress>10.11.12.13</ipAddress>
146+
</ipAddressOption>
147+
</optionDefList>
148+
</subOptions>
149+
</opaqueData>
150+
</v4VendorSpecificOption>
151+
</v4ConfigOptions>
152+
</filterList>
153+
154+
<filterList>
155+
<name>DHCPv4 VendorClass Filter 2</name>
123156
<filterExpressions>
124157
<filterExpressionList>
125158
<clientClassExpression operator="startsWith">
@@ -163,6 +196,13 @@
163196
<v4RoutersOption>
164197
<ipAddressList>10.0.0.1</ipAddressList>
165198
</v4RoutersOption>
199+
<v4DomainServersOption>
200+
<ipAddressList>1.1.1.1</ipAddressList>
201+
<ipAddressList>8.8.8.8</ipAddressList>
202+
</v4DomainServersOption>
203+
<v4DomainNameOption>
204+
<domainName>foo.com.</domainName>
205+
</v4DomainNameOption>
166206
</v4ConfigOptions>
167207
<v4AddrPools>
168208
<poolList>
@@ -178,6 +218,13 @@
178218
<v4RoutersOption>
179219
<ipAddressList>10.0.0.11</ipAddressList>
180220
</v4RoutersOption>
221+
<v4OtherOptions>
222+
<optionDefList v4="true" code="194" name="AnyOtherV4Option">
223+
<stringOption>
224+
<string>AnyOtherV4Option-Value</string>
225+
</stringOption>
226+
</optionDefList>
227+
</v4OtherOptions>
181228
</configOptions>
182229
</bindingList>
183230
</v4AddrBindings>
@@ -223,6 +270,15 @@
223270
left undefined, then ANY IA_ID will match.
224271
<iaid>0</iaid>
225272
-->
273+
<msgConfigOptions>
274+
<v6OtherOptions>
275+
<optionDefList code="196" name="AnyOtherV6Option">
276+
<stringOption>
277+
<string>AnyOtherV6Option-Value</string>
278+
</stringOption>
279+
</optionDefList>
280+
</v6OtherOptions>
281+
</msgConfigOptions>
226282
</bindingList>
227283
</v6NaAddrBindings>
228284
<linkFilters>

‎Jagornet-DHCP/dhcp-server/config/dhcpserver-sample.yaml‎

Lines changed: 48 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ filters:
4747
v6UserClassOption:
4848
opaqueDataList:
4949
- asciiValue: "MyUserClass"
50-
operator: "equals"
50+
operator: "EQUALS"
5151
v6MsgConfigOptions:
5252
# Send the "filter.com." domain search list to the matched clients
5353
v6DomainSearchListOption:
@@ -63,28 +63,51 @@ filters:
6363
enterpriseNumber: 12345
6464
opaqueDataList:
6565
- asciiValue: "VendorXYZ"
66-
operator: "equals"
66+
operator: "EQUALS"
6767
v6MsgConfigOptions:
6868
# Send vendor specific options to the matched clients
6969
v6VendorInfoOption:
7070
enterpriseNumber: 12345
71-
suboptionList:
71+
subOptions:
7272
optionDefList:
7373
- stringOption:
7474
string: "hello"
7575
code: 1
7676
- ipAddressOption:
7777
ipAddress: "2001:db8::1"
7878
code: 2
79-
- name: "DHCPv4 VendorClass Filter"
79+
- name: "DHCPv4 VendorClass Filter 1"
8080
filterExpressions:
8181
# Match clients with v4 vendor class option starting with "MyVendorPrefix"
82+
filterExpressionList:
83+
- clientClassExpression:
84+
v4VendorClassOption:
85+
opaqueData:
86+
asciiValue: "VendorXYZ"
87+
operator: "EQUALS"
88+
v4ConfigOptions:
89+
v4VendorSpecificOption:
90+
opaqueData:
91+
subOptions:
92+
optionDefList:
93+
- stringOption:
94+
string: "VendorSpecial"
95+
v4: true
96+
code: 1
97+
name: "VendorXYZSubopt1"
98+
- ipAddressOption:
99+
ipAddress: "10.11.12.13"
100+
v4: true
101+
code: 2
102+
name: "VendorXYZSubopt2"
103+
- name: "DHCPv4 VendorClass Filter 2"
104+
filterExpressions:
82105
filterExpressionList:
83106
- clientClassExpression:
84107
v4VendorClassOption:
85108
opaqueData:
86109
asciiValue: "MyVendorPrefix"
87-
operator: "startsWith"
110+
operator: "STARTS_WITH"
88111
v4ConfigOptions:
89112
# Send vendor specific data to the matched clients
90113
v4VendorSpecificOption:
@@ -109,6 +132,12 @@ links:
109132
v4RoutersOption:
110133
ipAddressList:
111134
- "10.0.0.1"
135+
v4DomainServersOption:
136+
ipAddressList:
137+
- "1.1.1.1"
138+
- "8.8.8.8"
139+
v4DomainNameOption:
140+
domainName: "foo.com."
112141
v4AddrPools:
113142
poolList:
114143
- range: "10.0.0.100-10.0.0.199"
@@ -121,6 +150,13 @@ links:
121150
v4RoutersOption:
122151
ipAddressList:
123152
- "10.0.0.11"
153+
v4OtherOptions:
154+
optionDefList:
155+
- stringOption:
156+
string: "AnyOtherV4Option-Value"
157+
v4: true
158+
code: 194
159+
name: "AnyOtherV4Option"
124160
- name: "Local IPv6 Client Link (Multicast traffic)"
125161
# Local DHCPv6 links are defined by interface name
126162
interface: "eth2"
@@ -148,10 +184,13 @@ links:
148184
# if the DUID is known, then a binding can be made.
149185
duid:
150186
hexValue: "0A1B2C3D4E5F"
151-
# The IA_ID is almost definitely unpredictable, so
152-
# it is an optional element for a DHCPv6 binding. If
153-
# left undefined, then ANY IA_ID will match.
154-
# iaid: 0
187+
msgConfigOptions:
188+
v6OtherOptions:
189+
optionDefList:
190+
- stringOption:
191+
string: "AnyOtherV6Option-Value"
192+
code: 196
193+
name: "AnyOtherV6Option"
155194
linkFilters:
156195
linkFilterList:
157196
- v6NaAddrPools:

‎Jagornet-DHCP/dhcp-server/docs/release-notes.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
Changes in 3.1.0
2+
----------------
3+
- Fix #33: Add support for -rr option for requests per second for
4+
for DHCP Client test tools
5+
- Fix #34: Use Jackson classes for reading/writing JSON/YAML
6+
- Fix #35: Improve Netty inbound/outbound pipeline processing
7+
18
Changes in 3.0.3
29
----------------
310
- Fix #27: Update DHCP client logging config file options for Log4j2

0 commit comments

Comments
 (0)