From: Peter Somogyi <psomogyi@gamax.hu>
Date: Tue, 5 Dec 2006 12:17:41 +0000 (+0100)
Subject: Testing e-mail notification...
X-Git-Tag: tevent-0.9.20~348^2~3002^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45280f749e39958ef02f622a0db9b624e40527dc;p=thirdparty%2Fsamba.git

Testing e-mail notification...

(This used to be ctdb commit f7ebe9c1d4515a6bf39f1321b252b791560ff04b)
---

diff --git a/ctdb/ib/ibwrapper.c b/ctdb/ib/ibwrapper.c
index 338afb1096d..7f5fb2ee07a 100644
--- a/ctdb/ib/ibwrapper.c
+++ b/ctdb/ib/ibwrapper.c
@@ -146,37 +146,27 @@ static void ibw_process_cm_event(struct event_context *ev,
 	case RDMA_CM_EVENT_ADDR_RESOLVED:
 		assert(pctx->state==IWINT_INIT);
 		pctx->state = IWINT_ADDR_RESOLVED;
-		ret = rdma_resolve_route(cma_id, 2000);
-		if (ret) {
+		rc = rdma_resolve_route(cma_id, 2000);
+		if (rc) {
 			cb->state = ERROR;
-			fprintf(stderr, "rdma_resolve_route error %d\n", ret);
-			sem_post(&cb->sem);
+			sprintf(ibw_lasterr, "rdma_resolve_route error %d\n", rc);
+			DEBUG(0, ibw_lasterr);
 		}
 		break;
 
 	case RDMA_CM_EVENT_ROUTE_RESOLVED:
 		assert(pctx->state==IWINT_ADDR_RESOLVED);
 		pctx->state = IWINT_ROUTE_RESOLVED;
-		sem_post(&cb->sem);
 		break;
-
+/* TODO here... */
 	case RDMA_CM_EVENT_CONNECT_REQUEST:
-		cb->state = CONNECT_REQUEST;
-		cb->child_cm_id = cma_id;
-		DEBUG_LOG("child cma %p\n", cb->child_cm_id);
-		sem_post(&cb->sem);
+		ctx->state = CONNECT_REQUEST;
+		conn->cm_id = event.cm_id;
+		DEBUG("child cma %p\n", cb->child_cm_id);
 		break;
 
 	case RDMA_CM_EVENT_ESTABLISHED:
-		DEBUG_LOG("ESTABLISHED\n");
-
-		/*
-		 * Server will wake up when first RECV completes.
-		 */
-		if (!cb->server) {
-			cb->state = CONNECTED;
-		}
-		sem_post(&cb->sem);
+		DEBUG("ESTABLISHED\n");
 		break;
 
 	case RDMA_CM_EVENT_ADDR_ERROR:
@@ -184,26 +174,20 @@ static void ibw_process_cm_event(struct event_context *ev,
 	case RDMA_CM_EVENT_CONNECT_ERROR:
 	case RDMA_CM_EVENT_UNREACHABLE:
 	case RDMA_CM_EVENT_REJECTED:
-		fprintf(stderr, "cma event %d, error %d\n", event->event,
+		DEBUG(0, "cma event %d, error %d\n", event->event,
 		       event->status);
-		sem_post(&cb->sem);
-		ret = -1;
 		break;
 
 	case RDMA_CM_EVENT_DISCONNECTED:
-		fprintf(stderr, "%s DISCONNECT EVENT...\n", cb->server ? "server" : "client");
-		sem_post(&cb->sem);
+		DEBUG(0, "%s DISCONNECT EVENT...\n", cb->server ? "server" : "client");
 		break;
 
 	case RDMA_CM_EVENT_DEVICE_REMOVAL:
-		fprintf(stderr, "cma detected device removal!!!!\n");
-		ret = -1;
+		DEBUG(0, "cma detected device removal!\n");
 		break;
 
 	default:
-		fprintf(stderr, "oof bad type!\n");
-		sem_post(&cb->sem);
-		ret = -1;
+		DEBUG(0, "oof bad type!\n");
 		break;
 	}