--- mqtt/src/daemon.c	2012/06/19 13:55:23	1.2.2.36
+++ mqtt/src/daemon.c	2012/06/29 08:47:28	1.2.2.40
@@ -24,7 +24,6 @@ initSession(int sock, ait_val_t * __restrict v)
 		memset(sess, 0, sizeof(struct tagSession));
 
 	SLIST_INIT(&sess->sess_subscr);
-	SLIST_INIT(&sess->sess_sndpkt);
 
 	str = cfg_getAttribute(&cfg, "mqttd", "retry");
 	if (!str)
@@ -40,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);
@@ -65,7 +64,6 @@ static void
 finiSession(struct tagSession *sess)
 {
 	struct tagStore *store;
-	struct tagPkt *p;
 
 	ioTRACE(5);
 
@@ -92,13 +90,6 @@ finiSession(struct tagSession *sess)
 		io_free(store);
 	}
 
-	while ((p = SLIST_FIRST(&sess->sess_sndpkt))) {
-		SLIST_REMOVE_HEAD(&sess->sess_sndpkt, pkt_node);
-
-		io_freeVar(&p->pkt_data);
-		io_free(p);
-	}
-
 	if (sess->sess_will.msg)
 		free(sess->sess_will.msg);
 	if (sess->sess_will.topic)
@@ -107,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);
@@ -167,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);
@@ -284,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 ... */
@@ -325,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) {
@@ -362,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)) {