--- mqtt/src/daemon.c	2012/05/27 10:04:05	1.2.2.33
+++ mqtt/src/daemon.c	2012/06/29 08:47:28	1.2.2.40
@@ -39,7 +39,7 @@ initSession(int sock, ait_val_t * __restrict v)
 	}
 
 	/* init server actor */
-	sess->sess_srv = mqtt_srv_Init(sock, sess->sess_buf, sess->sess_ka);
+	sess->sess_srv = mqtt_srv_cliInit(sock, sess->sess_buf, sess->sess_ka, 1);
 	if (!sess->sess_srv) {
 		ioDEBUG(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError());
 		mqtt_msgFree(&sess->sess_buf, 42);
@@ -98,7 +98,7 @@ finiSession(struct tagSession *sess)
 	if (sess->sess_sock > STDERR_FILENO)
 		srv_Close(sess->sess_sock);
 
-	mqtt_srv_Fini(&sess->sess_srv);
+	mqtt_srv_cliFini(&sess->sess_srv);
 	mqtt_msgFree(&sess->sess_buf, 42);
 
 	io_free(sess);
@@ -122,7 +122,7 @@ leaveClient(sched_task_t *task)
 	ret = mqtt_msgDISCONNECT(sess->sess_buf);
 	send(TASK_FD(task), sess->sess_buf->msg_base, ret, MSG_NOSIGNAL);
 
-	ioDEBUG(1, "Close socket=%d", TASK_FD(task));
+	ioDEBUG(1, "Close socket=%ld", (long) TASK_FD(task));
 	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
 			sess->sess_addr, sess->sess_user);
 
@@ -158,7 +158,7 @@ dispatchSession(sched_task_t *task)
 
 	do {
 		/* dispatch message type */
-		if ((len = mqtt_srv_Dispatch(sess->sess_srv, ret, sess)) < 0) {
+		if ((len = mqtt_srv_cliDispatch(sess->sess_srv, ret, sess)) < 0) {
 			if (len == -1) {
 				ioLIBERR(mqtt);
 				finiSession(sess);
@@ -252,7 +252,8 @@ startSession(sched_task_t *task)
 		TAILQ_FOREACH(s, &Sessions, sess_node)
 			if (!strcmp(s->sess_cid, sess->sess_cid)) {
 				/* found stale session & disconnect it! */
-				schedWrite(root, leaveClient, sess, TASK_FD(task), NULL, 0);
+				schedCancelby(root, taskMAX, CRITERIA_FD, (void*) s->sess_sock, NULL);
+				schedWrite(root, leaveClient, s, s->sess_sock, NULL, 0);
 				break;
 			}
 	}
@@ -274,7 +275,7 @@ startSession(sched_task_t *task)
 		if (call.WipePUB_topic)
 			call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, -1);
 	} else {
-		// todo: read_sql subs and prepare publish
+		// TODO: read_sql subs and prepare publish
 	}
 
 	/* Start session task OK ... */
@@ -289,12 +290,12 @@ startSession(sched_task_t *task)
 end:	/* close client connection */
 	wlen = mqtt_msgCONNACK(sess->sess_buf, ret);
 	if ((wlen = send(TASK_FD(task), sess->sess_buf->msg_base, wlen, 0)) == -1) {
-		ioDEBUG(3, "Error:: send(%d) #%d - %s", TASK_FD(task), errno, strerror(errno));
+		ioDEBUG(3, "Error:: send(%ld) #%d - %s", (long) TASK_FD(task), errno, strerror(errno));
 	} else
 		ioDEBUG(5, "Sended %d bytes", wlen);
 
 	if (ret != MQTT_RETCODE_ACCEPTED) {
-		ioDEBUG(1, "Close client %s with socket=%d", sess->sess_addr, TASK_FD(task));
+		ioDEBUG(1, "Close client %s with socket=%ld", sess->sess_addr, (long) TASK_FD(task));
 		finiSession(sess);
 	}
 	return NULL;
@@ -315,8 +316,6 @@ acceptClient(sched_task_t *task)
 
 	if ((cli = accept(TASK_FD(task), &sa.sa, &sslen)) == -1)
 		goto end;
-	else
-		fcntl(cli, F_SETFL, fcntl(cli, F_GETFL, 0) | O_NONBLOCK);
 
 	v = io_allocVar();
 	if (!v) {
@@ -352,11 +351,10 @@ Run(int sock)
 
 	ioTRACE(1);
 
-	if (listen(sock, SOMAXCONN) == -1) {
-		ioSYSERR(0);
+	if (mqtt_srv_Listen(sock, 0, 1) == -1) {
+		ioLIBERR(mqtt);
 		return -1;
-	} else
-		fcntl(sock, F_SETFL, fcntl(sock, F_GETFL, 0) | O_NONBLOCK);
+	}
 
 	/* state machine - accept new connections */
 	if (!schedRead(root, acceptClient, NULL, sock, NULL, 0)) {