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.31 and 1.2.2.36

version 1.2.2.31, 2012/05/14 13:04:14	version 1.2.2.36, 2012/06/19 13:55:23
Line 16 initSession(int sock, ait_val_t * __restrict v)	Line 16 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;
Line 24 initSession(int sock, ait_val_t * __restrict v)	Line 24 initSession(int sock, ait_val_t * __restrict v)
memset(sess, 0, sizeof(struct tagSession));	memset(sess, 0, sizeof(struct tagSession));

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

str = cfg_getAttribute(&cfg, "mqttd", "retry");	str = cfg_getAttribute(&cfg, "mqttd", "retry");
if (!str)	if (!str)
Line 34 initSession(int sock, ait_val_t * __restrict v)	Line 35 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;
}	}

Line 43 initSession(int sock, ait_val_t * __restrict v)	Line 44 initSession(int sock, ait_val_t * __restrict v)
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 64 static void	Line 65 static void
finiSession(struct tagSession *sess)	finiSession(struct tagSession *sess)
{	{
struct tagStore *store;	struct tagStore *store;
	struct tagPkt *p;

ioTRACE(5);	ioTRACE(5);

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

	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)	if (sess->sess_will.msg)
free(sess->sess_will.msg);	free(sess->sess_will.msg);
if (sess->sess_will.topic)	if (sess->sess_will.topic)
Line 101 finiSession(struct tagSession *sess)	Line 110 finiSession(struct tagSession *sess)
mqtt_srv_Fini(&sess->sess_srv);	mqtt_srv_Fini(&sess->sess_srv);
mqtt_msgFree(&sess->sess_buf, 42);	mqtt_msgFree(&sess->sess_buf, 42);

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

static void *	static void *
Line 122 leaveClient(sched_task_t *task)	Line 131 leaveClient(sched_task_t *task)
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);

ioDEBUG(1, "Close socket=%d", TASK_FD(task));	ioDEBUG(1, "Close socket=%ld", (long) TASK_FD(task));
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);

Line 252 startSession(sched_task_t *task)	Line 261 startSession(sched_task_t *task)
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! */
schedWrite(root, leaveClient, sess, TASK_FD(task), NULL, 0);	schedCancelby(root, taskMAX, CRITERIA_FD, (void*) s->sess_sock, NULL);
	schedWrite(root, leaveClient, s, s->sess_sock, NULL, 0);
break;	break;
}	}
}	}
Line 289 startSession(sched_task_t *task)	Line 299 startSession(sched_task_t *task)
end: /* close client connection */	end: /* close client connection */
wlen = mqtt_msgCONNACK(sess->sess_buf, ret);	wlen = mqtt_msgCONNACK(sess->sess_buf, ret);
if ((wlen = send(TASK_FD(task), sess->sess_buf->msg_base, wlen, 0)) == -1) {	if ((wlen = send(TASK_FD(task), sess->sess_buf->msg_base, wlen, 0)) == -1) {
ioDEBUG(3, "Error:: send(%d) #%d - %s", TASK_FD(task), errno, strerror(errno));	ioDEBUG(3, "Error:: send(%ld) #%d - %s", (long) TASK_FD(task), errno, strerror(errno));
} else	} else
ioDEBUG(5, "Sended %d bytes", wlen);	ioDEBUG(5, "Sended %d bytes", wlen);

if (ret != MQTT_RETCODE_ACCEPTED) {	if (ret != MQTT_RETCODE_ACCEPTED) {
ioDEBUG(1, "Close client %s with socket=%d", sess->sess_addr, TASK_FD(task));	ioDEBUG(1, "Close client %s with socket=%ld", sess->sess_addr, (long) TASK_FD(task));
finiSession(sess);	finiSession(sess);
}	}
return NULL;	return NULL;
Line 347 end:	Line 357 end:
int	int
Run(int sock)	Run(int sock)
{	{
struct tagPub *pub;
struct tagSession *sess;	struct tagSession *sess;
struct timespec pl = { 0, 100000000 };	struct timespec pl = { 0, 100000000 };

Line 369 Run(int sock)	Line 378 Run(int sock)
schedRun(root, &Kill);	schedRun(root, &Kill);

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

AIT_FREE_VAL(&pub->pub_name);
if (pub->pub_packet.msg_base)
free(pub->pub_packet.msg_base);
}
TAILQ_FOREACH(sess, &Sessions, sess_node) {	TAILQ_FOREACH(sess, &Sessions, sess_node) {
TAILQ_REMOVE(&Sessions, sess, sess_node);	TAILQ_REMOVE(&Sessions, sess, sess_node);

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

Removed from v.1.2.2.31
changed lines
	Added in v.1.2.2.36