← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/handshake.c

  • Committer: lbieber
  • Date: 2010-10-01 13:06:31 UTC
  • mfrom: (1802.2.2 drizzle-bug-651948)
  • mto: This revision was merged to the branch mainline in revision 1805.
  • Revision ID: lbieber@orisndriz08-20101001130631-xubscnhmj7r5dn6g
Merge Andrew - Fix bug 651948 - Index lengths not retrieved using drizzledump

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/handshake.c
4
4
 * Copyright (C) 2008 Eric Day (eday@oddments.org)
5
5
 * All rights reserved.
6
6
 *
7
 
 * Redistribution and use in source and binary forms, with or without
8
 
 * modification, are permitted provided that the following conditions are
9
 
 * met:
10
 
 *
11
 
 *     * Redistributions of source code must retain the above copyright
12
 
 * notice, this list of conditions and the following disclaimer.
13
 
 *
14
 
 *     * Redistributions in binary form must reproduce the above
15
 
 * copyright notice, this list of conditions and the following disclaimer
16
 
 * in the documentation and/or other materials provided with the
17
 
 * distribution.
18
 
 *
19
 
 *     * The names of its contributors may not be used to endorse or
20
 
 * promote products derived from this software without specific prior
21
 
 * written permission.
22
 
 *
23
 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
24
 
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
25
 
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
26
 
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
27
 
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
28
 
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
29
 
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
30
 
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
31
 
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
32
 
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
33
 
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34
 
 *
 
7
 * Use and distribution licensed under the BSD license.  See
 
8
 * the COPYING.BSD file in the root source directory for full text.
35
9
 */
36
10
 
37
11
/**
100
74
drizzle_return_t drizzle_state_handshake_server_read(drizzle_con_st *con)
101
75
{
102
76
  uint8_t *ptr;
103
 
  int extra_length;
104
 
  unsigned char* packet_end;
105
77
 
106
78
  drizzle_log_debug(con->drizzle, "drizzle_state_handshake_server_read");
107
79
 
119
91
    return DRIZZLE_RETURN_BAD_HANDSHAKE_PACKET;
120
92
  }
121
93
 
122
 
  packet_end= con->buffer_ptr + con->packet_size;
123
94
  con->protocol_version= con->buffer_ptr[0];
124
95
  con->buffer_ptr++;
125
96
 
150
121
    return DRIZZLE_RETURN_BAD_HANDSHAKE_PACKET;
151
122
  }
152
123
 
153
 
  if (con->packet_size < (46 + (size_t)(ptr - con->buffer_ptr)))
 
124
  if (con->packet_size != (46 + (size_t)(ptr - con->buffer_ptr)))
154
125
  {
155
126
    drizzle_set_error(con->drizzle, "drizzle_state_handshake_server_read",
156
127
                      "bad packet size:%zu:%zu",
195
166
  memcpy(con->scramble + 8, con->buffer_ptr, 12);
196
167
  con->buffer_ptr+= 13;
197
168
 
198
 
  /* MySQL 5.5 adds "mysql_native_password" after the server greeting. */
199
 
  extra_length= packet_end - con->buffer_ptr;
200
 
  assert(extra_length >= 0);
201
 
  if (extra_length > DRIZZLE_MAX_SERVER_EXTRA_SIZE - 1)
202
 
    extra_length= DRIZZLE_MAX_SERVER_EXTRA_SIZE - 1;
203
 
  memcpy(con->server_extra, (char *)con->buffer_ptr, extra_length);
204
 
  con->server_extra[extra_length]= 0;
205
 
 
206
169
  con->buffer_size-= con->packet_size;
207
170
  if (con->buffer_size != 0)
208
171
  {
507
470
  if (!(con->options & DRIZZLE_CON_FOUND_ROWS))
508
471
    capabilities&= ~DRIZZLE_CAPABILITIES_FOUND_ROWS;
509
472
 
510
 
  if (con->options & DRIZZLE_CON_ADMIN)
511
 
    capabilities|= DRIZZLE_CAPABILITIES_ADMIN;
512
 
 
513
473
  capabilities&= ~(DRIZZLE_CAPABILITIES_COMPRESS | DRIZZLE_CAPABILITIES_SSL);
514
474
  if (con->db[0] == 0)
515
475
    capabilities&= ~DRIZZLE_CAPABILITIES_CONNECT_WITH_DB;