mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
5ae2656b69
commit c545d544378483bf68c4fb713cd4ec872d0df2c4 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Tue Mar 27 23:13:14 2018 +0200 - Fix MDEV-15577 CONNECT engine JDBC remote index prevents UPDATE Fixed in TDBJDBC::OpenDB because query can be null for updates modified: storage/connect/tabjdbc.cpp commit c4f1fe2e8e74566e9c3296f435448d9f5c718b23 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Wed Mar 14 12:21:17 2018 +0100 - Fix MDEV-15429 CONNECT engine JDBC handling Postgresql UUID type Also handle Postgresql sending type VARCHAR for TEXT column and setting length to b x7FFFFFF when the length is unknown. modified: storage/connect/Client.java modified: storage/connect/JavaWrappers.jar modified: storage/connect/JdbcInterface.java modified: storage/connect/PostgresqlInterface.java modified: storage/connect/global.h modified: storage/connect/ha_connect.cc modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h modified: storage/connect/mysql-test/connect/r/jdbc_postgresql.result modified: storage/connect/mysql-test/connect/t/jdbc_postgresql.test modified: storage/connect/mysql-test/connect/t/jdbconn.inc modified: storage/connect/plgdbsem.h modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabjdbc.h added: storage/connect/mysql-test/connect/std_data/JavaWrappers.jar commit 3068bb4882a316c6c32c624609db2bf24ae3ad40 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Mon Feb 26 19:40:27 2018 +0100 Revert to old cmake file to avoid compile error commit da8c1c0bd6a327fd03bd321be3170f468122ef67 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Mon Feb 26 16:13:39 2018 +0100 - Remove warning on not used tabtyp variable in connect_assisted_discovery modified: storage/connect/ha_connect.cc - Fix a bug causing CONNECT to loop when expanding a JSON column when the expanded column value is null or void array. - Adding the FullArray option to JSON tables. - Skipping expanded JSON lines when the expanded column value is null. modified: storage/connect/connect.cc modified: storage/connect/tabdos.h modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h - Fix MDEV-13353 No file privilege for ODBC, JDBC, MONGO, MAC, WMI file types. modified: storage/connect/ha_connect.cc - Make some Json UDFs to accept a non JSON item as 1st parameter. modified: storage/connect/json.cpp modified: storage/connect/json.h modified: storage/connect/jsonudf.cpp modified: storage/connect/jsonudf.h - Update Json UDF tests to cope with above changes. modified: storage/connect/mysql-test/connect/r/json_udf.result modified: storage/connect/mysql-test/connect/r/json_udf_bin.result modified: storage/connect/mysql-test/connect/r/vcol.result modified: storage/connect/mysql-test/connect/t/json_udf.test modified: storage/connect/mysql-test/connect/t/vcol.test - Fix some compiler warning treated as error PlugSubAlloc no more exported because it does throw. modified: storage/connect/global.h modified: storage/connect/ha_connect.cc modified: storage/connect/jsonudf.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h - Other files modified (?) when going back to wrong merge modified: storage/connect/CMakeLists.txt modified: storage/connect/array.cpp modified: storage/connect/colblk.cpp modified: storage/connect/connect.cc modified: storage/connect/csort.cpp modified: storage/connect/domdoc.cpp modified: storage/connect/filamap.cpp modified: storage/connect/filamgz.cpp modified: storage/connect/filamtxt.cpp modified: storage/connect/filamzip.cpp modified: storage/connect/filter.cpp modified: storage/connect/fmdlex.c modified: storage/connect/jdbconn.cpp modified: storage/connect/macutil.cpp modified: storage/connect/myconn.cpp modified: storage/connect/odbconn.cpp modified: storage/connect/plgdbutl.cpp modified: storage/connect/plugutil.cpp modified: storage/connect/preparse.h modified: storage/connect/rcmsg.c modified: storage/connect/rcmsg.h modified: storage/connect/reldef.cpp modified: storage/connect/tabdos.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/tabmac.cpp modified: storage/connect/tabmul.cpp modified: storage/connect/tabmysql.cpp modified: storage/connect/tabmysql.h modified: storage/connect/tabodbc.cpp modified: storage/connect/tabtbl.cpp modified: storage/connect/tabxml.cpp modified: storage/connect/value.cpp modified: storage/connect/xobject.cpp commit 5095628b31ed8c94bd7c794c6b0162894a9040b1 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Tue Feb 13 14:29:00 2018 +0100 - Fix a bug causing CONNECT to loop when expanding a JSON column when the expanded column value is null or void array. - Adding the FullArray option to JSON tables. - Skipping expanded JSON lines when the expanded column value is null. modified: storage/connect/connect.cc modified: storage/connect/tabdos.h modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h commit 9896174328da42016735630c893fd09eb128b48e Author: Olivier Bertrand <bertrandop@gmail.com> Date: Fri Feb 2 15:48:57 2018 +0100 - Remove warning on not used tabtyp variable in connect_assisted_discovery modified: storage/connect/ha_connect.cc commit d7e254c05f88173eb04d8dafc813013eb42ccdbe Author: Olivier Bertrand <bertrandop@gmail.com> Date: Wed Jan 31 14:42:45 2018 +0100 - Use delayed load for the MongoDB C Drive on Windows modified: storage/connect/CMakeLists.txt modified: storage/connect/cmgoconn.cpp modified: storage/connect/ha_connect.cc - Add FORCE to the connect_type_conv enum values This will translate binary values to TYPE_STRING modified: storage/connect/checklvl.h modified: storage/connect/ha_connect.cc modified: storage/connect/odbconn.cpp - Change the connect_xtrace variable to from int to set modified: storage/connect/array.cpp modified: storage/connect/blkfil.cpp modified: storage/connect/block.h modified: storage/connect/cmgoconn.cpp modified: storage/connect/colblk.cpp modified: storage/connect/connect.cc modified: storage/connect/filamap.cpp modified: storage/connect/filamdbf.cpp modified: storage/connect/filamfix.cpp modified: storage/connect/filamgz.cpp modified: storage/connect/filamtxt.cpp modified: storage/connect/filamvct.cpp modified: storage/connect/filamzip.cpp modified: storage/connect/filter.cpp modified: storage/connect/global.h modified: storage/connect/ha_connect.cc modified: storage/connect/inihandl.cpp modified: storage/connect/javaconn.cpp modified: storage/connect/jdbconn.cpp modified: storage/connect/jmgfam.cpp modified: storage/connect/jmgoconn.cpp modified: storage/connect/json.cpp modified: storage/connect/jsonudf.cpp modified: storage/connect/libdoc.cpp modified: storage/connect/mongo.cpp modified: storage/connect/mycat.cc modified: storage/connect/myconn.cpp modified: storage/connect/odbconn.cpp modified: storage/connect/plgdbutl.cpp modified: storage/connect/plugutil.cpp modified: storage/connect/reldef.cpp modified: storage/connect/tabcol.cpp modified: storage/connect/tabdos.cpp modified: storage/connect/tabext.cpp modified: storage/connect/tabfix.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/table.cpp modified: storage/connect/tabmul.cpp modified: storage/connect/tabmysql.cpp modified: storage/connect/tabodbc.cpp modified: storage/connect/tabpivot.cpp modified: storage/connect/tabsys.cpp modified: storage/connect/tabtbl.cpp modified: storage/connect/tabutil.cpp modified: storage/connect/tabvct.cpp modified: storage/connect/tabwmi.cpp modified: storage/connect/tabxml.cpp modified: storage/connect/user_connect.cc modified: storage/connect/valblk.cpp modified: storage/connect/value.cpp modified: storage/connect/xindex.cpp - Restore connect_enable_mongo variable (but undocumented) modified: storage/connect/ha_connect.cc modified: storage/connect/mycat.cc modified: storage/connect/mysql-test/connect/r/json_java_2.result modified: storage/connect/mysql-test/connect/r/json_java_3.result modified: storage/connect/mysql-test/connect/r/json_mongo_c.result modified: storage/connect/mysql-test/connect/r/mongo_c.result modified: storage/connect/mysql-test/connect/r/mongo_java_2.result modified: storage/connect/mysql-test/connect/r/mongo_java_3.result modified: storage/connect/mysql-test/connect/r/tbl_thread.result modified: storage/connect/mysql-test/connect/t/mongo.inc modified: storage/connect/mysql-test/connect/t/mongo_test.inc modified: storage/connect/mysql-test/connect/t/tbl_thread.test
318 lines
9.9 KiB
C++
318 lines
9.9 KiB
C++
/***********************************************************************/
|
|
/* MACUTIL: Author Olivier Bertrand -- 2008-2012 */
|
|
/* From the article and sample code by Khalid Shaikh. */
|
|
/***********************************************************************/
|
|
#if defined(__WIN__)
|
|
#include "my_global.h"
|
|
#else // !__WIN__
|
|
#error This is WINDOWS only DLL
|
|
#endif // !__WIN__
|
|
#include "global.h"
|
|
#include "plgdbsem.h"
|
|
#include "macutil.h"
|
|
|
|
#if 0 // This is placed here just to know what are the actual values
|
|
#define MAX_ADAPTER_DESCRIPTION_LENGTH 128
|
|
#define MAX_ADAPTER_NAME_LENGTH 256
|
|
#define MAX_ADAPTER_ADDRESS_LENGTH 8
|
|
#define DEFAULT_MINIMUM_ENTITIES 32
|
|
#define MAX_HOSTNAME_LEN 128
|
|
#define MAX_DOMAIN_NAME_LEN 128
|
|
#define MAX_SCOPE_ID_LEN 256
|
|
|
|
#define BROADCAST_NODETYPE 1
|
|
#define PEER_TO_PEER_NODETYPE 2
|
|
#define MIXED_NODETYPE 4
|
|
#define HYBRID_NODETYPE 8
|
|
|
|
#define IP_ADAPTER_DDNS_ENABLED 0x01
|
|
#define IP_ADAPTER_REGISTER_ADAPTER_SUFFIX 0x02
|
|
#define IP_ADAPTER_DHCP_ENABLED 0x04
|
|
#define IP_ADAPTER_RECEIVE_ONLY 0x08
|
|
#define IP_ADAPTER_NO_MULTICAST 0x10
|
|
#define IP_ADAPTER_IPV6_OTHER_STATEFUL_CONFIG 0x20
|
|
#endif // 0
|
|
|
|
/***********************************************************************/
|
|
/* Implementation of the MACINFO class. */
|
|
/***********************************************************************/
|
|
MACINFO::MACINFO(bool adap, bool fix)
|
|
{
|
|
Fip = NULL;
|
|
Piaf = NULL;
|
|
Curp = NULL;
|
|
Buflen = 0;
|
|
Fix = fix;
|
|
Adap = adap;
|
|
N = -1;
|
|
} // end of MACINFO constructor
|
|
|
|
/***********************************************************************/
|
|
/* MACINFO: Return an error message. */
|
|
/***********************************************************************/
|
|
void MACINFO::MakeErrorMsg(PGLOBAL g, DWORD drc)
|
|
{
|
|
if (drc == ERROR_BUFFER_OVERFLOW)
|
|
sprintf(g->Message,
|
|
"GetAdaptersInfo: Buffer Overflow buflen=%d nbofadap=%d",
|
|
Buflen, N);
|
|
else if (drc == ERROR_INVALID_PARAMETER)
|
|
strcpy(g->Message, "GetAdaptersInfo: Invalid parameters");
|
|
else if (drc == ERROR_NO_DATA)
|
|
strcpy(g->Message,
|
|
"No adapter information exists for the local computer");
|
|
else if (drc == ERROR_NOT_SUPPORTED)
|
|
strcpy(g->Message, "GetAdaptersInfo is not supported");
|
|
else
|
|
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
|
|
FORMAT_MESSAGE_IGNORE_INSERTS, NULL, GetLastError(),
|
|
0, g->Message, sizeof(g->Message), NULL);
|
|
|
|
} // end of MakeErrorMsg
|
|
|
|
/***********************************************************************/
|
|
/* MAC: Get the number of found adapters. */
|
|
/***********************************************************************/
|
|
int MACINFO::GetNadap(PGLOBAL g)
|
|
{
|
|
if (N < 0) {
|
|
// Best method
|
|
if (Adap) {
|
|
DWORD drc = GetAdaptersInfo(NULL, &Buflen);
|
|
|
|
if (drc == ERROR_SUCCESS)
|
|
N = (Fix) ? 1 : 0;
|
|
else if (drc == ERROR_BUFFER_OVERFLOW)
|
|
N = Buflen / sizeof(IP_ADAPTER_INFO);
|
|
else
|
|
MakeErrorMsg(g, drc);
|
|
|
|
} else
|
|
N = (Fix) ? 1 : 0;
|
|
|
|
#if 0
|
|
// This method returns too many adapters
|
|
DWORD dw, drc = GetNumberOfInterfaces((PDWORD)&dw);
|
|
|
|
if (drc == NO_ERROR) {
|
|
N = (int)dw;
|
|
Buflen = N * sizeof(IP_ADAPTER_INFO);
|
|
} else
|
|
MakeErrorMsg(g, 0);
|
|
#endif
|
|
} // endif MaxSize
|
|
|
|
return N;
|
|
} // end of GetNadap
|
|
|
|
/***********************************************************************/
|
|
/* GetMacInfo: Get info for all found adapters. */
|
|
/***********************************************************************/
|
|
bool MACINFO::GetMacInfo(PGLOBAL g)
|
|
{
|
|
DWORD drc;
|
|
|
|
if (GetNadap(g) < 0)
|
|
return true;
|
|
else if (N == 0)
|
|
return false;
|
|
|
|
Piaf = (PIP_ADAPTER_INFO)PlugSubAlloc(g, NULL, Buflen);
|
|
drc = GetAdaptersInfo(Piaf, &Buflen);
|
|
|
|
if (drc == ERROR_SUCCESS) {
|
|
Curp = Piaf; // Curp is the first one
|
|
return false; // Success
|
|
} // endif drc
|
|
|
|
MakeErrorMsg(g, drc);
|
|
return true;
|
|
} // end of GetMacInfo
|
|
|
|
/***********************************************************************/
|
|
/* GetMacInfo: Get info for all found adapters. */
|
|
/***********************************************************************/
|
|
bool MACINFO::GetFixedInfo(PGLOBAL g)
|
|
{
|
|
ULONG len = (uint)sizeof(FIXED_INFO);
|
|
DWORD drc;
|
|
|
|
Fip = (FIXED_INFO*)PlugSubAlloc(g, NULL, len);
|
|
drc = GetNetworkParams(Fip, &len);
|
|
|
|
if (drc == ERROR_BUFFER_OVERFLOW) {
|
|
Fip = (FIXED_INFO*)PlugSubAlloc(g, NULL, len);
|
|
drc = GetNetworkParams(Fip, &len);
|
|
} // endif drc
|
|
|
|
if (drc != ERROR_SUCCESS) {
|
|
sprintf(g->Message, "GetNetworkParams failed. Rc=%08x\n", drc);
|
|
return true;
|
|
} // endif drc
|
|
|
|
return false;
|
|
} // end of GetFip
|
|
|
|
#if 0
|
|
#define IF_OTHER_ADAPTERTYPE 0
|
|
#define IF_ETHERNET_ADAPTERTYPE 1
|
|
#define IF_TOKEN_RING_ADAPTERTYPE 2
|
|
#define IF_FDDI_ADAPTERTYPE 3
|
|
#define IF_PPP_ADAPTERTYPE 4
|
|
#define IF_LOOPBACK_ADAPTERTYPE 5
|
|
#endif // 0
|
|
|
|
/***********************************************************************/
|
|
/* Get next MAC info. */
|
|
/***********************************************************************/
|
|
bool MACINFO::NextMac(void)
|
|
{
|
|
if (Curp)
|
|
Curp = Curp->Next;
|
|
|
|
return Curp != NULL;
|
|
} // end of NextMac
|
|
|
|
/***********************************************************************/
|
|
/* Get the next MAC address elements. */
|
|
/***********************************************************************/
|
|
bool MACINFO::GetOneInfo(PGLOBAL g, int flag, void *v, int lv)
|
|
{
|
|
char *p = NULL, buf[260] = "";
|
|
unsigned int i;
|
|
int n = 0;
|
|
|
|
if (!Curp && flag >= 10) {
|
|
// Fix info row, no adapter info available
|
|
switch (flag) {
|
|
case 13:
|
|
case 14:
|
|
case 19:
|
|
case 22:
|
|
case 23:
|
|
break;
|
|
default:
|
|
p = PlugDup(g, "");
|
|
} // endswitch flag
|
|
|
|
} else switch (flag) {
|
|
// FIXED INFO
|
|
case 1: // Host Name
|
|
p = Fip->HostName;
|
|
break;
|
|
case 2: // Domain Name
|
|
p = Fip->DomainName;
|
|
break;
|
|
case 3: // DNS IPaddress
|
|
p = (Fip->CurrentDnsServer)
|
|
? (char*)&Fip->CurrentDnsServer->IpAddress
|
|
: (char*)&Fip->DnsServerList.IpAddress;
|
|
break;
|
|
case 4: // Node Type
|
|
n = (int)Fip->NodeType;
|
|
break;
|
|
case 5: // Scope ID ???
|
|
p = Fip->ScopeId;
|
|
break;
|
|
case 6: // Routing enabled
|
|
n = (int)Fip->EnableRouting;
|
|
break;
|
|
case 7: // Proxy enabled
|
|
n = (int)Fip->EnableProxy;
|
|
break;
|
|
case 8: // DNS enabled
|
|
n = (int)Fip->EnableDns;
|
|
break;
|
|
// ADAPTERS INFO
|
|
case 10: // Name
|
|
p = Curp->AdapterName;
|
|
break;
|
|
case 11: // Description
|
|
if ((p = strstr(Curp->Description, " - Packet Scheduler Miniport"))) {
|
|
strncpy(buf, Curp->Description, p - Curp->Description);
|
|
i = (int)(p - Curp->Description);
|
|
strncpy(buf, Curp->Description, i);
|
|
buf[i] = 0;
|
|
p = buf;
|
|
} else if ((p = strstr(Curp->Description,
|
|
" - Miniport d'ordonnancement de paquets"))) {
|
|
i = (int)(p - Curp->Description);
|
|
strncpy(buf, Curp->Description, i);
|
|
buf[i] = 0;
|
|
p = buf;
|
|
} else
|
|
p = Curp->Description;
|
|
|
|
break;
|
|
case 12: // MAC Address
|
|
for (p = buf, i = 0; i < Curp->AddressLength; i++) {
|
|
if (i)
|
|
strcat(p++, "-");
|
|
|
|
p += sprintf(p, "%.2X", Curp->Address[i]);
|
|
} // endfor i
|
|
|
|
p = buf;
|
|
break;
|
|
case 13: // Type
|
|
#if 0 // This is not found in the SDK
|
|
switch (Curp->Type) {
|
|
case IF_ETHERNET_ADAPTERTYPE: p = "Ethernet Adapter"; break;
|
|
case IF_TOKEN_RING_ADAPTERTYPE: p = "Token Ring Adapter"; break;
|
|
case IF_FDDI_ADAPTERTYPE: p = "FDDI Adapter"; break;
|
|
case IF_PPP_ADAPTERTYPE: p = "PPP Adapter"; break;
|
|
case IF_LOOPBACK_ADAPTERTYPE: p = "Loop Back Adapter"; break;
|
|
// case IF_SLIP_ADAPTERTYPE: p = "Generic Slip Adapter"; break;
|
|
default:
|
|
sprintf(buf, "Other Adapter, type=%d", Curp->Type);
|
|
p = buf;
|
|
} // endswitch Type
|
|
#endif // 0
|
|
n = (int)Curp->Type;
|
|
break;
|
|
case 14: // DHCP enabled
|
|
n = (int)Curp->DhcpEnabled;
|
|
break;
|
|
case 15: // IP Address
|
|
p = (Curp->CurrentIpAddress)
|
|
? (char*)&Curp->CurrentIpAddress->IpAddress
|
|
: (char*)&Curp->IpAddressList.IpAddress;
|
|
break;
|
|
case 16: // Subnet Mask
|
|
p = (Curp->CurrentIpAddress)
|
|
? (char*)&Curp->CurrentIpAddress->IpMask
|
|
: (char*)&Curp->IpAddressList.IpMask;
|
|
break;
|
|
case 17: // Gateway
|
|
p = (char*)&Curp->GatewayList.IpAddress;
|
|
break;
|
|
case 18: // DHCP Server
|
|
p = (char*)&Curp->DhcpServer.IpAddress;
|
|
break;
|
|
case 19: // Have WINS
|
|
n = (Curp->HaveWins) ? 1 : 0;
|
|
break;
|
|
case 20: // Primary WINS
|
|
p = (char*)&Curp->PrimaryWinsServer.IpAddress;
|
|
break;
|
|
case 21: // Secondary WINS
|
|
p = (char*)&Curp->SecondaryWinsServer.IpAddress;
|
|
break;
|
|
case 22: // Lease obtained
|
|
n = (int)Curp->LeaseObtained;
|
|
break;
|
|
case 23: // Lease expires
|
|
n = (int)Curp->LeaseExpires;
|
|
break;
|
|
default:
|
|
sprintf(g->Message, "Invalid flag value %d", flag);
|
|
return true;
|
|
} // endswitch flag
|
|
|
|
if (p)
|
|
strncpy((char*)v, p, lv);
|
|
else
|
|
*((int*)v) = n;
|
|
|
|
return false;
|
|
} // end of GetOneInfo
|