database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

Added type information for plugin tool

Browse Source
This commit is contained in:
Georg Richter
2015-10-18 13:06:41 +02:00
parent 1d80a7fc6c
commit 13c79e2263
3 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
client/ma_plugin_info.c
View File

@@ -17,6 +17,22 @@ static struct option long_options[]=
{NULL, 0, 0, 0} {NULL, 0, 0, 0}
}; };
struct st_plugin_type
{
int type;
char *typename;
};
static struct st_plugin_type plugin_types[]=
{
{MYSQL_CLIENT_AUTHENTICATION_PLUGIN, "authentication"},
{MARIADB_CLIENT_CIO_PLUGIN, "client/server protocol"},
{MARIADB_CLIENT_TRACE_PLUGIN, "trace"},
{MARIADB_CLIENT_REMOTEIO_PLUGIN, "remote file access"},
{MARIADB_CLIENT_CONNECTION_PLUGIN, "connection handler"},
{0, "unknown"}
};
void usage(void) void usage(void)
{ {
int i=0; int i=0;
@@ -30,15 +46,28 @@ void usage(void)
} }
} }
char *get_type_name(int type)
{
int i=0;
while (plugin_types[i].type)
{
if (type== plugin_types[i].type)
return plugin_types[i].typename;
i++;
}
return plugin_types[i].typename;
}
void show_plugin_info(struct st_mysql_client_plugin *plugin, my_bool builtin) void show_plugin_info(struct st_mysql_client_plugin *plugin, my_bool builtin)
{ {
printf("Type: %s\n", builtin ? "builtin" : "dynamic"); printf("Type: %s\n", get_type_name(plugin->type));
printf("Name: %s\n", plugin->name); printf("Name: %s\n", plugin->name);
printf("Desc: %s\n", plugin->desc); printf("Desc: %s\n", plugin->desc);
printf("Author: %s\n", plugin->author); printf("Author: %s\n", plugin->author);
printf("License: %s\n", plugin->license); printf("License: %s\n", plugin->license);
printf("Version: %d.%d.%d\n", plugin->version[0], plugin->version[1], plugin->version[2]); printf("Version: %d.%d.%d\n", plugin->version[0], plugin->version[1], plugin->version[2]);
printf("API Version: 0x%04X\n", plugin->interface_version); printf("API Version: 0x%04X\n", plugin->interface_version);
printf("Build type: %s\n", builtin ? "builtin" : "dynamic");
printf("\n"); printf("\n");
} }
@@ -56,14 +85,11 @@ void show_file(char *filename)
void *sym, *dlhandle; void *sym, *dlhandle;
struct st_mysql_client_plugin *plugin; struct st_mysql_client_plugin *plugin;
char *env_plugin_dir= getenv("MARIADB_PLUGIN_DIR"); char *env_plugin_dir= getenv("MARIADB_PLUGIN_DIR");
char *has_so_ext= strstr(filename, SO_EXT);
#ifdef _WIN32 if (!strchr(filename, FN_LIBCHAR))
if (!strchr(filename, '\\'))
#else
if (!strchr(filename, '/'))
#endif
strxnmov(dlpath, sizeof(dlpath) - 1, strxnmov(dlpath, sizeof(dlpath) - 1,
(env_plugin_dir) ? env_plugin_dir : PLUGINDIR, "/", filename, SO_EXT, NullS); (env_plugin_dir) ? env_plugin_dir : PLUGINDIR, "/", filename, has_so_ext ? "" : SO_EXT, NullS);
else else
strcpy(dlpath, filename); strcpy(dlpath, filename);
if ((dlhandle= dlopen((const char *)dlpath, RTLD_NOW))) if ((dlhandle= dlopen((const char *)dlpath, RTLD_NOW)))

2
include/mysql/client_plugin.h
View File

@@ -36,6 +36,8 @@
#define PLUGINDIR "lib/plugin" #define PLUGINDIR "lib/plugin"
#endif #endif
#define plugin_declarations_sym "_mysql_client_plugin_declaration_"
/* known plugin types */ /* known plugin types */
#define MYSQL_CLIENT_PLUGIN_RESERVED 0 #define MYSQL_CLIENT_PLUGIN_RESERVED 0
#define MYSQL_CLIENT_PLUGIN_RESERVED2 1 #define MYSQL_CLIENT_PLUGIN_RESERVED2 1

3
libmariadb/client_plugin.c.in
View File

@@ -56,9 +56,6 @@ struct st_client_plugin_int {
static my_bool initialized= 0; static my_bool initialized= 0;
static MEM_ROOT mem_root; static MEM_ROOT mem_root;
#define plugin_declarations_sym "_mysql_client_plugin_declaration_"
static uint valid_plugins[][2]= { static uint valid_plugins[][2]= {
{MYSQL_CLIENT_AUTHENTICATION_PLUGIN, MYSQL_CLIENT_AUTHENTICATION_PLUGIN_INTERFACE_VERSION}, {MYSQL_CLIENT_AUTHENTICATION_PLUGIN, MYSQL_CLIENT_AUTHENTICATION_PLUGIN_INTERFACE_VERSION},
{MARIADB_CLIENT_CIO_PLUGIN, MARIADB_CLIENT_CIO_PLUGIN_INTERFACE_VERSION}, {MARIADB_CLIENT_CIO_PLUGIN, MARIADB_CLIENT_CIO_PLUGIN_INTERFACE_VERSION},