From: Andrei Pavel Date: Fri, 6 Oct 2023 06:50:20 +0000 (+0300) Subject: [#2750] fix recognizing-same-client.svg X-Git-Tag: Kea-2.5.3~31 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a5866f311474cd7ce20bedabbc54e0a744734757;p=thirdparty%2Fkea.git [#2750] fix recognizing-same-client.svg It wasn't showing text before. --- diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am index 3303cda086..29be2255ad 100644 --- a/doc/sphinx/Makefile.am +++ b/doc/sphinx/Makefile.am @@ -159,6 +159,7 @@ uml-to-png: $(umls) uml-to-svg: $(umls) @ @PLANTUML@ -tsvg $^ +# Formatting puts every tag on a separate line, which makes it easier for diffing. format-svgs: $(svgs) if HAVE_XMLLINT @ for svg in $(svgs); do xmllint --format $$svg > tmp; mv tmp $$svg; done diff --git a/doc/sphinx/uml/recognizing-same-client.svg b/doc/sphinx/uml/recognizing-same-client.svg index bb7cf5545c..04fea2ae0c 100644 --- a/doc/sphinx/uml/recognizing-same-client.svg +++ b/doc/sphinx/uml/recognizing-same-client.svg @@ -1,21 +1,30 @@ + - + How Kea Recognizes the Same Client In Different DHCP Messages (Kea 2.4.0) + + libdhcp_flex_id.so is used yes no + replace-client-id is true (the default) yes no + Client is recognized by the result of the identifier expression in libdhcp_flex_id.so. + + + client has a reservation yes no + for the purpose of acquiring a reservation for the purpose @@ -23,51 +32,78 @@ reservation or acquiring any other value outside of reservations + Client is recognized by the result of the identifier expression in libdhcp_flex_id.so. + + + Go through the diagram from the beginning as if libdhcp_flex_id.so is unused. + + + Go through the diagram from the beginning as if libdhcp_flex_id.so is unused. + + + DHCPv4 or DHCPv6? DHCPv4 DHCPv6 + MAC address is present yes no + match-client-id is true (the default) yes + client ID option (code 61) is present yes + Client is recognized by the client ID option (code 61). + + + Client is recognized by the MAC address. + + + Client is recognized by the MAC address. + + + DHCP message is not well formed. + + + client ID option (code 1) is present yes no + interested in identifying as a single client - @@ -75,142 +111,108 @@ the lease device lease + Client is recognized by the client ID option (code 1) aka DUID. + + + Client is recognized by the tuple <DUID, IA-type, IAID>. + + + DHCP message is not well formed. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/sphinx/umls.rst b/doc/sphinx/umls.rst index 8f61ca1186..a5c2b607a0 100644 --- a/doc/sphinx/umls.rst +++ b/doc/sphinx/umls.rst @@ -151,7 +151,4 @@ Before sending a response, options are added: How Kea Recognizes the Same Client In Different DHCP Messages ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -.. - Use the PNG, because, for some reason, the SVG has missing text. - -.. figure:: uml/recognizing-same-client.png +.. figure:: uml/recognizing-same-client.*