Imported Upstream version 1.1.90 upstream/1.1.90

1 files changed, 133 insertions, 7 deletions

diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html
index 9a40fd47..dd9b7c2d 100644
--- a/docs/libnm/html/NMSettingIP4Config.html
+++ b/docs/libnm/html/NMSettingIP4Config.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
-<link rel="prev" href="NMSettingIPConfig.html" title="NMSettingIPConfig">
+<link rel="prev" href="NMSettingInfiniband.html" title="NMSettingInfiniband">
 <link rel="next" href="NMSettingIP6Config.html" title="NMSettingIP6Config">
 <meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -21,7 +21,7 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMSettingIPConfig.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="NMSettingInfiniband.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="NMSettingIP6Config.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
@@ -56,6 +56,21 @@
 <a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-dhcp-client-id" title="nm_setting_ip4_config_get_dhcp_client_id ()">nm_setting_ip4_config_get_dhcp_client_id</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-dhcp-timeout" title="nm_setting_ip4_config_get_dhcp_timeout ()">nm_setting_ip4_config_get_dhcp_timeout</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-dhcp-fqdn" title="nm_setting_ip4_config_get_dhcp_fqdn ()">nm_setting_ip4_config_get_dhcp_fqdn</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -67,12 +82,25 @@
 <col width="300px" class="properties_name">
 <col width="200px" class="properties_flags">
 </colgroup>
-<tbody><tr>
+<tbody>
+<tr>
 <td class="property_type">
 <span class="type">gchar</span> *</td>
 <td class="property_name"><a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--dhcp-client-id" title="The “dhcp-client-id” property">dhcp-client-id</a></td>
 <td class="property_flags">Read / Write</td>
-</tr></tbody>
+</tr>
+<tr>
+<td class="property_type">
+<span class="type">gchar</span> *</td>
+<td class="property_name"><a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--dhcp-fqdn" title="The “dhcp-fqdn” property">dhcp-fqdn</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
+<td class="property_type"><span class="type">guint</span></td>
+<td class="property_name"><a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--dhcp-timeout" title="The “dhcp-timeout” property">dhcp-timeout</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+</tbody>
 </table></div>
 </div>
 <div class="refsect1">
@@ -93,6 +121,14 @@
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-DHCP-TIMEOUT:CAPS" title="NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT">NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-DHCP-FQDN:CAPS" title="NM_SETTING_IP4_CONFIG_DHCP_FQDN">NM_SETTING_IP4_CONFIG_DHCP_FQDN</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-AUTO:CAPS" title="NM_SETTING_IP4_CONFIG_METHOD_AUTO">NM_SETTING_IP4_CONFIG_METHOD_AUTO</a></td>
 </tr>
 <tr>
@@ -149,7 +185,7 @@ connection.</p>
 nm_setting_ip4_config_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>Creates a new <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> object with default values.</p>
 <div class="refsect3">
-<a name="id-1.4.18.8.2.5"></a><h4>Returns</h4>
+<a name="id-1.4.17.8.2.5"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> object. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -163,7 +199,7 @@ nm_setting_ip4_config_get_dhcp_client_id
 <p>Returns the value contained in the <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--dhcp-client-id" title="The “dhcp-client-id” property"><span class="type">“dhcp-client-id”</span></a>
 property.</p>
 <div class="refsect3">
-<a name="id-1.4.18.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.4.17.8.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -178,11 +214,69 @@ property.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.4.18.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.4.17.8.3.6"></a><h4>Returns</h4>
 <p> the configured Client ID to send to the DHCP server when requesting
 addresses via DHCP.</p>
 </div>
 </div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ip4-config-get-dhcp-timeout"></a><h3>nm_setting_ip4_config_get_dhcp_timeout ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+nm_setting_ip4_config_get_dhcp_timeout
+                               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
+<p>Returns the value contained in the <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--dhcp-timeout" title="The “dhcp-timeout” property"><span class="type">“dhcp-timeout”</span></a>
+property.</p>
+<div class="refsect3">
+<a name="id-1.4.17.8.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.4.17.8.4.6"></a><h4>Returns</h4>
+<p> the configured DHCP timeout in seconds. 0 = default for
+the particular kind of device.</p>
+</div>
+<p class="since">Since: 1.2</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ip4-config-get-dhcp-fqdn"></a><h3>nm_setting_ip4_config_get_dhcp_fqdn ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_setting_ip4_config_get_dhcp_fqdn (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
+<p>Returns the value contained in the <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--dhcp-fqdn" title="The “dhcp-fqdn” property"><span class="type">“dhcp-fqdn”</span></a>
+property.</p>
+<div class="refsect3">
+<a name="id-1.4.17.8.5.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.4.17.8.5.6"></a><h4>Returns</h4>
+<p> the configured FQDN to send to the DHCP server</p>
+</div>
+<p class="since">Since: 1.2</p>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingIP4Config.other_details"></a><h2>Types and Values</h2>
@@ -199,6 +293,18 @@ addresses via DHCP.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NM-SETTING-IP4-CONFIG-DHCP-TIMEOUT:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT</h3>
+<pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT       "dhcp-timeout"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-IP4-CONFIG-DHCP-FQDN:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DHCP_FQDN</h3>
+<pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DHCP_FQDN          "dhcp-fqdn"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-METHOD-AUTO:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_METHOD_AUTO</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_METHOD_AUTO       "auto"
 </pre>
@@ -252,6 +358,26 @@ DHCP server may use to customize the DHCP lease and options.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingIP4Config--dhcp-fqdn"></a><h3>The <code class="literal">“dhcp-fqdn”</code> property</h3>
+<pre class="programlisting">  “dhcp-fqdn”                <span class="type">gchar</span> *</pre>
+<p>If the <a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dhcp-send-hostname" title="The “dhcp-send-hostname” property"><span class="type">“dhcp-send-hostname”</span></a> property is <code class="literal">TRUE</code>, then the
+specified FQDN will be sent to the DHCP server when acquiring a lease. This
+property and <a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dhcp-hostname" title="The “dhcp-hostname” property"><span class="type">“dhcp-hostname”</span></a> are mutually exclusive and
+cannot be set at the same time.</p>
+<p>Flags: Read / Write</p>
+<p>Default value: NULL</p>
+<p class="since">Since: 1.2</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingIP4Config--dhcp-timeout"></a><h3>The <code class="literal">“dhcp-timeout”</code> property</h3>
+<pre class="programlisting">  “dhcp-timeout”             <span class="type">guint</span></pre>
+<p>A timeout for a DHCP transaction in seconds.</p>
+<p>Flags: Read / Write</p>
+<p>Default value: 0</p>
+</div>
 </div>
 </div>
 <div class="footer">