Version: 1
-Previous: a368ffa2d5af23b249033f640406903c39e7947f
+Previous: 90e3210c9f47bf6e6588a75f70d96d0fbc2a2fe5
Head: 507cc241e8b212c3cf3ed0ffb04e37095bbf8bb3
Applied:
- 1-5-librdmacm-rsocket-add-miss: eddbe8f0abc3d0f69755f0e510df2a7f21412c0b
- 2-5-librdmacm-rsocket-added-mi: 1f1a03dae14cbb25a43b1b56aa5ae689776edc11
- 3-5-librdmacm-rstream-initiali: 41d6547bede80581b384b49bb35eac4fe089d08c
- 4-5-librdmacm-rstream-added-mi: 6c56dc404c999daa16a039f59b0160ab983acc98
- 5-5-librdmacm-rping-added-chec: e57196c71ddd850e14f3e66355f02786e4914f72
- acm-port: 507cc241e8b212c3cf3ed0ffb04e37095bbf8bb3
Unapplied:
af-ib-conn: 70cdbcec6986d1fcc8146a73cf2d8b6a537e71f5
addrtype: fffb812c9cbe707f830d1e7e713feb3ae3e2e8ec
+++ /dev/null
-Bottom: 7a63e115cc4adf073292cd3edca568d9910e1a6e
-Top: 145c31a6954c193a2ed1d3716d0fb4db0b11cd14
-Author: Dotan Barak <dotanb@dev.mellanox.co.il>
-Date: 2012-10-09 12:27:48 +0000
-
-[1/5,librdmacm] rsocket: add missing va_end() after calling va_end()
-
-Not doing so, may lead to resource leak.
-
-Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>
-Reviewed-by: Yishai Hadas <yishaih@mellanox.com>
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 4c4821b..5b65b12 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -2002,7 +2002,8 @@ int rfcntl(int socket, int cmd, ... /* arg */ )
- va_start(args, cmd);
- switch (cmd) {
- case F_GETFL:
-- return (int) rs->fd_flags;
-+ ret = (int) rs->fd_flags;
-+ break;
- case F_SETFL:
- param = va_arg(args, long);
- if (param & O_NONBLOCK)
-@@ -2013,6 +2014,7 @@ int rfcntl(int socket, int cmd, ... /* arg */ )
- break;
- default:
- ret = ERR(ENOTSUP);
-+ break;
- }
- va_end(args);
- return ret;
+++ /dev/null
-Bottom: 145c31a6954c193a2ed1d3716d0fb4db0b11cd14
-Top: 0532a4014e54d2df96b1b5cbd60e1bca852de751
-Author: Dotan Barak <dotanb@dev.mellanox.co.il>
-Date: 2012-10-09 12:27:49 +0000
-
-[2/5,librdmacm] rsocket: added missing break
-
-Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>
-Reviewed-by: Yishai Hadas <yishaih@mellanox.com>
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 5b65b12..cc5effe 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1859,6 +1859,7 @@ int rsetsockopt(int socket, int level, int optname,
- default:
- break;
- }
-+ break;
- case SOL_RDMA:
- if (rs->state >= rs_opening) {
- ret = ERR(EINVAL);
+++ /dev/null
-Bottom: 0532a4014e54d2df96b1b5cbd60e1bca852de751
-Top: 999b4967a7c98b417b409f2d9018478091879091
-Author: Dotan Barak <dotanb@dev.mellanox.co.il>
-Date: 2012-10-09 12:27:50 +0000
-
-[3/5,librdmacm] rstream: initialize return value in server_connect()
-
-If use_async == 0 and rs_accept() passes (i.e. non negative value), then
-the return value from the function was uninitialized.
-
-Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>
-Reviewed-by: Yishai Hadas <yishaih@mellanox.com>
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 1d221d0..6ef60a1 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -444,7 +444,7 @@ free:
- static int server_connect(void)
- {
- struct pollfd fds;
-- int ret;
-+ int ret = 0;
-
- set_options(lrs);
- do {
+++ /dev/null
-Bottom: 999b4967a7c98b417b409f2d9018478091879091
-Top: 04e079ae9012e8656c794388e68818b5bdb4670d
-Author: Dotan Barak <dotanb@dev.mellanox.co.il>
-Date: 2012-10-09 12:27:51 +0000
-
-[4/5,librdmacm] rstream: added missing return is accept() failed
-
-Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>
-Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 6ef60a1..069b7c9 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -462,8 +462,8 @@ static int server_connect(void)
- rs = rs_accept(lrs, NULL, 0);
- } while (rs < 0 && (errno == EAGAIN || errno == EWOULDBLOCK));
- if (rs < 0) {
-- ret = rs;
- perror("raccept");
-+ return rs;
- }
-
- if (use_fork)
+++ /dev/null
-Bottom: 04e079ae9012e8656c794388e68818b5bdb4670d
-Top: ce668d8e5a4e0bb3756869ff3f3996f1bc43fb7c
-Author: Dotan Barak <dotanb@dev.mellanox.co.il>
-Date: 2012-10-09 12:27:52 +0000
-
-[5/5,librdmacm] rping: added checks to the return values functions
-
-This will make rping to exit with return value other than zero in case of an
-error.
-
-Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>
-Reviewed-by: Yishai Hadas <yishaih@mellanox.com>
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/examples/rping.c b/examples/rping.c
-index 32bd70a..1c4688c 100644
---- a/examples/rping.c
-+++ b/examples/rping.c
-@@ -881,7 +881,14 @@ static int rping_run_server(struct rping_cb *cb)
- goto err2;
- }
-
-- rping_test_server(cb);
-+ ret = rping_test_server(cb);
-+ if (ret) {
-+ fprintf(stderr, "rping server failed: %d\n", ret);
-+ goto err3;
-+ }
-+
-+ ret = 0;
-+err3:
- rdma_disconnect(cb->child_cm_id);
- pthread_join(cb->cqthread, NULL);
- rdma_destroy_id(cb->child_cm_id);
-@@ -1049,7 +1056,14 @@ static int rping_run_client(struct rping_cb *cb)
- goto err2;
- }
-
-- rping_test_client(cb);
-+ ret = rping_test_client(cb);
-+ if (ret) {
-+ fprintf(stderr, "rping client failed: %d\n", ret);
-+ goto err3;
-+ }
-+
-+ ret = 0;
-+err3:
- rdma_disconnect(cb->cm_id);
- pthread_join(cb->cqthread, NULL);
- err2:
-@@ -1189,6 +1203,7 @@ int main(int argc, char *argv[])
- cb->cm_channel = rdma_create_event_channel();
- if (!cb->cm_channel) {
- perror("rdma_create_event_channel");
-+ ret = ENOMEM;
- goto out;
- }
-
-@@ -1206,8 +1221,9 @@ int main(int argc, char *argv[])
- ret = rping_run_persistent_server(cb);
- else
- ret = rping_run_server(cb);
-- } else
-+ } else {
- ret = rping_run_client(cb);
-+ }
-
- DEBUG_LOG("destroy cm_id %p\n", cb->cm_id);
- rdma_destroy_id(cb->cm_id);
+++ /dev/null
-Bottom: ce668d8e5a4e0bb3756869ff3f3996f1bc43fb7c
-Top: 7c7253fbda963ab279336f08306bfb987ff84d79
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2012-10-08 10:33:21 -0700
-
-librdmacm: Disable ACM support if ibacm.port is not found
-
-The librdmacm will try to connect port 6125 if ibacm.port is
-not found. The problem is that some other service or application
-could be using that port and respond with garbage. Rather
-than falling back to a hard coded port number, if ibacm.port
-is not found, simply disable ACM support.
-
-This has the effect of removing support for older versions
-of ibacm, unless the port file is created manually.
-
-Patch created based on feedback from Doug Ledford and Florian
-Weimer from RedHat.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 3d8c912..c9ca5b5 100755
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -62,7 +62,7 @@ typedef struct acm_msg cma_acm_msg_t;
-
- static pthread_mutex_t acm_lock = PTHREAD_MUTEX_INITIALIZER;
- static int sock = -1;
--static short server_port = 6125;
-+static short server_port;
-
- struct ib_connect_hdr {
- uint8_t cma_version;
-@@ -76,7 +76,7 @@ struct ib_connect_hdr {
- #define cma_dst_ip6 dst_addr[0]
- };
-
--static void ucma_set_server_port(void)
-+static int ucma_set_server_port(void)
- {
- FILE *f;
-
-@@ -84,6 +84,7 @@ static void ucma_set_server_port(void)
- fscanf(f, "%hu", (unsigned short *) &server_port);
- fclose(f);
- }
-+ return server_port;
- }
-
- void ucma_ib_init(void)
-@@ -96,7 +97,9 @@ void ucma_ib_init(void)
- return;
-
- pthread_mutex_lock(&acm_lock);
-- ucma_set_server_port();
-+ if (!ucma_set_server_port())
-+ goto out;
-+
- sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (sock < 0)
- goto out;
projects / ~shefty / librdmacm.git / commitdiff