← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/drizzle_protocol/drizzle_protocol.cc

  • Committer: Brian Aker
  • Date: 2010-12-07 09:12:12 UTC
  • mto: This revision was merged to the branch mainline in revision 1985.
  • Revision ID: brian@tangent.org-20101207091212-1m0w20tck6z7632m
This is a fix for bug lp:686197

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/drizzle_protocol/drizzle_protocol.cc
31
31
#include <iostream>
32
32
#include <boost/program_options.hpp>
33
33
#include <drizzled/module/option_map.h>
34
 
#include "drizzled/util/tokenize.h"
35
34
#include "drizzle_protocol.h"
36
35
#include "plugin/drizzle_protocol/status_table.h"
37
36
 
44
43
namespace drizzle_protocol
45
44
{
46
45
 
47
 
std::vector<std::string> ClientDrizzleProtocol::drizzle_admin_ip_addresses;
 
46
 
48
47
static port_constraint port;
49
48
static timeout_constraint connect_timeout;
50
49
static timeout_constraint read_timeout;
54
53
 
55
54
static const uint32_t DRIZZLE_TCP_PORT= 4427;
56
55
 
57
 
ProtocolCounters *ListenDrizzleProtocol::drizzle_counters= new ProtocolCounters();
58
 
 
59
56
ListenDrizzleProtocol::~ListenDrizzleProtocol()
60
57
{
61
58
}
65
62
  return port;
66
63
}
67
64
 
68
 
void ClientDrizzleProtocol::drizzle_compose_ip_addresses(vector<string> options)
69
 
{
70
 
  for (vector<string>::iterator it= options.begin();
71
 
       it != options.end();
72
 
       ++it)
73
 
  {
74
 
    tokenize(*it, drizzle_admin_ip_addresses, ",", true);
75
 
  }
76
 
}
77
 
 
78
 
bool ClientDrizzleProtocol::isAdminAllowed(void)
79
 
{
80
 
  if (std::find(drizzle_admin_ip_addresses.begin(), drizzle_admin_ip_addresses.end(), session->user()->address()) != drizzle_admin_ip_addresses.end())
81
 
    return true;
82
 
 
83
 
  return false;
84
 
}
85
 
 
86
 
plugin::Client *ListenDrizzleProtocol::getClient(int fd)
87
 
{
88
 
  int new_fd;
89
 
  new_fd= acceptTcp(fd);
90
 
  if (new_fd == -1)
91
 
    return NULL;
92
 
 
93
 
  return new ClientDrizzleProtocol(new_fd, getCounters());
94
 
}
95
 
 
96
65
static int init(drizzled::module::Context &context)
97
66
{  
98
67
  const module::option_map &vm= context.getOptions();
108
77
  context.registerVariable(new sys_var_const_string_val("bind_address",
109
78
                                                        vm["bind-address"].as<std::string>()));
110
79
 
111
 
  context.registerVariable(new sys_var_uint32_t_ptr("max-connections", &ListenDrizzleProtocol::drizzle_counters->max_connections));
112
 
 
113
80
  return 0;
114
81
}
115
82
 
135
102
          po::value<buffer_constraint>(&buffer_length)->default_value(16384),
136
103
          N_("Buffer length."));
137
104
  context("bind-address",
138
 
          po::value<std::string>()->default_value(""),
 
105
          po::value<string>()->default_value(""),
139
106
          N_("Address to bind to."));
140
 
  context("max-connections",
141
 
          po::value<uint32_t>(&ListenDrizzleProtocol::drizzle_counters->max_connections)->default_value(1000),
142
 
          N_("Maximum simultaneous connections."));
143
 
  context("admin-ip-addresses",
144
 
          po::value<vector<string> >()->composing()->notifier(&ClientDrizzleProtocol::drizzle_compose_ip_addresses),
145
 
          N_("A restrictive IP address list for incoming admin connections."));
146
107
}
147
108
 
148
109
} /* namespace drizzle_protocol */