New upstream version 1.16.0 upstream/1.16.0

1 files changed, 116 insertions, 3 deletions

diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html
index 1d4beb4a..02a1f409 100644
--- a/docs/libnm/html/NMSettingTeam.html
+++ b/docs/libnm/html/NMSettingTeam.html
@@ -67,6 +67,14 @@
 </tr>
 <tr>
 <td class="function_type">
+<a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher"><span class="returnvalue">NMTeamLinkWatcher</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingTeam.html#nm-team-link-watcher-new-arp-ping2" title="nm_team_link_watcher_new_arp_ping2 ()">nm_team_link_watcher_new_arp_ping2</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
@@ -168,6 +176,14 @@
 </tr>
 <tr>
 <td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingTeam.html#nm-team-link-watcher-get-vlanid" title="nm_team_link_watcher_get_vlanid ()">nm_team_link_watcher_get_vlanid</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
 <a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
 </td>
 <td class="function_name">
@@ -837,6 +853,80 @@ address in the arp request</p></td>
 </div>
 <hr>
 <div class="refsect2">
+<a name="nm-team-link-watcher-new-arp-ping2"></a><h3>nm_team_link_watcher_new_arp_ping2 ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher"><span class="returnvalue">NMTeamLinkWatcher</span></a> *
+nm_team_link_watcher_new_arp_ping2 (<em class="parameter"><code><span class="type">int</span> init_wait</code></em>,
+                                    <em class="parameter"><code><span class="type">int</span> interval</code></em>,
+                                    <em class="parameter"><code><span class="type">int</span> missed_max</code></em>,
+                                    <em class="parameter"><code><span class="type">int</span> vlanid</code></em>,
+                                    <em class="parameter"><code>const <span class="type">char</span> *target_host</code></em>,
+                                    <em class="parameter"><code>const <span class="type">char</span> *source_host</code></em>,
+                                    <em class="parameter"><code><a class="link" href="NMSettingTeam.html#NMTeamLinkWatcherArpPingFlags" title="enum NMTeamLinkWatcherArpPingFlags"><span class="type">NMTeamLinkWatcherArpPingFlags</span></a> flags</code></em>,
+                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>Creates a new arp_ping <a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher"><span class="type">NMTeamLinkWatcher</span></a> object</p>
+<div class="refsect3">
+<a name="nm-team-link-watcher-new-arp-ping2.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" 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>init_wait</p></td>
+<td class="parameter_description"><p>init_wait value</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>interval</p></td>
+<td class="parameter_description"><p>interval value</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>missed_max</p></td>
+<td class="parameter_description"><p>missed_max value</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>vlanid</p></td>
+<td class="parameter_description"><p>vlanid value</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>target_host</p></td>
+<td class="parameter_description"><p>the host name or the ip address that will be used as destination
+address in the arp request</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>source_host</p></td>
+<td class="parameter_description"><p>the host name or the ip address that will be used as source
+address in the arp request</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>flags</p></td>
+<td class="parameter_description"><p>the watcher <a class="link" href="NMSettingTeam.html#NMTeamLinkWatcherArpPingFlags" title="enum NMTeamLinkWatcherArpPingFlags"><span class="type">NMTeamLinkWatcherArpPingFlags</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>location to store the error on failure. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-team-link-watcher-new-arp-ping2.returns"></a><h4>Returns</h4>
+<p>the new <a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher"><span class="type">NMTeamLinkWatcher</span></a> object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.16</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-team-link-watcher-ref"></a><h3>nm_team_link_watcher_ref ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_team_link_watcher_ref (<em class="parameter"><code><a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher"><span class="type">NMTeamLinkWatcher</span></a> *watcher</code></em>);</pre>
@@ -978,7 +1068,7 @@ nm_team_link_watcher_get_name (<em class="parameter"><code><a class="link" href=
 <pre class="programlisting"><span class="returnvalue">int</span>
 nm_team_link_watcher_get_delay_up (<em class="parameter"><code><a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher"><span class="type">NMTeamLinkWatcher</span></a> *watcher</code></em>);</pre>
 <p>Gets the delay_up interval (in milliseconds) that elapses between the link
-coming up and the runner beeing notified about it.</p>
+coming up and the runner being notified about it.</p>
 <div class="refsect3">
 <a name="nm-team-link-watcher-get-delay-up.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -1002,7 +1092,7 @@ coming up and the runner beeing notified about it.</p>
 <pre class="programlisting"><span class="returnvalue">int</span>
 nm_team_link_watcher_get_delay_down (<em class="parameter"><code><a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher"><span class="type">NMTeamLinkWatcher</span></a> *watcher</code></em>);</pre>
 <p>Gets the delay_down interval (in milliseconds) that elapses between the link
-going down and the runner beeing notified about it.</p>
+going down and the runner being notified about it.</p>
 <div class="refsect3">
 <a name="nm-team-link-watcher-get-delay-down.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -1163,6 +1253,29 @@ nm_team_link_watcher_get_flags (<em class="parameter"><code><a class="link" href
 </div>
 <hr>
 <div class="refsect2">
+<a name="nm-team-link-watcher-get-vlanid"></a><h3>nm_team_link_watcher_get_vlanid ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+nm_team_link_watcher_get_vlanid (<em class="parameter"><code><a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher"><span class="type">NMTeamLinkWatcher</span></a> *watcher</code></em>);</pre>
+<p>Gets the VLAN tag ID to be used to outgoing link probes</p>
+<div class="refsect3">
+<a name="nm-team-link-watcher-get-vlanid.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" 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>watcher</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher"><span class="type">NMTeamLinkWatcher</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.16</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-setting-team-new"></a><h3>nm_setting_team_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
 nm_setting_team_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
@@ -2225,7 +2338,7 @@ watcher. Available link watchers are 'ethtool', 'nsna_ping' and
 Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait';
 nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host';
 arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active',
-'validate-incative', 'send-always'. See teamd.conf man for more details.</p>
+'validate-inactive', 'send-always'. See teamd.conf man for more details.</p>
 <p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMTeamLinkWatcher)]</span></p>
 <p>Flags: Read / Write</p>
 <p class="since">Since: 1.12</p>