FS-11727: [mod_mariadb] Add MariaDB (MySQL) support

2025-08-13 17:38:59 +00:00 · 2019-06-12 12:05:42 +04:00
parent 65cd6ec1ed
commit 4a2812aaf5
23 changed files with 1598 additions and 4 deletions
--- a/src/mod/databases/mod_mariadb/Makefile.am
+++ b/src/mod/databases/mod_mariadb/Makefile.am
@@ -0,0 +1,18 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_mariadb
+
+if HAVE_MARIADB
+
+mod_LTLIBRARIES = mod_mariadb.la
+mod_mariadb_la_SOURCES  = mariadb_dsn.cpp mod_mariadb.c
+mod_mariadb_la_CFLAGS   = $(AM_CFLAGS) $(MARIADB_CFLAGS)
+mod_mariadb_la_CXXFLAGS = -std=c++11 $(MARIADB_CFLAGS)
+mod_mariadb_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(MARIADB_LIBS)
+mod_mariadb_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+else
+install: error
+all: error
+error:
+	$(error You must install libmariadb-dev to build mod_mariadb. MariaDB supports non-blocking operations starting with version 5.5.21. libmariadb version should be >= 3.0.9 to support MySQL 8.0)
+endif
--- a/src/mod/databases/mod_mariadb/mariadb_dsn.cpp
+++ b/src/mod/databases/mod_mariadb/mariadb_dsn.cpp
@@ -0,0 +1,161 @@
+/*
+* mod_mariadb for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+* Copyright (C) 2019, Andrey Volk <andywolk@gmail.com>
+*
+* Version: MPL 1.1
+*
+* The contents of this file are subject to the Mozilla Public License Version
+* 1.1 (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+* http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS IS" basis,
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+* for the specific language governing rights and limitations under the
+* License.
+*
+* The Original Code is ported from FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+*
+* The Initial Developer of the Original Code is
+* Anthony Minessale II <anthm@freeswitch.org>
+* Portions created by the Initial Developer are Copyright (C)
+* the Initial Developer. All Rights Reserved.
+*
+* Contributor(s):
+* Andrey Volk <andywolk@gmail.com>
+*
+* mariadb_dsn.cpp -- Connection string parser for MariaDB FreeSWITCH module
+*
+*/
+#include <switch.h>
+#include "mariadb_dsn.hpp"
+
+#include <string>
+#include <iterator>
+#include <vector>
+#include <unordered_map>
+#include <regex>
+#include <algorithm>
+#include <sstream>
+
+class mariadb_dsn {
+
+	std::string _host = "localhost";
+	std::string _user;
+	std::string _passwd;
+	std::string _db;
+	int _port = 3306;
+	std::string _unix_socket;
+	std::string _character_set;	
+	unsigned long _clientflag;
+
+public:	
+
+	template<typename Out>
+	void split(const std::string &s, char delim, Out result) {
+		std::stringstream ss(s);
+		std::string item;
+		while (std::getline(ss, item, delim)) {
+			*(result++) = item;
+		}
+	}
+
+	std::vector<std::string> split(const std::string &s, char delim) {
+		std::vector<std::string> elems;
+		split(s, delim, std::back_inserter(elems));
+		return elems;
+	}
+
+	mariadb_dsn(MYSQL *mysql, const char *dsn, unsigned long clientflag)
+	{
+		_clientflag = clientflag;
+
+		if (dsn) {
+			std::vector<std::string> params = split(std::string(dsn), ';');
+
+			for (auto &param : params) {
+				std::vector<std::string> pair = split(param, '=');
+				if (pair.size() >= 2) {
+					std::string key = std::regex_replace(pair[0], std::regex("^ +| +$|( ) +"), "$1");
+					std::transform(key.begin(), key.end(), key.begin(), ::tolower);
+					std::string value = pair[1];
+
+					if ("server" == key || "host" == key) {
+						_host = value;
+					} else if ("uid" == key || "user" == key || "username" == key) {
+						_user = value;
+					} else if ("pwd" == key || "passwd" == key || "password" == key) {
+						_passwd = value;
+					} else if ("database" == key || "db" == key) {
+						_db = value;
+					} else if ("port" == key) {
+						_port = std::stoi(value);
+					} else if ("option" == key || "options" == key) {
+						unsigned long option;
+						std::stringstream(value) >> option;
+						_clientflag |= option;
+					} else if ("charset" == key) {
+						std::string charset = std::regex_replace(value, std::regex("^ +| +$|( ) +"), "$1");
+						int err = mysql_optionsv(mysql, MYSQL_SET_CHARSET_NAME, (void *)charset.c_str());
+						if (err) {
+							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mysql_optionsv returned an error [MYSQL_SET_CHARSET_NAME=%s]: %s\n", charset.c_str(), mysql_error(mysql));
+						}
+					}
+				}
+			}
+
+		}
+	}
+
+	const char* host() const
+	{
+		return _host.c_str();
+	}
+
+	const char* user() const
+	{
+		return _user.c_str();
+	}
+
+	const char* passwd() const
+	{
+		return _passwd.c_str();
+	}
+
+	const char* db() const
+	{
+		return _db.c_str();
+	}
+
+	const int port() const
+	{
+		return _port;
+	}
+
+	const char* unix_socket() const
+	{
+		return ("" == _unix_socket) ? NULL : _unix_socket.c_str();
+	}
+
+	unsigned long clientflag()
+	{
+		return _clientflag;
+	}
+};
+
+MYSQL* STDCALL mysql_dsn_connect(MYSQL *mysql, const char *connection_string, unsigned long clientflag)
+{
+	mariadb_dsn dsn(mysql, connection_string, clientflag);
+	return mysql_real_connect(mysql, dsn.host(), dsn.user(), dsn.passwd(), dsn.db(), dsn.port(), dsn.unix_socket(), dsn.clientflag());
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
--- a/src/mod/databases/mod_mariadb/mariadb_dsn.hpp
+++ b/src/mod/databases/mod_mariadb/mariadb_dsn.hpp
@@ -0,0 +1,57 @@
+/*
+* mod_mariadb for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+* Copyright (C) 2019, Andrey Volk <andywolk@gmail.com>
+*
+* Version: MPL 1.1
+*
+* The contents of this file are subject to the Mozilla Public License Version
+* 1.1 (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+* http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS IS" basis,
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+* for the specific language governing rights and limitations under the
+* License.
+*
+* The Original Code is ported from FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+*
+* The Initial Developer of the Original Code is
+* Anthony Minessale II <anthm@freeswitch.org>
+* Portions created by the Initial Developer are Copyright (C)
+* the Initial Developer. All Rights Reserved.
+*
+* Contributor(s):
+* Andrey Volk <andywolk@gmail.com>
+*
+* mariadb_dsn.hpp -- Connection string parser header
+*
+*/
+
+#ifndef _MARIADB_DSN_H_
+#define _MARIADB_DSN_H_
+
+#include <mysql.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+MYSQL* STDCALL mysql_dsn_connect(MYSQL *mysql, const char *connection_string, unsigned long clientflag);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //_MARIADB_DSN_H_
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
--- a/src/mod/databases/mod_mariadb/mod_mariadb.2017.vcxproj
+++ b/src/mod/databases/mod_mariadb/mod_mariadb.2017.vcxproj
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>mod_mariadb</ProjectName>
+    <RootNamespace>mod_mariadb</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{0B612F84-7533-4DEC-AEDD-5C9CBCF15EAC}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(SolutionDir)w32/mariadb-connector-c.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\w32\module_release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\w32\module_debug.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\w32\module_release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\w32\module_debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="mariadb_dsn.cpp" />
+    <ClCompile Include="mod_mariadb.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="mariadb_dsn.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj">
+      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/src/mod/databases/mod_mariadb/mod_mariadb.c
+++ b/src/mod/databases/mod_mariadb/mod_mariadb.c
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -2929,7 +2929,7 @@ static char create_row_size_limited_channels_sql[] =
 	"   ip_addr  VARCHAR(256),\n"
 	"   dest  VARCHAR(1024),\n"
 	"   application  VARCHAR(128),\n"
-	"   application_data  VARCHAR(4096),\n"
+	"   application_data TEXT,\n"
 	"   dialplan VARCHAR(128),\n"
 	"   context VARCHAR(128),\n"
 	"   read_codec  VARCHAR(128),\n"