Document --multiple-interface option

Thic commit documents --multiple-interface option, and move option
handler for it to the place alphabetical order as we do usually
pull/376/head
Tatsuhiro Tsujikawa 2015-04-22 22:48:49 +09:00
parent 3c84aa0745
commit 0ab23e7a8d
3 changed files with 21 additions and 11 deletions

View File

@ -1336,6 +1336,14 @@ Advanced Options
Possible Values: ``SSLv3``, ``TLSv1``, ``TLSv1.1``, ``TLSv1.2``
Default: ``TLSv1``
.. option:: --multiple-interface=<INTERFACES>
Comma separated list of interfaces to bind sockets to. Requests will
be splited among the interfaces to achieve link aggregation. You can
specify interface name, IP address and hostname. If
:option:`--interface` is used, this option will be ignored.
Possible Values: interface, IP address, hostname
.. option:: --log-level=<LEVEL>
Set log level to output.

View File

@ -470,16 +470,6 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers()
op->addTag(TAG_ADVANCED);
handlers.push_back(op);
}
{
OptionHandler* op(new DefaultOptionHandler
(PREF_MULTIPLE_INTERFACE,
TEXT_MULTIPLE_INTERFACE,
NO_DEFAULT_VALUE,
"interface, IP address, hostname",
OptionHandler::REQ_ARG));
op->addTag(TAG_ADVANCED);
handlers.push_back(op);
}
{
OptionHandler* op(new DefaultOptionHandler
(PREF_LOG,
@ -605,6 +595,16 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers()
handlers.push_back(op);
}
#endif // ENABLE_SSL
{
OptionHandler* op(new DefaultOptionHandler
(PREF_MULTIPLE_INTERFACE,
TEXT_MULTIPLE_INTERFACE,
NO_DEFAULT_VALUE,
"interface, IP address, hostname",
OptionHandler::REQ_ARG));
op->addTag(TAG_ADVANCED);
handlers.push_back(op);
}
{
OptionHandler* op(new BooleanOptionHandler
(PREF_NO_CONF,

View File

@ -603,7 +603,9 @@
_(" --multiple-interface=INTERFACES Comma separated list of interfaces to bind\n" \
" sockets to. Requests will be splited among the\n" \
" interfaces to achieve link aggregation. You can\n" \
" specify interface name, IP address and hostname.")
" specify interface name, IP address and hostname.\n" \
" If --interface is used, this option will be\n" \
" ignored.")
#define TEXT_DISABLE_IPV6 \
_(" --disable-ipv6[=true|false] Disable IPv6.")
#define TEXT_BT_SAVE_METADATA \