mqtt/src/daemon.c - diff

Return to daemon.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / mqtt / src

Diff for /mqtt/src/daemon.c between versions 1.2.2.18 and 1.5

version 1.2.2.18, 2012/04/26 09:15:26	version 1.5, 2013/01/18 09:43:27
Line 1	Line 1
	/*************************************************************************
	* (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
	* by Michael Pounov <misho@openbsd-bg.org>
	*
	* $Author$
	* $Id$
	*
	**************************************************************************
	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 "global.h"
#include "rtlm.h"	#include "rtlm.h"
#include "utils.h"
#include "mqttd.h"	#include "mqttd.h"
#include "mqttd_calls.h"	#include "mqttd_calls.h"
	#include "utils.h"


static void startSession(sched_task_t task);
static pthread_attr_t attr;


static inline struct tagSession *	static inline struct tagSession *
initSession(int sock, ait_val_t * __restrict v)	initSession(int sock, ait_val_t * __restrict v)
{	{
Line 20 initSession(int sock, ait_val_t * __restrict v)	Line 61 initSession(int sock, ait_val_t * __restrict v)
if (!v)	if (!v)
return NULL;	return NULL;

sess = malloc(sizeof(struct tagSession));	sess = io_malloc(sizeof(struct tagSession));
if (!sess) {	if (!sess) {
ioSYSERR(0);	ioSYSERR(0);
return NULL;	return NULL;
} else	} else
memset(sess, 0, sizeof(struct tagSession));	memset(sess, 0, sizeof(struct tagSession));

pthread_mutex_init(&sess->sess_mtx, NULL);

SLIST_INIT(&sess->sess_subscr);	SLIST_INIT(&sess->sess_subscr);

str = cfg_getAttribute(&cfg, "mqttd", "retry");	str = cfg_getAttribute(&cfg, "mqttd", "retry");
Line 40 initSession(int sock, ait_val_t * __restrict v)	Line 79 initSession(int sock, ait_val_t * __restrict v)
sess->sess_buf = mqtt_msgAlloc(USHRT_MAX);	sess->sess_buf = mqtt_msgAlloc(USHRT_MAX);
if (!sess->sess_buf) {	if (!sess->sess_buf) {
ioLIBERR(mqtt);	ioLIBERR(mqtt);
free(sess);	io_free(sess);
return NULL;	return NULL;
}	}

/* init server actor */	/* init server actor */
sess->sess_srv = mqtt_srv_Init(sock, sess->sess_buf);	sess->sess_srv = mqtt_srv_cliInit(sock, sess->sess_buf, sess->sess_ka, 1);
if (!sess->sess_srv) {	if (!sess->sess_srv) {
ioDEBUG(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError());	ioDEBUG(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError());
mqtt_msgFree(&sess->sess_buf, 42);	mqtt_msgFree(&sess->sess_buf, 42);
free(sess);	io_free(sess);
return NULL;	return NULL;
} else {	} else {
mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_CONNECT, cmdCONNECT);	mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_CONNECT, cmdCONNECT);
Line 76 finiSession(struct tagSession *sess)	Line 115 finiSession(struct tagSession *sess)
if (!sess)	if (!sess)
return;	return;

if (call.FiniSessPUB)	schedCancelby(root, taskTIMER, CRITERIA_CALL, sendRetain, NULL);
call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");

SESS_ELEM_LOCK(sess);	if (sess->sess_clean) {
	if (call.FiniSessPUB)
	call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
	if (call.DeletePUB_subscribe)
	call.DeletePUB_subscribe(&cfg, pub, sess->sess_cid, "%", sess->sess_user, "%");
	if (call.WipePUB_topic) /* only dynamic messages */
	call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, 0);
	}

while ((store = SLIST_FIRST(&sess->sess_subscr))) {	while ((store = SLIST_FIRST(&sess->sess_subscr))) {
SLIST_REMOVE_HEAD(&sess->sess_subscr, st_node);	SLIST_REMOVE_HEAD(&sess->sess_subscr, st_node);

Line 88 finiSession(struct tagSession *sess)	Line 134 finiSession(struct tagSession *sess)
if (store->st_subscr.sub_value.msg_base)	if (store->st_subscr.sub_value.msg_base)
free(store->st_subscr.sub_value.msg_base);	free(store->st_subscr.sub_value.msg_base);

free(store);	io_free(store);
}	}
SESS_ELEM_UNLOCK(sess);
pthread_mutex_destroy(&sess->sess_mtx);

if (sess->sess_will.msg)	if (sess->sess_will.flag)
free(sess->sess_will.msg);	pubWill(sess);

if (sess->sess_will.topic)	if (sess->sess_will.topic)
free(sess->sess_will.topic);	free(sess->sess_will.topic);
	if (sess->sess_will.msg)
	free(sess->sess_will.msg);

if (sess->sess_sock > STDERR_FILENO)	if (sess->sess_sock > STDERR_FILENO)
srv_Close(sess->sess_sock);	srv_Close(sess->sess_sock);

mqtt_srv_Fini(&sess->sess_srv);	mqtt_srv_cliFini(&sess->sess_srv);
mqtt_msgFree(&sess->sess_buf, 42);	mqtt_msgFree(&sess->sess_buf, 42);

free(sess);	io_free(sess);
}	}

static void	static void *
stopSession(struct tagSession *sess)	leaveClient(sched_task_t *task)
{	{
mqtt_msg_t msg = { NULL, 0 };	struct tagSession *sess;
int ret;	int ret;

ioTRACE(4);	ioTRACE(4);

	assert(task);

	sess = TASK_ARG(task);
assert(sess);	assert(sess);

SESS_LOCK;
TAILQ_REMOVE(&Sessions, sess, sess_node);	TAILQ_REMOVE(&Sessions, sess, sess_node);
SESS_UNLOCK;

ret = mqtt_msgDISCONNECT(&msg);	ret = mqtt_msgDISCONNECT(sess->sess_buf);
send(sess->sess_sock, msg.msg_base, ret, MSG_NOSIGNAL);	send(TASK_FD(task), sess->sess_buf->msg_base, ret, MSG_NOSIGNAL);
free(msg.msg_base);

ioDEBUG(1, "Close socket=%d", sess->sess_sock);	ioDEBUG(1, "Close socket=%ld", (long) TASK_FD(task));
finiSession(sess);

call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid,	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid,
sess->sess_addr, sess->sess_user);	sess->sess_addr, sess->sess_user);

	finiSession(sess);
	return NULL;
}	}

static void *	static void *
thrSession(struct tagSession *sess)	dispatchSession(sched_task_t *task)
{	{
int ret, locKill = 42;	int ret, len = 0;
struct pollfd pfd;	struct tagSession *sess;
struct mqtthdr *hdr;

pthread_cleanup_push((void()(void)) stopSession, sess);
ioTRACE(2);	ioTRACE(2);

pfd.fd = sess->sess_sock;	assert(task);
pfd.events = POLLIN \| POLLPRI;
while (!Kill && locKill) {
if ((ret = poll(&pfd, 1, sess->sess_ka * 1000)) == -1 \|\|
pfd.revents & (POLLERR \| POLLHUP \| POLLNVAL)) {
ioDEBUG(3, "Error:: poll(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
break;
} else if (!ret && (ret = mqtt_KeepAlive(sess->sess_sock, sess->sess_ka, 1))) {
call.LOG(logg, "Session %s keep-alive missing from %s for user %s ...\n",
sess->sess_cid, sess->sess_addr, sess->sess_user);
break;
}
/* receive & decode packet */
if ((ret = recv(sess->sess_sock, sess->sess_buf->msg_base, sess->sess_buf->msg_len, 0)) == -1) {
ioDEBUG(3, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
break;
} else if (!ret) {
ioDEBUG(4, "Session %s EOF received.", sess->sess_cid);
break;
} else
hdr = (struct mqtthdr*) sess->sess_buf->msg_base;

	sess = TASK_ARG(task);
	assert(sess);

	/* receive & decode packet */
	if ((ret = recv(TASK_FD(task), sess->sess_buf->msg_base, sess->sess_buf->msg_len, 0)) == -1) {
	ioDEBUG(3, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
	TAILQ_REMOVE(&Sessions, sess, sess_node);
	finiSession(sess);
	return NULL;
	} else if (!ret) {
	ioDEBUG(4, "Session %s EOF received.", sess->sess_cid);
	TAILQ_REMOVE(&Sessions, sess, sess_node);
	finiSession(sess);
	return NULL;
	}

	do {
/* dispatch message type */	/* dispatch message type */
if (mqtt_srv_Dispatch(sess->sess_srv, sess))	if ((len = mqtt_srv_cliDispatch(sess->sess_srv, ret, sess)) < 0) {
ioLIBERR(mqtt);	if (len == -1) {
switch (hdr->mqtt_msg.type) {	ioLIBERR(mqtt);
case MQTT_TYPE_CONNECT:
schedEvent(root, startSession, NULL, (u_long) sess->sess_sock, sess, ret);
locKill ^= locKill;
break;
case MQTT_TYPE_DISCONNECT:
finiSession(sess);	finiSession(sess);
locKill ^= locKill;	} else if (len == -2) {
continue;	TAILQ_REMOVE(&Sessions, sess, sess_node);
case MQTT_TYPE_PUBLISH:	finiSession(sess);
ioDEBUG(5, "Exec PUBLISH topic QoS=%d", hdr->mqtt_msg.qos);	} else if (len == -3)
/*	schedEvent(root, startSession, NULL, (u_long) TASK_FD(task), sess, ret);
if (cmdPUBLISH(sess))	} else
locKill ^= locKill;	ret -= len;
*/	} while (len > 0 && ret > 0);
break;
case MQTT_TYPE_PUBREL:	if (len >= 0 && !schedRead(root, dispatchSession, TASK_ARG(task), TASK_FD(task), NULL, 0)) {
break;	ioLIBERR(sched);
case MQTT_TYPE_SUBSCRIBE:	TAILQ_REMOVE(&Sessions, sess, sess_node);
break;	finiSession(sess);
case MQTT_TYPE_UNSUBSCRIBE:	}
break;	return NULL;
case MQTT_TYPE_PINGREQ:	}
ioDEBUG(5, "Exec PINGREQ session");
break;	static int
case MQTT_TYPE_PINGRESP:	loadSubscribes(struct tagSession * __restrict sess, mqtt_subscr_t * __restrict subs)
ioDEBUG(5, "Exec PINGRESP session");	{
break;	register int i;
default:	struct tagStore *store;
ioDEBUG(5, "Error:: Session %s, wrong command %d - DISCARDED",
sess->sess_cid, hdr->mqtt_msg.type);	if (!subs)
break;	return -1;

	for (i = 0; subs[i].sub_topic.msg_base; i++) {
	store = io_malloc(sizeof(struct tagStore));
	if (!store) {
	ioSYSERR(0);
	continue;
	} else {
	store->st_msgid = 0;
	mqtt_subCopy(&store->st_subscr, &subs[i]);
}	}

	/* add to cache */
	SLIST_INSERT_HEAD(&sess->sess_subscr, store, st_node);
}	}

pthread_cleanup_pop(locKill);	return 0;
pthread_exit(NULL);
return NULL;
}	}

static void *	void *
startSession(sched_task_t *task)	startSession(sched_task_t *task)
{	{
u_char basebuf[USHRT_MAX];	u_char basebuf[USHRT_MAX];
mqtt_msg_t msg = { NULL, 0 }, buf = { basebuf, sizeof basebuf };	mqtt_msg_t buf = { basebuf, sizeof basebuf };
mqtthdr_connflgs_t flg;	mqtthdr_connflgs_t flg;
mqtthdr_connack_t cack;	mqtthdr_connack_t cack;
	ait_val_t *v;
struct tagSession s, sess = NULL;	struct tagSession s, sess = NULL;
int ret;	int ret, wlen;
	mqtt_subscr_t *subs;
	struct timespec ts = { RETAIN_TIMEOUT, 0 };
	intptr_t sock;

ioTRACE(4);	ioTRACE(4);

assert(task);	assert(task);

if (!TASK_DATA(task)) {	if (!TASK_DATA(task)) {
	v = TASK_ARG(task);
/* flow from accept new clients */	/* flow from accept new clients */
sess = initSession(TASK_FD(task), TASK_ARG(task));	sess = initSession(TASK_FD(task), v);
io_freeVar(TASK_ARG(task));	io_freeVar(&v);
if (!sess) {	if (!sess) {
close(TASK_FD(task));	close(TASK_FD(task));
return NULL;	return NULL;
Line 238 startSession(sched_task_t *task)	Line 291 startSession(sched_task_t *task)
}	}
} else {	} else {
sess = TASK_DATA(task);	sess = TASK_DATA(task);
	assert(sess);

buf.msg_len = TASK_DATLEN(task) > sizeof basebuf ? sizeof basebuf : TASK_DATLEN(task);	buf.msg_len = TASK_DATLEN(task) > sizeof basebuf ? sizeof basebuf : TASK_DATLEN(task);
memcpy(buf.msg_base, sess->sess_buf->msg_base, buf.msg_len);	memcpy(buf.msg_base, sess->sess_buf->msg_base, buf.msg_len);
}	}
Line 255 startSession(sched_task_t *task)	Line 310 startSession(sched_task_t *task)
sess->sess_will.qos = flg.will_qos;	sess->sess_will.qos = flg.will_qos;
sess->sess_will.retain = flg.will_retain;	sess->sess_will.retain = flg.will_retain;
sess->sess_will.flag = flg.will_flg;	sess->sess_will.flag = flg.will_flg;

	sess->sess_srv->timeout = sess->sess_ka;
}	}

/* check online table for user */	/* check online table for user */
Line 268 startSession(sched_task_t *task)	Line 325 startSession(sched_task_t *task)
ret = MQTT_RETCODE_ACCEPTED;	ret = MQTT_RETCODE_ACCEPTED;
}	}

	/* db management */
if (call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%") > 0) {	if (call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%") > 0) {
ioDEBUG(2, "Old session %s should be disconnect!", sess->sess_cid);	ioDEBUG(2, "Old session %s should be disconnect!", sess->sess_cid);
TAILQ_FOREACH(s, &Sessions, sess_node)	TAILQ_FOREACH(s, &Sessions, sess_node)
if (!strcmp(s->sess_cid, sess->sess_cid)) {	if (!strcmp(s->sess_cid, sess->sess_cid)) {
/* found stale session & disconnect it! */	/* found stale session & disconnect it! */
stopSession(s);	sock = s->sess_sock;
	schedCancelby(root, taskMAX, CRITERIA_FD, (void*) sock, NULL);
	schedWrite(root, leaveClient, s, s->sess_sock, NULL, 0);
break;	break;
}	}
}	}

if (call.InitSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, sess->sess_addr,	if (call.InitSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, sess->sess_addr,
sess->sess_will.flag, sess->sess_will.topic, sess->sess_will.msg,	sess->sess_will.flag, sess->sess_will.topic, sess->sess_will.msg,
sess->sess_will.qos, sess->sess_will.retain) == -1) {	sess->sess_will.qos, sess->sess_will.retain) == -1) {
Line 289 startSession(sched_task_t *task)	Line 348 startSession(sched_task_t *task)
sess->sess_cid, sess->sess_addr, sess->sess_user);	sess->sess_cid, sess->sess_addr, sess->sess_user);
ret = MQTT_RETCODE_ACCEPTED;	ret = MQTT_RETCODE_ACCEPTED;
}	}
	/* clean/load session if requested */
ret = mqtt_msgCONNACK(&msg, ret);	if (sess->sess_clean) {
if ((ret = send(sess->sess_sock, msg.msg_base, ret, 0)) == -1) {	if (call.DeletePUB_subscribe)
ioDEBUG(3, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));	call.DeletePUB_subscribe(&cfg, pub, sess->sess_cid, "%", sess->sess_user, "%");
finiSession(sess);	if (call.WipePUB_topic) /* delete ALL messages */
return NULL;	call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, -1);
} else {	} else if (call.ReadPUB_subscribe) {
ioDEBUG(5, "Sended %d bytes", ret);	/* load subscribes */
free(msg.msg_base);	subs = call.ReadPUB_subscribe(&cfg, pub, sess->sess_cid, "%");
memset(&msg, 0, sizeof msg);	loadSubscribes(sess, subs);
	mqtt_subFree(&subs);
}	}

/* Start session thread OK ... */	/* timer event for retain messages */
SESS_LOCK;	if (call.ReadPUB_topic)
TAILQ_INSERT_TAIL(&Sessions, sess, sess_node);	schedTimer(root, sendRetain, sess, ts, NULL, 0);
pthread_create(&sess->sess_tid, &attr, (void()(void*)) thrSession, sess);
SESS_UNLOCK;

	/* Start session task OK ... */
	if (!schedRead(root, dispatchSession, sess, TASK_FD(task), NULL, 0)) {
	ioLIBERR(sched);
	ret = MQTT_RETCODE_DENIED;
	} else
	TAILQ_INSERT_TAIL(&Sessions, sess, sess_node);

call.LOG(logg, "Session %s started from %s for user %s (timeout=%d) OK!\n", sess->sess_cid,	call.LOG(logg, "Session %s started from %s for user %s (timeout=%d) OK!\n", sess->sess_cid,
sess->sess_addr, sess->sess_user, sess->sess_ka);	sess->sess_addr, sess->sess_user, sess->sess_ka);
return NULL;
end: /* close client connection */	end: /* close client connection */
ret = mqtt_msgCONNACK(&msg, ret);	wlen = mqtt_msgCONNACK(sess->sess_buf, ret);
if ((ret = send(sess->sess_sock, msg.msg_base, ret, 0)) == -1) {	if ((wlen = send(TASK_FD(task), sess->sess_buf->msg_base, wlen, 0)) == -1) {
ioDEBUG(3, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));	ioDEBUG(3, "Error:: send(%ld) #%d - %s", (long) TASK_FD(task), errno, strerror(errno));
} else {	} else
ioDEBUG(5, "Sended %d bytes", ret);	ioDEBUG(5, "Sended %d bytes", wlen);
free(msg.msg_base);
memset(&msg, 0, sizeof msg);
}

ioDEBUG(1, "Close client %s with socket=%d", sess->sess_addr, sess->sess_sock);	if (ret != MQTT_RETCODE_ACCEPTED) {
finiSession(sess);	ioDEBUG(1, "Close client %s with socket=%ld", sess->sess_addr, (long) TASK_FD(task));
	finiSession(sess);
	}
return NULL;	return NULL;
}	}

Line 341 acceptClient(sched_task_t *task)	Line 404 acceptClient(sched_task_t *task)
if ((cli = accept(TASK_FD(task), &sa.sa, &sslen)) == -1)	if ((cli = accept(TASK_FD(task), &sa.sa, &sslen)) == -1)
goto end;	goto end;
else	else
fcntl(TASK_FD(task), F_SETFL, fcntl(TASK_FD(task), F_GETFL, 0) \| O_NONBLOCK);	fcntl(cli, F_SETFL, fcntl(cli, F_GETFL) \| O_NONBLOCK);

v = io_allocVar();	v = io_allocVar();
if (!v) {	if (!v) {
Line 357 acceptClient(sched_task_t *task)	Line 420 acceptClient(sched_task_t *task)
ioDEBUG(1, "Connected client with socket=%d from %s", cli, AIT_GET_STR(v));	ioDEBUG(1, "Connected client with socket=%d from %s", cli, AIT_GET_STR(v));

if (!schedRead(root, startSession, v, cli, NULL, 0)) {	if (!schedRead(root, startSession, v, cli, NULL, 0)) {
io_freeVar(v);	io_freeVar(&v);
close(cli);	close(cli);
ioDEBUG(1, "Terminated client with socket=%d", cli);	ioDEBUG(1, "Terminated client with socket=%d", cli);
}	}
end:	end:
if (!schedRead(TASK_ROOT(task), acceptClient, NULL, TASK_FD(task), NULL, 0))	if (!schedRead(root, acceptClient, NULL, TASK_FD(task), NULL, 0))
ioLIBERR(sched);	ioLIBERR(sched);
return NULL;	return NULL;
}	}
Line 372 end:	Line 435 end:
int	int
Run(int sock)	Run(int sock)
{	{
struct tagPub *pub;	struct tagSession *sess;
struct timespec pl = { 0, 100000000 };	struct timespec pl = { 0, 100000000 };

ioTRACE(1);	ioTRACE(1);

if (listen(sock, SOMAXCONN) == -1) {	if (mqtt_srv_Listen(sock, 0, 1) == -1) {
ioSYSERR(0);	ioLIBERR(mqtt);
return -1;	return -1;
} else	}
fcntl(sock, F_SETFL, fcntl(sock, F_GETFL, 0) \| O_NONBLOCK);

/* state machine - accept new connections */	/* state machine - accept new connections */
if (!schedRead(root, acceptClient, NULL, sock, NULL, 0)) {	if (!schedRead(root, acceptClient, NULL, sock, NULL, 0)) {
Line 389 Run(int sock)	Line 451 Run(int sock)
return -1;	return -1;
}	}

pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);

schedPolling(root, &pl, NULL);	schedPolling(root, &pl, NULL);
schedRun(root, &Kill);	schedRun(root, &Kill);

pthread_attr_destroy(&attr);	schedCancelby(root, taskTIMER, CRITERIA_CALL, sendRetain, NULL);

/* free all undeleted elements into lists */	/* free all undeleted elements into lists */
PUBS_LOCK;	TAILQ_FOREACH(sess, &Sessions, sess_node) {
TAILQ_FOREACH(pub, &Pubs, pub_node) {	TAILQ_REMOVE(&Sessions, sess, sess_node);
TAILQ_REMOVE(&Pubs, pub, pub_node);

AIT_FREE_VAL(&pub->pub_name);	finiSession(sess);
if (pub->pub_packet.msg_base)
free(pub->pub_packet.msg_base);
}	}
PUBS_UNLOCK;
return 0;	return 0;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.2.2.18
changed lines
	Added in v.1.5