Convert amqp:// examples to use new socket API

Signed-off-by: Michael Steinert <mike.steinert@gmail.com>

8 files changed, 112 insertions, 40 deletions

diff --git a/examples/amqp_bind.c b/examples/amqp_bind.c
index b778d25..1bc82f9 100644
--- a/examples/amqp_bind.c
+++ b/examples/amqp_bind.c
@@ -39,6 +39,7 @@
 #include <string.h>
 
 #include <stdint.h>
+#include <amqp-tcp-socket.h>
 #include <amqp.h>
 #include <amqp_framing.h>
 
@@ -47,12 +48,11 @@
 int main(int argc, char const *const *argv)
 {
   char const *hostname;
-  int port;
+  int port, status;
   char const *exchange;
   char const *bindingkey;
   char const *queue;
-
-  int sockfd;
+  amqp_socket_t *socket = NULL;
   amqp_connection_state_t conn;
 
   if (argc < 6) {
@@ -68,8 +68,17 @@ int main(int argc, char const *const *argv)
 
   conn = amqp_new_connection();
 
-  die_on_error(sockfd = amqp_open_socket(hostname, port), "Opening socket");
-  amqp_set_sockfd(conn, sockfd);
+  socket = amqp_tcp_socket_new();
+  if (!socket) {
+    die("creating TCP socket");
+  }
+
+  status = amqp_socket_open(socket, hostname, port);
+  if (status) {
+    die("opening TCP socket");
+  }
+
+  amqp_set_socket(conn, socket);
   die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"),
                     "Logging in");
   amqp_channel_open(conn, 1);
diff --git a/examples/amqp_consumer.c b/examples/amqp_consumer.c
index 878bf29..ea97428 100644
--- a/examples/amqp_consumer.c
+++ b/examples/amqp_consumer.c
@@ -39,6 +39,7 @@
 #include <string.h>
 
 #include <stdint.h>
+#include <amqp-tcp-socket.h>
 #include <amqp.h>
 #include <amqp_framing.h>
 
@@ -125,11 +126,10 @@ static void run(amqp_connection_state_t conn)
 int main(int argc, char const *const *argv)
 {
   char const *hostname;
-  int port;
+  int port, status;
   char const *exchange;
   char const *bindingkey;
-
-  int sockfd;
+  amqp_socket_t *socket = NULL;
   amqp_connection_state_t conn;
 
   amqp_bytes_t queuename;
@@ -146,8 +146,17 @@ int main(int argc, char const *const *argv)
 
   conn = amqp_new_connection();
 
-  die_on_error(sockfd = amqp_open_socket(hostname, port), "Opening socket");
-  amqp_set_sockfd(conn, sockfd);
+  socket = amqp_tcp_socket_new();
+  if (!socket) {
+    die("creating TCP socket");
+  }
+
+  status = amqp_socket_open(socket, hostname, port);
+  if (status) {
+    die("opening TCP socket");
+  }
+
+  amqp_set_socket(conn, socket);
   die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"),
                     "Logging in");
   amqp_channel_open(conn, 1);
diff --git a/examples/amqp_exchange_declare.c b/examples/amqp_exchange_declare.c
index a12319b..091ce30 100644
--- a/examples/amqp_exchange_declare.c
+++ b/examples/amqp_exchange_declare.c
@@ -39,6 +39,7 @@
 #include <string.h>
 
 #include <stdint.h>
+#include <amqp-tcp-socket.h>
 #include <amqp.h>
 #include <amqp_framing.h>
 
@@ -47,11 +48,10 @@
 int main(int argc, char const *const *argv)
 {
   char const *hostname;
-  int port;
+  int port, status;
   char const *exchange;
   char const *exchangetype;
-
-  int sockfd;
+  amqp_socket_t *socket = NULL;
   amqp_connection_state_t conn;
 
   if (argc < 5) {
@@ -66,8 +66,17 @@ int main(int argc, char const *const *argv)
 
   conn = amqp_new_connection();
 
-  die_on_error(sockfd = amqp_open_socket(hostname, port), "Opening socket");
-  amqp_set_sockfd(conn, sockfd);
+  socket = amqp_tcp_socket_new();
+  if (!socket) {
+    die("creating TCP socket");
+  }
+
+  status = amqp_socket_open(socket, hostname, port);
+  if (status) {
+    die("opening TCP socket");
+  }
+
+  amqp_set_socket(conn, socket);
   die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"),
                     "Logging in");
   amqp_channel_open(conn, 1);
diff --git a/examples/amqp_listen.c b/examples/amqp_listen.c
index 1e8fa79..3ad9fdd 100644
--- a/examples/amqp_listen.c
+++ b/examples/amqp_listen.c
@@ -39,6 +39,7 @@
 #include <string.h>
 
 #include <stdint.h>
+#include <amqp-tcp-socket.h>
 #include <amqp.h>
 #include <amqp_framing.h>
 
@@ -49,11 +50,10 @@
 int main(int argc, char const *const *argv)
 {
   char const *hostname;
-  int port;
+  int port, status;
   char const *exchange;
   char const *bindingkey;
-
-  int sockfd;
+  amqp_socket_t *socket = NULL;
   amqp_connection_state_t conn;
 
   amqp_bytes_t queuename;
@@ -70,8 +70,17 @@ int main(int argc, char const *const *argv)
 
   conn = amqp_new_connection();
 
-  die_on_error(sockfd = amqp_open_socket(hostname, port), "Opening socket");
-  amqp_set_sockfd(conn, sockfd);
+  socket = amqp_tcp_socket_new();
+  if (!socket) {
+    die("creating TCP socket");
+  }
+
+  status = amqp_socket_open(socket, hostname, port);
+  if (status) {
+    die("opening TCP socket");
+  }
+
+  amqp_set_socket(conn, socket);
   die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"),
                     "Logging in");
   amqp_channel_open(conn, 1);
diff --git a/examples/amqp_listenq.c b/examples/amqp_listenq.c
index 8d9c3e3..08f3d2a 100644
--- a/examples/amqp_listenq.c
+++ b/examples/amqp_listenq.c
@@ -39,6 +39,7 @@
 #include <string.h>
 
 #include <stdint.h>
+#include <amqp-tcp-socket.h>
 #include <amqp.h>
 #include <amqp_framing.h>
 
@@ -49,10 +50,9 @@
 int main(int argc, char const *const *argv)
 {
   char const *hostname;
-  int port;
+  int port, status;
   char const *queuename;
-
-  int sockfd;
+  amqp_socket_t *socket = NULL;
   amqp_connection_state_t conn;
 
   if (argc < 4) {
@@ -66,8 +66,17 @@ int main(int argc, char const *const *argv)
 
   conn = amqp_new_connection();
 
-  die_on_error(sockfd = amqp_open_socket(hostname, port), "Opening socket");
-  amqp_set_sockfd(conn, sockfd);
+  socket = amqp_tcp_socket_new();
+  if (!socket) {
+    die("creating TCP socket");
+  }
+
+  status = amqp_socket_open(socket, hostname, port);
+  if (status) {
+    die("opening TCP socket");
+  }
+
+  amqp_set_socket(conn, socket);
   die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"),
                     "Logging in");
   amqp_channel_open(conn, 1);
diff --git a/examples/amqp_producer.c b/examples/amqp_producer.c
index 229756b..aa86e63 100644
--- a/examples/amqp_producer.c
+++ b/examples/amqp_producer.c
@@ -39,6 +39,7 @@
 #include <string.h>
 
 #include <stdint.h>
+#include <amqp-tcp-socket.h>
 #include <amqp.h>
 #include <amqp_framing.h>
 
@@ -111,11 +112,10 @@ static void send_batch(amqp_connection_state_t conn,
 int main(int argc, char const *const *argv)
 {
   char const *hostname;
-  int port;
+  int port, status;
   int rate_limit;
   int message_count;
-
-  int sockfd;
+  amqp_socket_t *socket = NULL;
   amqp_connection_state_t conn;
 
   if (argc < 5) {
@@ -130,8 +130,17 @@ int main(int argc, char const *const *argv)
 
   conn = amqp_new_connection();
 
-  die_on_error(sockfd = amqp_open_socket(hostname, port), "Opening socket");
-  amqp_set_sockfd(conn, sockfd);
+  socket = amqp_tcp_socket_new();
+  if (!socket) {
+    die("creating TCP socket");
+  }
+
+  status = amqp_socket_open(socket, hostname, port);
+  if (status) {
+    die("opening TCP socket");
+  }
+
+  amqp_set_socket(conn, socket);
   die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"),
                     "Logging in");
   amqp_channel_open(conn, 1);
diff --git a/examples/amqp_sendstring.c b/examples/amqp_sendstring.c
index 424bd68..0e624f9 100644
--- a/examples/amqp_sendstring.c
+++ b/examples/amqp_sendstring.c
@@ -39,6 +39,7 @@
 #include <string.h>
 
 #include <stdint.h>
+#include <amqp-tcp-socket.h>
 #include <amqp.h>
 #include <amqp_framing.h>
 
@@ -47,12 +48,11 @@
 int main(int argc, char const *const *argv)
 {
   char const *hostname;
-  int port;
+  int port, status;
   char const *exchange;
   char const *routingkey;
   char const *messagebody;
-
-  int sockfd;
+  amqp_socket_t *socket = NULL;
   amqp_connection_state_t conn;
 
   if (argc < 6) {
@@ -68,8 +68,17 @@ int main(int argc, char const *const *argv)
 
   conn = amqp_new_connection();
 
-  die_on_error(sockfd = amqp_open_socket(hostname, port), "Opening socket");
-  amqp_set_sockfd(conn, sockfd);
+  socket = amqp_tcp_socket_new();
+  if (!socket) {
+    die("creating TCP socket");
+  }
+
+  status = amqp_socket_open(socket, hostname, port);
+  if (status) {
+    die("opening TCP socket");
+  }
+
+  amqp_set_socket(conn, socket);
   die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"),
                     "Logging in");
   amqp_channel_open(conn, 1);
diff --git a/examples/amqp_unbind.c b/examples/amqp_unbind.c
index 77ac724..cc42d1a 100644
--- a/examples/amqp_unbind.c
+++ b/examples/amqp_unbind.c
@@ -39,6 +39,7 @@
 #include <string.h>
 
 #include <stdint.h>
+#include <amqp-tcp-socket.h>
 #include <amqp.h>
 #include <amqp_framing.h>
 
@@ -47,12 +48,11 @@
 int main(int argc, char const *const *argv)
 {
   char const *hostname;
-  int port;
+  int port, status;
   char const *exchange;
   char const *bindingkey;
   char const *queue;
-
-  int sockfd;
+  amqp_socket_t *socket = NULL;
   amqp_connection_state_t conn;
 
   if (argc < 6) {
@@ -68,8 +68,17 @@ int main(int argc, char const *const *argv)
 
   conn = amqp_new_connection();
 
-  die_on_error(sockfd = amqp_open_socket(hostname, port), "Opening socket");
-  amqp_set_sockfd(conn, sockfd);
+  socket = amqp_tcp_socket_new();
+  if (!socket) {
+    die("creating TCP socket");
+  }
+
+  status = amqp_socket_open(socket, hostname, port);
+  if (status) {
+    die("opening TCP socket");
+  }
+
+  amqp_set_socket(conn, socket);
   die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"),
                     "Logging in");
   amqp_channel_open(conn, 1);