← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/drizzle_protocol/drizzle_protocol.cc

merge lp:~linuxjedi/drizzle/trunk-remove-drizzleadmin

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/drizzle_protocol/drizzle_protocol.cc
42
42
namespace drizzle_protocol
43
43
{
44
44
 
45
 
std::vector<std::string> ClientDrizzleProtocol::drizzle_admin_ip_addresses;
46
45
static port_constraint port;
47
46
static timeout_constraint connect_timeout;
48
47
static timeout_constraint read_timeout;
63
62
  return port;
64
63
}
65
64
 
66
 
void ClientDrizzleProtocol::drizzle_compose_ip_addresses(vector<string> options)
67
 
{
68
 
  for (vector<string>::iterator it= options.begin();
69
 
       it != options.end();
70
 
       ++it)
71
 
  {
72
 
    tokenize(*it, drizzle_admin_ip_addresses, ",", true);
73
 
  }
74
 
}
75
 
 
76
 
bool ClientDrizzleProtocol::isAdminAllowed()
77
 
{
78
 
  return std::find(drizzle_admin_ip_addresses.begin(), drizzle_admin_ip_addresses.end(), session->user()->address()) != drizzle_admin_ip_addresses.end();
79
 
}
80
 
 
81
65
plugin::Client *ListenDrizzleProtocol::getClient(int fd)
82
66
{
83
67
  int new_fd;
136
120
  context("max-connections",
137
121
          po::value<uint32_t>(&ListenDrizzleProtocol::drizzle_counters->max_connections)->default_value(1000),
138
122
          N_("Maximum simultaneous connections."));
139
 
  context("admin-ip-addresses",
140
 
          po::value<vector<string> >()->composing()->notifier(&ClientDrizzleProtocol::drizzle_compose_ip_addresses),
141
 
          N_("A restrictive IP address list for incoming admin connections."));
142
123
}
143
124
 
144
125
} /* namespace drizzle_protocol */