New failure detection algorithm was backed out, so backout manual

page change as well.

Requested by:	scottl (mentor)
This commit is contained in:
Pawel Jakub Dawidek 2004-02-20 09:52:26 +00:00
parent 3c976c3f95
commit 45c8a69994

View File

@ -99,20 +99,15 @@ hook.
.Pp .Pp
In the future other algorithms may be added as well. In the future other algorithms may be added as well.
.Sh LINK FAILURE DETECTION .Sh LINK FAILURE DETECTION
.Bl -tag -width foo At this time, the only algorithm for determining when a link
.It NG_ONE2MANY_FAIL_MANUAL has failed, other than the hook being disconnected, is the
The node is explicitly told which of the links are up via the ``manual'' algorithm: the node is explicitly told which of
the links are up via the
.Dv NGM_ONE2MANY_SET_CONFIG .Dv NGM_ONE2MANY_SET_CONFIG
control message (see below). control message (see below).
Newly connected links are down until configured otherwise. Newly connected links are down until configured otherwise.
.It NG_ONE2MANY_FAIL_IFACE_LINK .Pp
In every ''interval'' seconds (where In the future other algorithms may be added as well.
.Dv interval
is defined with
.Dv NGM_ONE2MANY_SET_CONFIG
control message (see below))
status of all defined links are checked and only active links
are used for data transfer.
.Sh HOOKS .Sh HOOKS
This node type supports up to This node type supports up to
.Dv NG_ONE2MANY_MAX_LINKS .Dv NG_ONE2MANY_MAX_LINKS
@ -135,23 +130,20 @@ as the control message argument:
struct ng_one2many_config { struct ng_one2many_config {
u_int32_t xmitAlg; /* how to distribute packets */ u_int32_t xmitAlg; /* how to distribute packets */
u_int32_t failAlg; /* how to detect link failure */ u_int32_t failAlg; /* how to detect link failure */
u_int32_t interval; /* how often check links status */
u_char enabledLinks[NG_ONE2MANY_MAX_LINKS]; u_char enabledLinks[NG_ONE2MANY_MAX_LINKS];
}; };
.Ed .Ed
.Pp .Pp
Currently, the valid setting for the Currently, the only valid setting for the
.Dv xmitAlg .Dv xmitAlg
field is field is
.Dv NG_ONE2MANY_XMIT_ROUNDROBIN .Dv NG_ONE2MANY_XMIT_ROUNDROBIN ;
(default) or this is also the default setting.
.Dv NG_ONE2MANY_XMIT_ALL . The only valid setting for
The valid setting for
.Dv failAlg .Dv failAlg
is is
.Dv NG_ONE2MANY_FAIL_MANUAL .Dv NG_ONE2MANY_FAIL_MANUAL ;
(default) or this is also the default setting.
.Dv NG_ONE2MANY_FAIL_IFACE_LINK .
.It Dv NGM_ONE2MANY_GET_CONFIG .It Dv NGM_ONE2MANY_GET_CONFIG
Returns the current node configuration in a Returns the current node configuration in a
.Dv "struct ng_one2many_link_config" . .Dv "struct ng_one2many_link_config" .
@ -218,9 +210,6 @@ through
ngctl msg fxp0:upper \\ ngctl msg fxp0:upper \\
setconfig "{ xmitAlg=1 failAlg=1 enabledLinks=[ 1 1 1 1 ] }" setconfig "{ xmitAlg=1 failAlg=1 enabledLinks=[ 1 1 1 1 ] }"
# Or
ngctl msg fxp0:upper \\
setconfig "{ xmitAlg=1 failAlg=2 interval=3 }"
# Bring up interface # Bring up interface
@ -255,6 +244,3 @@ netgraph node (with round-robin algorithm) was written by
The all algorithm was added by The all algorithm was added by
.An Rogier R. Mulhuijzen .An Rogier R. Mulhuijzen
.Aq drwilco@drwilco.net . .Aq drwilco@drwilco.net .
The interface_link failure detection algorithm was added by
.An Pawel Jakub Dawidek
.Aq pjd@FreeBSD.org .