--- mqtt/src/mqttd_calls.c	2012/07/02 12:52:19	1.2.2.33
+++ mqtt/src/mqttd_calls.c	2012/07/03 12:46:01	1.4
@@ -1,3 +1,48 @@
+/*************************************************************************
+* (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
+*  by Michael Pounov <misho@openbsd-bg.org>
+*
+* $Author: misho $
+* $Id: mqttd_calls.c,v 1.4 2012/07/03 12:46:01 misho Exp $
+*
+**************************************************************************
+The ELWIX and AITNET software is distributed under the following
+terms:
+
+All of the documentation and software included in the ELWIX and AITNET
+Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
+
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #include "global.h"
 #include "mqttd.h"
 #include "utils.h"
@@ -42,7 +87,7 @@ sendPacket(sched_task_t *task)
 		return NULL;
 	}
 
-	ioDEBUG(7, "Send packet length %d for socket %d\n", AIT_LEN(p), TASK_FD(task));
+	ioDEBUG(7, "Send packet length %d for socket %d\n", AIT_LEN(p), (u_int) TASK_FD(task));
 
 	for (slen = AIT_LEN(p), pos = AIT_GET_BUF(p); slen > 0; slen -= n, pos += n) {
 		n = send(TASK_FD(task), pos, slen, MSG_NOSIGNAL);
@@ -95,6 +140,43 @@ search4send(struct tagSession * __restrict sess, const
 
 /* --------------------------------------------------- */
 
+void *
+sendRetain(sched_task_t *task)
+{
+	mqtt_subscr_t *subs, *s;
+	struct tagSession *sess;
+	int siz;
+
+	ioTRACE(2);
+
+	assert(task);
+
+	sess = TASK_ARG(task);
+	assert(sess);
+
+	if (!sess->sess_buf) {
+		ioDEBUG(9, "WARNING! No allocated buffer!?!\n");
+		return NULL;
+	}
+
+	subs = call.ReadPUB_topic(&cfg, pub, "%", "%", 1);
+	if (!subs)
+		return NULL;
+
+	for (s = subs; s && s->sub_topic.msg_base; s++) {
+		siz = s->sub_value.msg_len;
+		memcpy(sess->sess_buf->msg_base, s->sub_value.msg_base, 
+				MIN(sess->sess_buf->msg_len, s->sub_value.msg_len));
+		ioDEBUG(7, "Sending retain message %d bytes, QoS %hhd topic '%s' data length %d\n", 
+				siz, s->sub_ret, (char*) s->sub_topic.msg_base, s->sub_value.msg_len);
+		if (siz > 0)
+			search4send(sess, s->sub_topic.msg_base, siz, s->sub_ret);
+	}
+
+	mqtt_subFree(&subs);
+	return NULL;
+}
+
 int
 pubWill(struct tagSession * __restrict sess)
 {
@@ -428,6 +510,8 @@ cmdCONNECT(void *srv, int len, void *arg)
 
 	ioDEBUG(5, "Exec CONNECT session");
 	TAILQ_REMOVE(&Sessions, sess, sess_node);
+
+	schedCancelby(root, taskTIMER, CRITERIA_CALL, sendRetain, NULL);
 
 	if (sess->sess_clean) {
 		if (call.FiniSessPUB)