diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2015-04-22 22:48:49 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2015-04-22 22:48:49 +0900 |
| commit | 0ab23e7a8dcf2ff3117fde9f602003b924a6a42f (patch) | |
| tree | 33051c18437df9256840346098e14d6cb862de1d /src | |
| parent | 3c84aa074561744e8728217fde58f14826ccee0e (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/OptionHandlerFactory.cc | 20 | ||||
| -rw-r--r-- | src/usage_text.h | 4 |
2 files changed, 13 insertions, 11 deletions
diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc index fb5e3493..b3ab8cc0 100644 --- a/src/OptionHandlerFactory.cc +++ b/src/OptionHandlerFactory.cc @@ -472,16 +472,6 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() } { 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, TEXT_LOG, NO_DEFAULT_VALUE, @@ -606,6 +596,16 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() } #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, TEXT_NO_CONF, diff --git a/src/usage_text.h b/src/usage_text.h index ba2645f8..17bf420d 100644 --- a/src/usage_text.h +++ b/src/usage_text.h @@ -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 \ |