From da9c2c109ad9740177adfc93e5e92cba92c56134 Mon Sep 17 00:00:00 2001 From: Alan Antonuk Date: Wed, 3 Jul 2013 12:35:27 -0700 Subject: Make connection the socket object owner Improve the socket interface by making the amqp_connection_state_t object the amqp_socket_t owner, and tie its lifetime to the connection's lifetime. This prevents a class of silly errors where the socket object isn't freed, or the socket object is assigned to two different connection objects --- examples/amqp_bind.c | 3 +-- examples/amqp_consumer.c | 3 +-- examples/amqp_exchange_declare.c | 3 +-- examples/amqp_listen.c | 3 +-- examples/amqp_listenq.c | 3 +-- examples/amqp_producer.c | 3 +-- examples/amqp_rpc_sendstring_client.c | 3 +-- examples/amqp_sendstring.c | 3 +-- examples/amqp_unbind.c | 3 +-- examples/amqps_bind.c | 3 +-- examples/amqps_consumer.c | 3 +-- examples/amqps_exchange_declare.c | 3 +-- examples/amqps_listen.c | 3 +-- examples/amqps_listenq.c | 3 +-- examples/amqps_producer.c | 3 +-- examples/amqps_sendstring.c | 3 +-- examples/amqps_unbind.c | 3 +-- 17 files changed, 17 insertions(+), 34 deletions(-) (limited to 'examples') diff --git a/examples/amqp_bind.c b/examples/amqp_bind.c index 765e746..de1e0a5 100644 --- a/examples/amqp_bind.c +++ b/examples/amqp_bind.c @@ -68,7 +68,7 @@ int main(int argc, char const *const *argv) conn = amqp_new_connection(); - socket = amqp_tcp_socket_new(); + socket = amqp_tcp_socket_new(conn); if (!socket) { die("creating TCP socket"); } @@ -78,7 +78,6 @@ int main(int argc, char const *const *argv) 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 72bf654..21a5b48 100644 --- a/examples/amqp_consumer.c +++ b/examples/amqp_consumer.c @@ -146,7 +146,7 @@ int main(int argc, char const *const *argv) conn = amqp_new_connection(); - socket = amqp_tcp_socket_new(); + socket = amqp_tcp_socket_new(conn); if (!socket) { die("creating TCP socket"); } @@ -156,7 +156,6 @@ int main(int argc, char const *const *argv) 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 55860e5..9a20a62 100644 --- a/examples/amqp_exchange_declare.c +++ b/examples/amqp_exchange_declare.c @@ -66,7 +66,7 @@ int main(int argc, char const *const *argv) conn = amqp_new_connection(); - socket = amqp_tcp_socket_new(); + socket = amqp_tcp_socket_new(conn); if (!socket) { die("creating TCP socket"); } @@ -76,7 +76,6 @@ int main(int argc, char const *const *argv) 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 9385c17..bf5b716 100644 --- a/examples/amqp_listen.c +++ b/examples/amqp_listen.c @@ -70,7 +70,7 @@ int main(int argc, char const *const *argv) conn = amqp_new_connection(); - socket = amqp_tcp_socket_new(); + socket = amqp_tcp_socket_new(conn); if (!socket) { die("creating TCP socket"); } @@ -80,7 +80,6 @@ int main(int argc, char const *const *argv) 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 54c1189..e76cdb1 100644 --- a/examples/amqp_listenq.c +++ b/examples/amqp_listenq.c @@ -66,7 +66,7 @@ int main(int argc, char const *const *argv) conn = amqp_new_connection(); - socket = amqp_tcp_socket_new(); + socket = amqp_tcp_socket_new(conn); if (!socket) { die("creating TCP socket"); } @@ -76,7 +76,6 @@ int main(int argc, char const *const *argv) 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 efa1a20..948d8f6 100644 --- a/examples/amqp_producer.c +++ b/examples/amqp_producer.c @@ -130,7 +130,7 @@ int main(int argc, char const *const *argv) conn = amqp_new_connection(); - socket = amqp_tcp_socket_new(); + socket = amqp_tcp_socket_new(conn); if (!socket) { die("creating TCP socket"); } @@ -140,7 +140,6 @@ int main(int argc, char const *const *argv) 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_rpc_sendstring_client.c b/examples/amqp_rpc_sendstring_client.c index 6688195..84e7fdd 100644 --- a/examples/amqp_rpc_sendstring_client.c +++ b/examples/amqp_rpc_sendstring_client.c @@ -75,7 +75,7 @@ int main(int argc, char *argv[]) conn = amqp_new_connection(); - socket = amqp_tcp_socket_new(); + socket = amqp_tcp_socket_new(conn); if (!socket) { die("creating TCP socket"); } @@ -85,7 +85,6 @@ int main(int argc, char *argv[]) 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 0b64024..bc48054 100644 --- a/examples/amqp_sendstring.c +++ b/examples/amqp_sendstring.c @@ -68,7 +68,7 @@ int main(int argc, char const *const *argv) conn = amqp_new_connection(); - socket = amqp_tcp_socket_new(); + socket = amqp_tcp_socket_new(conn); if (!socket) { die("creating TCP socket"); } @@ -78,7 +78,6 @@ int main(int argc, char const *const *argv) 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 7948d0b..1ca3e83 100644 --- a/examples/amqp_unbind.c +++ b/examples/amqp_unbind.c @@ -68,7 +68,7 @@ int main(int argc, char const *const *argv) conn = amqp_new_connection(); - socket = amqp_tcp_socket_new(); + socket = amqp_tcp_socket_new(conn); if (!socket) { die("creating TCP socket"); } @@ -78,7 +78,6 @@ int main(int argc, char const *const *argv) 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/amqps_bind.c b/examples/amqps_bind.c index fbde025..35c845f 100644 --- a/examples/amqps_bind.c +++ b/examples/amqps_bind.c @@ -71,7 +71,7 @@ int main(int argc, char const *const *argv) conn = amqp_new_connection(); - socket = amqp_ssl_socket_new(); + socket = amqp_ssl_socket_new(conn); if (!socket) { die("creating SSL/TLS socket"); } @@ -95,7 +95,6 @@ int main(int argc, char const *const *argv) die("opening SSL/TLS connection"); } - 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/amqps_consumer.c b/examples/amqps_consumer.c index 137457f..fff6677 100644 --- a/examples/amqps_consumer.c +++ b/examples/amqps_consumer.c @@ -148,7 +148,7 @@ int main(int argc, char const *const *argv) conn = amqp_new_connection(); - socket = amqp_ssl_socket_new(); + socket = amqp_ssl_socket_new(conn); if (!socket) { die("creating SSL/TLS socket"); } @@ -172,7 +172,6 @@ int main(int argc, char const *const *argv) die("opening SSL/TLS connection"); } - 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/amqps_exchange_declare.c b/examples/amqps_exchange_declare.c index bae2f57..85a29aa 100644 --- a/examples/amqps_exchange_declare.c +++ b/examples/amqps_exchange_declare.c @@ -69,7 +69,7 @@ int main(int argc, char const *const *argv) conn = amqp_new_connection(); - socket = amqp_ssl_socket_new(); + socket = amqp_ssl_socket_new(conn); if (!socket) { die("creating SSL/TLS socket"); } @@ -93,7 +93,6 @@ int main(int argc, char const *const *argv) die("opening SSL/TLS connection"); } - 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/amqps_listen.c b/examples/amqps_listen.c index 0e45162..a5eb692 100644 --- a/examples/amqps_listen.c +++ b/examples/amqps_listen.c @@ -73,7 +73,7 @@ int main(int argc, char const *const *argv) conn = amqp_new_connection(); - socket = amqp_ssl_socket_new(); + socket = amqp_ssl_socket_new(conn); if (!socket) { die("creating SSL/TLS socket"); } @@ -97,7 +97,6 @@ int main(int argc, char const *const *argv) die("opening SSL/TLS connection"); } - 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/amqps_listenq.c b/examples/amqps_listenq.c index 321c6a3..0210d88 100644 --- a/examples/amqps_listenq.c +++ b/examples/amqps_listenq.c @@ -69,7 +69,7 @@ int main(int argc, char const *const *argv) conn = amqp_new_connection(); - socket = amqp_ssl_socket_new(); + socket = amqp_ssl_socket_new(conn); if (!socket) { die("creating SSL/TLS socket"); } @@ -93,7 +93,6 @@ int main(int argc, char const *const *argv) die("opening SSL/TLS connection"); } - 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/amqps_producer.c b/examples/amqps_producer.c index f8f6dc6..25f850b 100644 --- a/examples/amqps_producer.c +++ b/examples/amqps_producer.c @@ -133,7 +133,7 @@ int main(int argc, char const *const *argv) conn = amqp_new_connection(); - socket = amqp_ssl_socket_new(); + socket = amqp_ssl_socket_new(conn); if (!socket) { die("creating SSL/TLS socket"); } @@ -157,7 +157,6 @@ int main(int argc, char const *const *argv) die("opening SSL/TLS connection"); } - 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/amqps_sendstring.c b/examples/amqps_sendstring.c index 7465ef2..fe3ac67 100644 --- a/examples/amqps_sendstring.c +++ b/examples/amqps_sendstring.c @@ -71,7 +71,7 @@ int main(int argc, char const *const *argv) conn = amqp_new_connection(); - socket = amqp_ssl_socket_new(); + socket = amqp_ssl_socket_new(conn); if (!socket) { die("creating SSL/TLS socket"); } @@ -95,7 +95,6 @@ int main(int argc, char const *const *argv) die("opening SSL/TLS connection"); } - 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/amqps_unbind.c b/examples/amqps_unbind.c index bae017d..7f4737e 100644 --- a/examples/amqps_unbind.c +++ b/examples/amqps_unbind.c @@ -71,7 +71,7 @@ int main(int argc, char const *const *argv) conn = amqp_new_connection(); - socket = amqp_ssl_socket_new(); + socket = amqp_ssl_socket_new(conn); if (!socket) { die("creating SSL/TLS socket"); } @@ -95,7 +95,6 @@ int main(int argc, char const *const *argv) die("opening SSL/TLS connection"); } - 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); -- cgit v1.2.1