From b7f71444c01a9b4ac6f7072bf4f7d6d8098cb982 Mon Sep 17 00:00:00 2001 From: Vinay Kulkarni Date: Mon, 4 Apr 2016 15:13:06 -0700 Subject: Address code-review items for pull-request #2890 1. Replace strtol with unhexchar, verified with valid and invalid DUID strings. 2. Fix logging to use log_syntax instead of log_error. 3. On error reading DUID, ignore read and preserve previous state. 4. Fix man-pages to use markup, remove options not yet implemented. 5. Remove spurious header line in new files. --- man/networkd.conf.xml | 53 ++++++++++--------------------------------------- man/systemd.network.xml | 53 ++++++++++--------------------------------------- 2 files changed, 22 insertions(+), 84 deletions(-) (limited to 'man') diff --git a/man/networkd.conf.xml b/man/networkd.conf.xml index 30674e12bc..4f423b2b61 100644 --- a/man/networkd.conf.xml +++ b/man/networkd.conf.xml @@ -95,21 +95,17 @@ Type= The type of DUID specified in this section. The following values are supported: - raw : If Type=raw, then RawData= specifies - the entire DUID. For e.g: RawData=00:02:00:00:ab:11:f9:2a:c2:77:29:f9:5c:00 - specifies a 14 byte long DUID-EN ("00:02"), with enterprise number 43793 ("00:00:ab:11"), - and identifier value "f9:2a:c2:77:29:f9:5c:00".If Type is not specified and - RawData is specified, Type defaults to 'raw'. - Type will support the following values in the future: - link-layer-and-time : If Type=link-layer-and-time, then - MACAddress= and TimeStamp= specify the hardware - address and time-stamp for DUID-LLT. - vendor : If Type=vendor, then EnterpriseNumber= - and RawData= specify the enterprise number and identifier for DUID-EN. - link-layer : If Type=link-layer, then MACAddress= - specifies the hardware address for DUID-LL. - uuid : If Type=uuid, then UUID= specifies DUID-UUID. - + + + + If Type=raw, then RawData= specifies the + entire DUID. For example, RawData=00:02:00:00:ab:11:f9:2a:c2:77:29:f9:5c:00 + specifies a 14 byte long DUID-EN ("00:02"), with enterprise number 43793 ("00:00:ab:11"), + and identifier value "f9:2a:c2:77:29:f9:5c:00".If Type is not specified and + RawData is specified, Type defaults to 'raw'. + + + @@ -120,33 +116,6 @@ - - The following options will be supported in the future: - - - - MACAddress= - Specifies the link-layer address for DUID Type or . - - - TimeStamp= - Specifies the DUID generation time for DUID Type . - - - EnterpriseNumber= - Specifies the enterprise number for DUID Type - . - - - UUID= - Specifies the UUID for DUID Type . - - - - - See Also diff --git a/man/systemd.network.xml b/man/systemd.network.xml index b2e1d40287..a6d290cfb3 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -856,21 +856,17 @@ Type= The type of DUID specified in this section. The following values are supported: - raw : If Type=raw, then RawData= specifies - the entire DUID. For e.g: RawData=00:02:00:00:ab:11:f9:2a:c2:77:29:f9:5c:00 - specifies a 14 byte long DUID-EN ("00:02"), with enterprise number 43793 ("00:00:ab:11"), - and identifier value "f9:2a:c2:77:29:f9:5c:00".If Type is not specified and - RawData is specified, Type defaults to 'raw'. - Type will support the following values in the future: - link-layer-and-time : If Type=link-layer-and-time, then - MACAddress= and TimeStamp= specify the hardware - address and time-stamp for DUID-LLT. - vendor : If Type=vendor, then EnterpriseNumber= - and RawData= specify the enterprise number and identifier for DUID-EN. - link-layer : If Type=link-layer, then MACAddress= - specifies the hardware address for DUID-LL. - uuid : If Type=uuid, then UUID= specifies DUID-UUID. - + + + + If Type=raw, then RawData= specifies the + entire DUID. For example, RawData=00:02:00:00:ab:11:f9:2a:c2:77:29:f9:5c:00 + specifies a 14 byte long DUID-EN ("00:02"), with enterprise number 43793 ("00:00:ab:11"), + and identifier value "f9:2a:c2:77:29:f9:5c:00".If Type is not specified and + RawData is specified, Type defaults to 'raw'. + + + @@ -882,33 +878,6 @@ - - The following options will be supported in the future: - - - - MACAddress= - Specifies the link-layer address for DUID Type or . - - - TimeStamp= - Specifies the DUID generation time for DUID Type . - - - EnterpriseNumber= - Specifies the enterprise number for DUID Type . - - - UUID= - Specifies the UUID for DUID Type . - - - - - [DHCPServer] Section Options The [DHCPServer] section contains -- cgit v1.2.3-54-g00ecf From f38e0cce75ff2ffbd99f7e382ed39c160bb7d799 Mon Sep 17 00:00:00 2001 From: Vinay Kulkarni Date: Mon, 4 Apr 2016 21:05:45 -0700 Subject: Drop description of 'Type' field from docs. --- man/networkd.conf.xml | 17 ----------------- man/systemd.network.xml | 17 ----------------- 2 files changed, 34 deletions(-) (limited to 'man') diff --git a/man/networkd.conf.xml b/man/networkd.conf.xml index 4f423b2b61..59a53d8893 100644 --- a/man/networkd.conf.xml +++ b/man/networkd.conf.xml @@ -91,23 +91,6 @@ - - Type= - The type of DUID specified in this section. The following values are - supported: - - - - If Type=raw, then RawData= specifies the - entire DUID. For example, RawData=00:02:00:00:ab:11:f9:2a:c2:77:29:f9:5c:00 - specifies a 14 byte long DUID-EN ("00:02"), with enterprise number 43793 ("00:00:ab:11"), - and identifier value "f9:2a:c2:77:29:f9:5c:00".If Type is not specified and - RawData is specified, Type defaults to 'raw'. - - - - - RawData= Specifies the DUID bytes as a single newline-terminated, hexadecimal diff --git a/man/systemd.network.xml b/man/systemd.network.xml index a6d290cfb3..bcd437d349 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -852,23 +852,6 @@ - - Type= - The type of DUID specified in this section. The following values are - supported: - - - - If Type=raw, then RawData= specifies the - entire DUID. For example, RawData=00:02:00:00:ab:11:f9:2a:c2:77:29:f9:5c:00 - specifies a 14 byte long DUID-EN ("00:02"), with enterprise number 43793 ("00:00:ab:11"), - and identifier value "f9:2a:c2:77:29:f9:5c:00".If Type is not specified and - RawData is specified, Type defaults to 'raw'. - - - - - RawData= Specifies the DUID bytes as a single newline-terminated, hexadecimal -- cgit v1.2.3-54-g00ecf