mod_amqp: use new librabbit api

aeriandi/mod_amqp/README

@@ -15,6 +15,8 @@ Contents
 4.  Usage
 5.  Trouleshooting
 
+6.  Notes
+
 
 
 1. Features
@@ -111,3 +113,11 @@ Any errors or warnings will be reported using Freeswitch logging, so check for e
 Typically, messages not being received by the AMQP broker is due to network connectivity or failed authentication with the broker.
 
 If mod_amqp experiences back-pressure from the AMQP broker, its internal buffer of events to send fills up. When this buffer is half full, warning messages are logged, and when the queue is completely full the circuit breaker will be triggered, logging an error and dropping events for the predefined amount of time.
+
+
+
+6. Notes
+--------
+
+The SHA for the revision of librabbitmq-c1 that is included is 1c213703c9fdd747bc71ea4f64943c3b4269f8cf.
+ 

aeriandi/mod_amqp/amqp_settings.h

+#include "switch_version.h"
 
 #define CUSTOM_ATTR ""
-char *reposha = "v10.4.7";
+char *reposha = SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO;

aeriandi/mod_amqp/mod_amqp.c

@@ -37,6 +37,7 @@
 #include <switch.h>
 #include <amqp.h>
 #include <amqp_framing.h>
+#include <amqp_tcp_socket.h>
 #include <apr_errno.h>
 #include <sys/types.h>
 #include <strings.h>
@@ -629,13 +630,12 @@ static int log_if_error(int x, char const *context)
 {
 	if (x < 0)
 	{
-		char *errstr = amqp_error_string(-x);
+		const char *errstr = amqp_error_string2(-x);
 
 		char logMessage[MAX_LOG_MESSAGE_SIZE];
 		snprintf(logMessage, MAX_LOG_MESSAGE_SIZE, "%s: %s\n", context, errstr);
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "%s", logMessage);
 
-		free(errstr);
 		return -1;
 	}
 	else
@@ -655,7 +655,7 @@ static int log_if_amqp_error(amqp_rpc_reply_t x, char const *context)
 		break;
 
 	case AMQP_RESPONSE_LIBRARY_EXCEPTION:
-		snprintf(logMessage, MAX_LOG_MESSAGE_SIZE, "%s: %s\n", context, amqp_error_string(x.library_error));
+		snprintf(logMessage, MAX_LOG_MESSAGE_SIZE, "%s: %s\n", context, amqp_error_string2(x.library_error));
 		break;
 
 	case AMQP_RESPONSE_SERVER_EXCEPTION:
@@ -748,15 +748,23 @@ static switch_status_t openAmqpConnection()
 	do // Try..
 	{
 	    amqp_rpc_reply_t status;
-        int sockfd;
+	    int iStatus;
+        amqp_socket_t *socket = NULL;
 
 		amqp_connection_state_t conn = amqp_new_connection();
-
-        sockfd = amqp_open_socket(globals.amqpHostname, globals.amqpPort);
-        if (log_if_error(sockfd, "Opening socket"))
+        socket = amqp_tcp_socket_new(conn);
+        if (!socket)
+        {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not create TCP socket");
             break;
+        }
 
-		amqp_set_sockfd(conn, sockfd);
+        iStatus = amqp_socket_open(socket, globals.amqpHostname, globals.amqpPort);
+        if (iStatus)
+        {
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not connect to %s:%d", globals.amqpHostname, globals.amqpPort);
+            break;
+        }
 
         status = amqp_login_with_properties(conn, globals.amqpVirtualHost,
                     channel_max, frame_max, globals.amqpHeartbeatSeconds,