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.24 and 1.2.2.30

version 1.2.2.24, 2012/05/05 13:39:27	version 1.2.2.30, 2012/05/08 14:36:10
Line 23 initSession(int sock, ait_val_t * __restrict v)	Line 23 initSession(int sock, ait_val_t * __restrict v)
} 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 41 initSession(int sock, ait_val_t * __restrict v)	Line 39 initSession(int sock, ait_val_t * __restrict v)
}	}

/* init server actor */	/* init server actor */
sess->sess_srv = mqtt_srv_Init(sock, sess->sess_buf);	sess->sess_srv = mqtt_srv_Init(sock, sess->sess_buf, sess->sess_ka);
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);
Line 62 initSession(int sock, ait_val_t * __restrict v)	Line 60 initSession(int sock, ait_val_t * __restrict v)
return sess;	return sess;
}	}

void	static void
finiSession(struct tagSession *sess)	finiSession(struct tagSession *sess)
{	{
struct tagStore *store;	struct tagStore *store;
Line 72 finiSession(struct tagSession *sess)	Line 70 finiSession(struct tagSession *sess)
if (!sess)	if (!sess)
return;	return;

if (call.FiniSessPUB)	if (sess->sess_clean) {
call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");	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)
	call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, -1);
	}

SESS_ELEM_LOCK(sess);
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 86 finiSession(struct tagSession *sess)	Line 89 finiSession(struct tagSession *sess)

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

if (sess->sess_will.msg)	if (sess->sess_will.msg)
free(sess->sess_will.msg);	free(sess->sess_will.msg);
Line 116 leaveClient(sched_task_t *task)	Line 117 leaveClient(sched_task_t *task)
sess = TASK_ARG(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(sess->sess_buf);	ret = mqtt_msgDISCONNECT(sess->sess_buf);
send(TASK_FD(task), sess->sess_buf->msg_base, ret, MSG_NOSIGNAL);	send(TASK_FD(task), sess->sess_buf->msg_base, ret, MSG_NOSIGNAL);
Line 147 dispatchSession(sched_task_t *task)	Line 146 dispatchSession(sched_task_t *task)
/* receive & decode packet */	/* receive & decode packet */
if ((ret = recv(TASK_FD(task), sess->sess_buf->msg_base, sess->sess_buf->msg_len, 0)) == -1) {	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));	ioDEBUG(3, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
	TAILQ_REMOVE(&Sessions, sess, sess_node);
finiSession(sess);	finiSession(sess);
return NULL;	return NULL;
} else if (!ret) {	} else if (!ret) {
ioDEBUG(4, "Session %s EOF received.", sess->sess_cid);	ioDEBUG(4, "Session %s EOF received.", sess->sess_cid);
	TAILQ_REMOVE(&Sessions, sess, sess_node);
finiSession(sess);	finiSession(sess);
return NULL;	return NULL;
}	}

do {	do {
/* dispatch message type */	/* dispatch message type */
if ((len = mqtt_srv_Dispatch(sess->sess_srv, ret, sess)) == -1) {	if ((len = mqtt_srv_Dispatch(sess->sess_srv, ret, sess)) < 0) {
ioLIBERR(mqtt);	if (len == -1) {
ret = 0;	ioLIBERR(mqtt);
	finiSession(sess);
	} else if (len == -2) {
	TAILQ_REMOVE(&Sessions, sess, sess_node);
	finiSession(sess);
	} else if (len == -3)
	schedEvent(root, startSession, NULL, (u_long) TASK_FD(task), sess, ret);
} else	} else
ret -= len;	ret -= len;
} while (len && ret > 0);	} while (len > 0 && ret > 0);

if (!schedRead(root, dispatchSession, TASK_ARG(task), TASK_FD(task), NULL, 0))	if (len >= 0 && !schedRead(root, dispatchSession, TASK_ARG(task), TASK_FD(task), NULL, 0)) {
ioLIBERR(sched);	ioLIBERR(sched);
	TAILQ_REMOVE(&Sessions, sess, sess_node);
	finiSession(sess);
	}
return NULL;	return NULL;
}	}

Line 219 startSession(sched_task_t *task)	Line 229 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 232 startSession(sched_task_t *task)	Line 244 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)
Line 241 startSession(sched_task_t *task)	Line 254 startSession(sched_task_t *task)
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 253 startSession(sched_task_t *task)	Line 265 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 */
	if (sess->sess_clean) {
	if (call.DeletePUB_subscribe)
	call.DeletePUB_subscribe(&cfg, pub, sess->sess_cid, "%", sess->sess_user, "%");
	if (call.WipePUB_topic)
	call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, -1);
	} else {
	// todo: read_sql subs and prepare publish
	}

/* Start session thread OK ... */	/* Start session task OK ... */
SESS_LOCK;	if (!schedRead(root, dispatchSession, sess, TASK_FD(task), NULL, 0)) {
TAILQ_INSERT_TAIL(&Sessions, sess, sess_node);
SESS_UNLOCK;

if (!schedRead(root, dispatchSession, sess, TASK_FD(task), NULL, 0))
ioLIBERR(sched);	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);
Line 326 int	Line 346 int
Run(int sock)	Run(int sock)
{	{
struct tagPub *pub;	struct tagPub *pub;
	struct tagSession *sess;
struct timespec pl = { 0, 100000000 };	struct timespec pl = { 0, 100000000 };

ioTRACE(1);	ioTRACE(1);
Line 346 Run(int sock)	Line 367 Run(int sock)
schedRun(root, &Kill);	schedRun(root, &Kill);

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

Line 354 Run(int sock)	Line 374 Run(int sock)
if (pub->pub_packet.msg_base)	if (pub->pub_packet.msg_base)
free(pub->pub_packet.msg_base);	free(pub->pub_packet.msg_base);
}	}
PUBS_UNLOCK;	TAILQ_FOREACH(sess, &Sessions, sess_node) {
	TAILQ_REMOVE(&Sessions, sess, sess_node);

	finiSession(sess);
	}
return 0;	return 0;
}	}

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

Removed from v.1.2.2.24
changed lines
	Added in v.1.2.2.30