Skip to content

[mod_amqp] Add support for newer librabbitmq #2846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions configure.ac
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -1546,9 +1546,22 @@ PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client2 >= 2.0.0],[
])
])

PKG_CHECK_MODULES([AMQP], [librabbitmq >= 0.5.2],[
AM_CONDITIONAL([HAVE_AMQP],[true])],[
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_AMQP],[false])])
PKG_CHECK_MODULES([AMQP], [librabbitmq >= 0.5.2], [
AM_CONDITIONAL([HAVE_AMQP], [true])
# Extract the version of librabbitmq
AMQP_VERSION=`$PKG_CONFIG --modversion librabbitmq`
AC_DEFINE_UNQUOTED([AMQP_VERSION], ["$AMQP_VERSION"], [Version of librabbitmq])
# Parse major and minor version numbers
AMQP_MAJOR_VERSION=`echo $AMQP_VERSION | cut -d. -f1`
AMQP_MINOR_VERSION=`echo $AMQP_VERSION | cut -d. -f2`
AC_DEFINE_UNQUOTED([AMQP_MAJOR_VERSION], [$AMQP_MAJOR_VERSION], [Major version of librabbitmq])
AC_DEFINE_UNQUOTED([AMQP_MINOR_VERSION], [$AMQP_MINOR_VERSION], [Minor version of librabbitmq])
AC_SUBST(AMQP_MAJOR_VERSION)
AC_SUBST(AMQP_MINOR_VERSION)
], [
AC_MSG_RESULT([no])
AM_CONDITIONAL([HAVE_AMQP], [false])
])

PKG_CHECK_MODULES([H2O], [libh2o-evloop >= 0.11.0],[
AM_CONDITIONAL([HAVE_H2O],[true])],[
Expand Down
2 changes: 1 addition & 1 deletion src/mod/event_handlers/mod_amqp/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if HAVE_AMQP

mod_LTLIBRARIES = mod_amqp.la
mod_amqp_la_SOURCES = mod_amqp_utils.c mod_amqp_connection.c mod_amqp_producer.c mod_amqp_command.c mod_amqp_logging.c mod_amqp.c
mod_amqp_la_CFLAGS = $(AM_CFLAGS) $(AMQP_CFLAGS)
mod_amqp_la_CFLAGS = $(AM_CFLAGS) $(AMQP_CFLAGS) -DAMQP_MAJOR_VERSION=$(AMQP_MAJOR_VERSION) -DAMQP_MINOR_VERSION=$(AMQP_MINOR_VERSION)
mod_amqp_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_amqp_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(AMQP_LIBS) $(SWITCH_AM_LDFLAGS)

Expand Down
8 changes: 8 additions & 0 deletions src/mod/event_handlers/mod_amqp/mod_amqp.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,18 @@
#define MOD_AMQP_H

#include <switch.h>
#define AMQP_VERSION_INT(a, b) ((a)<<8 | (b))
#if AMQP_VERSION_INT(AMQP_MAJOR_VERSION, AMQP_MINOR_VERSION) >= AMQP_VERSION_INT(0, 12)
#include <rabbitmq-c/amqp.h>
#include <rabbitmq-c/framing.h>
#include <rabbitmq-c/tcp_socket.h>
#include <rabbitmq-c/ssl_socket.h>
#else
#include <amqp.h>
#include <amqp_framing.h>
#include <amqp_tcp_socket.h>
#include <amqp_ssl_socket.h>
#endif

#ifndef _MSC_VER
#include <strings.h>
Expand Down
2 changes: 2 additions & 0 deletions src/mod/event_handlers/mod_amqp/mod_amqp_connection.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ switch_status_t mod_amqp_connection_open(mod_amqp_connection_t *connections, mod

while (connection_attempt && amqp_status){
if (connection_attempt->ssl_on == 1) {
#if AMQP_VERSION_INT(AMQP_MAJOR_VERSION, AMQP_MINOR_VERSION) < AMQP_VERSION_INT(0, 13)
amqp_set_initialize_ssl_library(connection_attempt->ssl_on);
#endif
if (!(socket = amqp_ssl_socket_new(newConnection))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not create SSL socket\n");
goto err;
Expand Down
3 changes: 3 additions & 0 deletions w32/rabbitmq-c-version.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
</ImportGroup>
<PropertyGroup Label="UserMacros">
<rabbitmq_cMajorVersion>0</rabbitmq_cMajorVersion>
<rabbitmq_cMinorVersion>15</rabbitmq_cMinorVersion>
<rabbitmq_cRevisionVersion>0</rabbitmq_cRevisionVersion>
<rabbitmq_cVersion>0.15.0</rabbitmq_cVersion>
<rabbitmq_cBuildNumber>0</rabbitmq_cBuildNumber>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions w32/rabbitmq-c.props
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(rabbitmq_c_libDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>AMQP_MAJOR_VERSION=$(rabbitmq_cMajorVersion);AMQP_MINOR_VERSION=$(rabbitmq_cMinorVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(rabbitmq_c_libDir)\binaries\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
Expand Down
Loading