mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 22:12:30 +01:00
9421f1dae9
Some simple optimzations, more comments and indentation changes. Add ` around database in 'use database' in binary log. Moved max_error_count and max_warning_count to variables struct. Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls. Changed string functions to use character set of first string argument as default return characterset (Each string function can change the above assumption if needed) BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged BitKeeper/deleted/.del-getopt.h~a9ae679fa84f395: Auto merged BitKeeper/deleted/.del-getvar.c~2a29ff383970fd31: Auto merged Docs/manual.texi: Auto merged SSL/cacert.pem: Auto merged SSL/client-cert.pem: Auto merged SSL/client-key.pem: Auto merged SSL/server-cert.pem: Auto merged SSL/server-key.pem: Auto merged client/mysqldump.c: Auto merged include/my_base.h: Auto merged include/my_sys.h: Auto merged include/mysql_com.h: Auto merged isam/isamlog.c: Auto merged isam/pack_isam.c: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/ft_dump.c: Auto merged myisam/ft_parser.c: Auto merged myisam/ft_static.c: Auto merged myisam/ft_test1.c: Auto merged myisam/ft_update.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_key.c: Auto merged myisam/mi_open.c: Auto merged myisam/mi_static.c: Auto merged myisam/mi_test1.c: Auto merged myisam/mi_test2.c: Auto merged myisam/mi_test3.c: Auto merged myisam/mi_update.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamdef.h: Auto merged myisam/myisamlog.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/func_math.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/select_found.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/select_found.test: Auto merged mysql-test/t/union.test: Auto merged mysys/default.c: Auto merged mysys/mf_iocache2.c: Auto merged mysys/my_error.c: Auto merged mysys/my_init.c: Auto merged scripts/mysql_config.sh: Auto merged sql/convert.cc: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/hostname.cc: Auto merged sql/item.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/key.cc: Auto merged sql/log.cc: Auto merged sql/net_pkg.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/opt_sum.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/time.cc: Auto merged sql/unireg.cc: Auto merged strings/Makefile.am: Auto merged strings/ctype-latin1_de.c: Auto merged strings/ctype-tis620.c: Auto merged tools/mysqlmanager.c: Auto merged BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997: merge with 4.0.3 BitKeeper/triggers/post-commit: merge with 4.0.3 client/mysql.cc: merge with 4.0.3 + simple optimsation client/mysqltest.c: merge with 4.0.3 (Indentation change) configure.in: merge with 4.0.3 extra/resolve_stack_dump.c: merge with 4.0.3 (Indentation change) include/Makefile.am: merge with 4.0.3 include/myisam.h: merge with 4.0.3 (Indentation change) include/mysql.h: merge with 4.0.3 (removed not used structure) include/mysqld_error.h: merge with 4.0.3 libmysql/Makefile.shared: merge with 4.0.3 libmysql/libmysql.c: merge with 4.0.3 (Indentation change) libmysqld/Makefile.am: merge with 4.0.3 myisam/ft_boolean_search.c: merge with 4.0.3 (Indentation change) myisam/ft_nlq_search.c: merge with 4.0.3 (Indentation change) myisam/mi_check.c: merge with 4.0.3 myisam/mi_search.c: merge with 4.0.3 myisam/mi_unique.c: merge with 4.0.3 mysys/Makefile.am: merge with 4.0.3 mysys/mf_casecnv.c: merge with 4.0.3 sql-bench/server-cfg.sh: Removed 8000 max row limit for Innodb sql/Makefile.am: merge with 4.0.3 sql/field.cc: Indentation cleanup Changed sprintf -> my_sprintf sql/field.h: merge with 4.0.3 sql/ha_heap.cc: merge with 4.0.3 (Indentation change) sql/item.h: merge with 4.0.3 (Indentation change) sql/item_cmpfunc.cc: merge with 4.0.3 sql/item_cmpfunc.h: Removed size_of() from items Indentation cleanup sql/item_create.cc: merge sql/item_create.h: merge sql/item_func.cc: Added comments Changed string functions to use character set of first string argument as default return characterset Simple optimizations. Removed return of uninitalized variable. sql/item_func.h: merge sql/item_strfunc.cc: merge with 4.0.3 (Indentation change) sql/item_strfunc.h: removed size_of() sql/item_uniq.h: removed size_of() sql/lex.h: merge with 4.0.3 (Indentation change) sql/log_event.cc: Add ` around database in 'use database' in binary log. sql/mysql_priv.h: merge with 4.0.3 sql/mysqld.cc: merge with 4.0.3 (Indentation change) sql/share/czech/errmsg.txt: merge sql/share/danish/errmsg.txt: merge sql/share/dutch/errmsg.txt: merge sql/share/english/errmsg.txt: merge sql/share/estonian/errmsg.txt: merge sql/share/french/errmsg.txt: merge sql/share/german/errmsg.txt: merge sql/share/greek/errmsg.txt: merge sql/share/hungarian/errmsg.txt: merge sql/share/italian/errmsg.txt: merge sql/share/japanese/errmsg.txt: merge sql/share/korean/errmsg.txt: merge sql/share/norwegian-ny/errmsg.txt: merge sql/share/norwegian/errmsg.txt: merge sql/share/polish/errmsg.txt: merge sql/share/portuguese/errmsg.txt: merge sql/share/romanian/errmsg.txt: merge sql/share/russian/errmsg.txt: merge sql/share/slovak/errmsg.txt: merge sql/share/spanish/errmsg.txt: merge sql/share/swedish/errmsg.txt: merge sql/share/ukrainian/errmsg.txt: merge sql/sql_acl.cc: merge with 4.0.3 sql/sql_base.cc: More comments Fixed bug in send_fields() when using convert sql/sql_class.cc: merge sql/sql_class.h: Merge with 4.0.3 Moved max_error_count and max_warning_count to variables struct. sql/sql_delete.cc: merge with 4.0.3 (Indentation change) sql/sql_lex.h: merge with 4.0.3 sql/sql_parse.cc: Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT. (Should be retrived from variables) sql/sql_select.cc: merge with 4.0.3 sql/sql_show.cc: merge with 4.0.3 sql/sql_union.cc: merge with 4.0.3 sql/sql_update.cc: merge with 4.0.3 sql/sql_yacc.yy: merge with 4.0.3 Indentation cleanup sql/structs.h: merge with 4.0.3 sql/table.cc: merge with 4.0.3 sql/table.h: merge with 4.0.3
251 lines
6.6 KiB
C++
251 lines
6.6 KiB
C++
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
|
|
/*
|
|
Get hostname for an IP. Hostnames are checked with reverse name lookup and
|
|
checked that they doesn't resemble an ip.
|
|
*/
|
|
|
|
#include "mysql_priv.h"
|
|
#include "hash_filo.h"
|
|
#include <m_ctype.h>
|
|
#ifdef __cplusplus
|
|
extern "C" { // Because of SCO 3.2V4.2
|
|
#endif
|
|
#if !defined( __WIN__) && !defined(OS2)
|
|
#include <sys/resource.h>
|
|
#ifdef HAVE_SYS_UN_H
|
|
#include <sys/un.h>
|
|
#endif
|
|
#include <netdb.h>
|
|
#include <sys/utsname.h>
|
|
#endif // __WIN__
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
|
|
class host_entry :public hash_filo_element
|
|
{
|
|
public:
|
|
char ip[sizeof(((struct in_addr *) 0)->s_addr)];
|
|
uint errors;
|
|
char *hostname;
|
|
};
|
|
|
|
static hash_filo *hostname_cache;
|
|
static pthread_mutex_t LOCK_hostname;
|
|
|
|
void hostname_cache_refresh()
|
|
{
|
|
hostname_cache->clear();
|
|
}
|
|
|
|
bool hostname_cache_init()
|
|
{
|
|
host_entry tmp;
|
|
uint offset= (uint) ((char*) (&tmp.ip) - (char*) &tmp);
|
|
(void) pthread_mutex_init(&LOCK_hostname,MY_MUTEX_INIT_SLOW);
|
|
|
|
if (!(hostname_cache=new hash_filo(HOST_CACHE_SIZE, offset,
|
|
sizeof(struct in_addr),NULL,
|
|
(void (*)(void*)) free)))
|
|
return 1;
|
|
hostname_cache->clear();
|
|
return 0;
|
|
}
|
|
|
|
void hostname_cache_free()
|
|
{
|
|
(void) pthread_mutex_destroy(&LOCK_hostname);
|
|
delete hostname_cache;
|
|
}
|
|
|
|
static void add_hostname(struct in_addr *in,const char *name)
|
|
{
|
|
if (!(specialflag & SPECIAL_NO_HOST_CACHE))
|
|
{
|
|
VOID(pthread_mutex_lock(&hostname_cache->lock));
|
|
host_entry *entry;
|
|
if (!(entry=(host_entry*) hostname_cache->search((gptr) &in->s_addr,0)))
|
|
{
|
|
uint length=name ? (uint) strlen(name) : 0;
|
|
|
|
if ((entry=(host_entry*) malloc(sizeof(host_entry)+length+1)))
|
|
{
|
|
char *new_name;
|
|
memcpy_fixed(&entry->ip, &in->s_addr, sizeof(in->s_addr));
|
|
if (length)
|
|
memcpy(new_name= (char *) (entry+1), name, length+1);
|
|
else
|
|
new_name=0;
|
|
entry->hostname=new_name;
|
|
entry->errors=0;
|
|
(void) hostname_cache->add(entry);
|
|
}
|
|
}
|
|
VOID(pthread_mutex_unlock(&hostname_cache->lock));
|
|
}
|
|
}
|
|
|
|
|
|
inline void add_wrong_ip(struct in_addr *in)
|
|
{
|
|
add_hostname(in,NullS);
|
|
}
|
|
|
|
void inc_host_errors(struct in_addr *in)
|
|
{
|
|
VOID(pthread_mutex_lock(&hostname_cache->lock));
|
|
host_entry *entry;
|
|
if ((entry=(host_entry*) hostname_cache->search((gptr) &in->s_addr,0)))
|
|
entry->errors++;
|
|
VOID(pthread_mutex_unlock(&hostname_cache->lock));
|
|
}
|
|
|
|
void reset_host_errors(struct in_addr *in)
|
|
{
|
|
VOID(pthread_mutex_lock(&hostname_cache->lock));
|
|
host_entry *entry;
|
|
if ((entry=(host_entry*) hostname_cache->search((gptr) &in->s_addr,0)))
|
|
entry->errors=0;
|
|
VOID(pthread_mutex_unlock(&hostname_cache->lock));
|
|
}
|
|
|
|
|
|
my_string ip_to_hostname(struct in_addr *in, uint *errors)
|
|
{
|
|
uint i;
|
|
host_entry *entry;
|
|
DBUG_ENTER("ip_to_hostname");
|
|
|
|
/* Check first if we have name in cache */
|
|
*errors=0;
|
|
if (!(specialflag & SPECIAL_NO_HOST_CACHE))
|
|
{
|
|
VOID(pthread_mutex_lock(&hostname_cache->lock));
|
|
if ((entry=(host_entry*) hostname_cache->search((gptr) &in->s_addr,0)))
|
|
{
|
|
char *name;
|
|
if (!entry->hostname)
|
|
name=0; // Don't allow connection
|
|
else
|
|
name=my_strdup(entry->hostname,MYF(0));
|
|
*errors= entry->errors;
|
|
VOID(pthread_mutex_unlock(&hostname_cache->lock));
|
|
DBUG_RETURN(name);
|
|
}
|
|
VOID(pthread_mutex_unlock(&hostname_cache->lock));
|
|
}
|
|
|
|
struct hostent *hp, *check;
|
|
char *name;
|
|
LINT_INIT(check);
|
|
#if defined(HAVE_GETHOSTBYADDR_R) && defined(HAVE_SOLARIS_STYLE_GETHOST)
|
|
char buff[GETHOSTBYADDR_BUFF_SIZE],buff2[GETHOSTBYNAME_BUFF_SIZE];
|
|
int tmp_errno;
|
|
struct hostent tmp_hostent, tmp_hostent2;
|
|
#ifdef HAVE_purify
|
|
bzero(buff,sizeof(buff)); // Bug in purify
|
|
#endif
|
|
if (!(hp=gethostbyaddr_r((char*) in,sizeof(*in),
|
|
AF_INET,
|
|
&tmp_hostent,buff,sizeof(buff),&tmp_errno)))
|
|
{
|
|
DBUG_PRINT("error",("gethostbyaddr_r returned %d",tmp_errno));
|
|
return 0;
|
|
}
|
|
if (!(check=my_gethostbyname_r(hp->h_name,&tmp_hostent2,buff2,sizeof(buff2),
|
|
&tmp_errno)))
|
|
{
|
|
DBUG_PRINT("error",("gethostbyname_r returned %d",tmp_errno));
|
|
add_wrong_ip(in);
|
|
my_gethostbyname_r_free();
|
|
DBUG_RETURN(0);
|
|
}
|
|
if (!hp->h_name[0])
|
|
{
|
|
DBUG_PRINT("error",("Got an empty hostname"));
|
|
add_wrong_ip(in);
|
|
my_gethostbyname_r_free();
|
|
DBUG_RETURN(0); // Don't allow empty hostnames
|
|
}
|
|
if (!(name=my_strdup(hp->h_name,MYF(0))))
|
|
{
|
|
my_gethostbyname_r_free();
|
|
DBUG_RETURN(0); // out of memory
|
|
}
|
|
my_gethostbyname_r_free();
|
|
#else
|
|
VOID(pthread_mutex_lock(&LOCK_hostname));
|
|
if (!(hp=gethostbyaddr((char*) in,sizeof(*in), AF_INET)))
|
|
{
|
|
VOID(pthread_mutex_unlock(&LOCK_hostname));
|
|
DBUG_PRINT("error",("gethostbyaddr returned %d",errno));
|
|
goto err;
|
|
}
|
|
if (!hp->h_name[0]) // Don't allow empty hostnames
|
|
{
|
|
VOID(pthread_mutex_unlock(&LOCK_hostname));
|
|
DBUG_PRINT("error",("Got an empty hostname"));
|
|
goto err;
|
|
}
|
|
if (!(name=my_strdup(hp->h_name,MYF(0))))
|
|
{
|
|
VOID(pthread_mutex_unlock(&LOCK_hostname));
|
|
DBUG_RETURN(0); // out of memory
|
|
}
|
|
check=gethostbyname(name);
|
|
VOID(pthread_mutex_unlock(&LOCK_hostname));
|
|
if (!check)
|
|
{
|
|
DBUG_PRINT("error",("gethostbyname returned %d",errno));
|
|
my_free(name,MYF(0));
|
|
DBUG_RETURN(0);
|
|
}
|
|
#endif
|
|
|
|
/* Don't accept hostnames that starts with digits because they may be
|
|
false ip:s */
|
|
if (my_isdigit(system_charset_info,name[0]))
|
|
{
|
|
char *pos;
|
|
for (pos= name+1 ; my_isdigit(system_charset_info,*pos); pos++) ;
|
|
if (*pos == '.')
|
|
{
|
|
DBUG_PRINT("error",("mysqld doesn't accept hostnames that starts with a number followed by a '.'"));
|
|
my_free(name,MYF(0));
|
|
goto err;
|
|
}
|
|
}
|
|
|
|
/* Check that 'gethostbyname' returned the used ip */
|
|
for (i=0; check->h_addr_list[i]; i++)
|
|
{
|
|
if (*(uint32*)(check->h_addr_list)[i] == in->s_addr)
|
|
{
|
|
add_hostname(in,name);
|
|
DBUG_RETURN(name);
|
|
}
|
|
}
|
|
DBUG_PRINT("error",("Couldn't verify hostname with gethostbyname"));
|
|
my_free(name,MYF(0));
|
|
|
|
err:
|
|
add_wrong_ip(in);
|
|
DBUG_RETURN(0);
|
|
}
|