← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_connect.cc

  • Committer: Monty Taylor
  • Date: 2008-09-15 00:46:33 UTC
  • mfrom: (383.1.55 client-split)
  • Revision ID: monty@inaugust.com-20080915004633-fmjw27fi41cxs35w
Merged from client-split.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_connect.cc
20
20
#include <drizzled/server_includes.h>
21
21
#include <drizzled/authentication.h>
22
22
#include <drizzled/drizzled_error_messages.h>
23
 
#include <vio/violite.h>
24
23
 
25
24
#define MIN_HANDSHAKE_SIZE      6
26
25
 
237
236
  uint32_t pkt_len= 0;
238
237
  char *end;
239
238
 
240
 
#ifdef SIGNAL_WITH_VIO_CLOSE
241
 
  thd->set_active_vio(net->vio);
242
 
#endif
243
 
 
244
239
  // TCP/IP connection
245
240
  {
246
241
    char ip[NI_MAXHOST];
247
242
 
248
 
    if (vio_peer_addr(net->vio, ip, &thd->peer_port, NI_MAXHOST))
 
243
    if (net_peer_addr(net, ip, &thd->peer_port, NI_MAXHOST))
249
244
    {
250
245
      my_error(ER_BAD_HOST_ERROR, MYF(0), thd->main_security_ctx.ip);
251
246
      return 1;
253
248
    if (!(thd->main_security_ctx.ip= my_strdup(ip,MYF(MY_WME))))
254
249
      return 1; /* The error is set by my_strdup(). */
255
250
  }
256
 
  vio_keepalive(net->vio, true);
 
251
  net_keepalive(net, true);
257
252
  
258
253
  uint32_t server_capabilites;
259
254
  {