From 309711025bdb9864511a9e724d6c8b4034a2243c Mon Sep 17 00:00:00 2001 From: rakshasa Date: Sat, 11 Feb 2012 16:17:13 +0900 Subject: [PATCH] Cleaned up some code. --- src/command_ip.cc | 9 ++++++--- src/command_network.cc | 2 -- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/command_ip.cc b/src/command_ip.cc index b92547df..55d065fc 100644 --- a/src/command_ip.cc +++ b/src/command_ip.cc @@ -234,9 +234,12 @@ apply_ipv4_filter_load(const torrent::Object::list_type& args) { void initialize_command_ip() { - CMD2_ANY_STRING ("ip_tables.insert_table", std::bind(&apply_ip_tables_insert_table, std::placeholders::_2)); - CMD2_ANY_LIST ("ip_tables.get", std::bind(&apply_ip_tables_get, std::placeholders::_2)); - CMD2_ANY_LIST ("ip_tables.add_address", std::bind(&apply_ip_tables_add_address, std::placeholders::_2)); + CMD2_ANY ("strings.ip_filter", std::bind(&torrent::option_list_strings, torrent::OPTION_IP_FILTER)); + CMD2_ANY ("strings.ip_tos", std::bind(&torrent::option_list_strings, torrent::OPTION_IP_TOS)); + + CMD2_ANY_STRING ("ip_tables.insert_table", std::bind(&apply_ip_tables_insert_table, std::placeholders::_2)); + CMD2_ANY_LIST ("ip_tables.get", std::bind(&apply_ip_tables_get, std::placeholders::_2)); + CMD2_ANY_LIST ("ip_tables.add_address", std::bind(&apply_ip_tables_add_address, std::placeholders::_2)); CMD2_ANY ("ipv4_filter.size_data", std::bind(&apply_ipv4_filter_size_data)); CMD2_ANY_STRING ("ipv4_filter.get", std::bind(&apply_ipv4_filter_get, std::placeholders::_2)); diff --git a/src/command_network.cc b/src/command_network.cc index b513b068..ca2911b9 100644 --- a/src/command_network.cc +++ b/src/command_network.cc @@ -238,8 +238,6 @@ initialize_command_network() { CMD2_ANY ("strings.connection_type", std::bind(&torrent::option_list_strings, torrent::OPTION_CONNECTION_TYPE)); CMD2_ANY ("strings.encryption", std::bind(&torrent::option_list_strings, torrent::OPTION_ENCRYPTION)); - CMD2_ANY ("strings.ip_filter", std::bind(&torrent::option_list_strings, torrent::OPTION_IP_FILTER)); - CMD2_ANY ("strings.ip_tos", std::bind(&torrent::option_list_strings, torrent::OPTION_IP_TOS)); CMD2_VAR_BOOL ("log.handshake", false);