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.1.2.30 and 1.1.2.31

version 1.1.2.30, 2012/01/24 10:18:45	version 1.1.2.31, 2012/01/24 16:28:28
Line 217 thrSession(struct tagSession *sess)	Line 217 thrSession(struct tagSession *sess)
ioLIBERR(mqtt);	ioLIBERR(mqtt);

locKill ^= locKill;	locKill ^= locKill;

	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid,
	sess->sess_addr, sess->sess_user);
continue;	continue;
case MQTT_TYPE_DISCONNECT:	case MQTT_TYPE_DISCONNECT:
ioDEBUG(5, "Exec DISCONNECT session");	ioDEBUG(5, "Exec DISCONNECT session");
Line 226 thrSession(struct tagSession *sess)	Line 229 thrSession(struct tagSession *sess)

finiSession(sess, 0);	finiSession(sess, 0);
locKill ^= locKill;	locKill ^= locKill;

	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid,
	sess->sess_addr, sess->sess_user);
continue;	continue;
case MQTT_TYPE_PUBLISH:	case MQTT_TYPE_PUBLISH:
ioDEBUG(5, "Work in progress ...");	ioDEBUG(5, "Work in progress ...");
Line 264 startSession(sched_task_t *task)	Line 270 startSession(sched_task_t *task)

assert(task);	assert(task);

ioDEBUG(3, "task_Data=%p", TASK_DATA(task));
if (!TASK_DATA(task)) {	if (!TASK_DATA(task)) {
sess = initSession(TASK_FD(task), TASK_ARG(task));	sess = initSession(TASK_FD(task), TASK_ARG(task));
if (!sess) {	if (!sess) {
Line 282 startSession(sched_task_t *task)	Line 287 startSession(sched_task_t *task)
} else {	} else {
sess = TASK_DATA(task);	sess = TASK_DATA(task);
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);
ioDEBUG(3, "debug:: sock=%d s=%p sbuf=%p sbl=%d ret=%d\n", sess->sess_sock, sess->sess_buf, sess->sess_buf->msg_base, (int) sess->sess_buf->msg_len, (int) 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 378 static void *	Line 382 static void *
thrSched(void *arg __unused)	thrSched(void *arg __unused)
{	{
struct tagSession *sess;	struct tagSession *sess;
	struct timespec pl = { 0, 10000000 };

ioTRACE(1);	ioTRACE(1);

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

TAILQ_FOREACH(sess, &Sessions, sess_node)	TAILQ_FOREACH(sess, &Sessions, sess_node)

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

Removed from v.1.1.2.30
changed lines
	Added in v.1.1.2.31