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

version 1.1.2.31, 2012/01/24 16:28:28	version 1.2.2.4, 2012/01/30 13:39:22
Line 2	Line 2
#include "rtlm.h"	#include "rtlm.h"
#include "utils.h"	#include "utils.h"
#include "mqttd.h"	#include "mqttd.h"
	#include "mqttd_calls.h"


static void startSession(sched_task_t task);	static void startSession(sched_task_t task);
Line 26 initSession(int sock, ait_val_t * __restrict v)	Line 27 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);

	TAILQ_INIT(&sess->sess_sndqueue);

str = (const char*) cfg_GetAttribute(&cfg, CFG("mqttd"), CFG("retry"));	str = (const char*) cfg_GetAttribute(&cfg, CFG("mqttd"), CFG("retry"));
if (!str)	if (!str)
sess->sess_retry = DEFAULT_RETRY;	sess->sess_retry = DEFAULT_RETRY;
Line 40 initSession(int sock, ait_val_t * __restrict v)	Line 45 initSession(int sock, ait_val_t * __restrict v)
return NULL;	return NULL;
}	}

	sess->sess_srv = mqtt_srv_Init(sock, sess->sess_buf);
	if (!sess->sess_srv) {
	ioDEBUG(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError());
	mqtt_msgFree(&sess->sess_buf, 42);
	free(sess);
	io_freeVar(v);
	return NULL;
	} else {
	mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_CONNECT, cmdCONNECT);
	mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_PUBLISH, cmdPUBLISH);
	mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_PUBREL, cmdPUBREL);
	mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_SUBSCRIBE, cmdSUBSCRIBE);
	mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_UNSUBSCRIBE, cmdUNSUBSCRIBE);
	mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_PINGREQ, cmdPINGREQ);
	mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_DISCONNECT, cmdDISCONNECT);
	}

sess->sess_sock = sock;	sess->sess_sock = sock;
strlcpy(sess->sess_addr, (char*) AIT_GET_STR(v), sizeof sess->sess_addr);	strlcpy(sess->sess_addr, (char*) AIT_GET_STR(v), sizeof sess->sess_addr);
io_freeVar(v);	io_freeVar(v);
Line 59 finiSession(struct tagSession *sess, int preservSock)	Line 81 finiSession(struct tagSession *sess, int preservSock)
if (call.FiniSessPUB)	if (call.FiniSessPUB)
call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");	call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");

while ((store = SLIST_FIRST(&sess->sess_sndqueue))) {	pthread_mutex_lock(&sess->sess_mtx);
SLIST_REMOVE_HEAD(&sess->sess_sndqueue, st_node);	while ((store = TAILQ_FIRST(&sess->sess_sndqueue))) {
	TAILQ_REMOVE(&sess->sess_sndqueue, store, st_node);

	if (store->st_subscr.sub_topic.msg_base)
	free(store->st_subscr.sub_topic.msg_base);
	if (store->st_subscr.sub_value.msg_base)
	free(store->st_subscr.sub_value.msg_base);

free(store);	free(store);
}	}
	pthread_mutex_unlock(&sess->sess_mtx);
	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 72 finiSession(struct tagSession *sess, int preservSock)	Line 103 finiSession(struct tagSession *sess, int preservSock)
if (sess->sess_sock > STDERR_FILENO && !preservSock)	if (sess->sess_sock > STDERR_FILENO && !preservSock)
srv_Close(sess->sess_sock);	srv_Close(sess->sess_sock);

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

free(sess);	free(sess);
Line 156 KASession(struct tagSession *sess)	Line 188 KASession(struct tagSession *sess)
static void *	static void *
thrSession(struct tagSession *sess)	thrSession(struct tagSession *sess)
{	{
mqtt_msg_t msg = { NULL, 0 };
int ret, locKill = 42;	int ret, locKill = 42;
struct pollfd pfd;	struct pollfd pfd;
struct mqtthdr *hdr;	struct mqtthdr *hdr;
ait_val_t *v;	ait_val_t *v;
struct tagStore *store;

pthread_cleanup_push((void()(void)) stopSession, sess);	pthread_cleanup_push((void()(void)) stopSession, sess);
ioTRACE(2);	ioTRACE(2);
Line 189 thrSession(struct tagSession *sess)	Line 219 thrSession(struct tagSession *sess)
hdr = (struct mqtthdr*) sess->sess_buf->msg_base;	hdr = (struct mqtthdr*) sess->sess_buf->msg_base;

/* dispatch message type */	/* dispatch message type */
	if (mqtt_srv_Dispatch(sess->sess_srv, sess))
	ioLIBERR(mqtt);
switch (hdr->mqtt_msg.type) {	switch (hdr->mqtt_msg.type) {
case MQTT_TYPE_CONNECT:	case MQTT_TYPE_CONNECT:
ioDEBUG(5, "Exec CONNECT session");	ioDEBUG(5, "Exec CONNECT session");
pthread_mutex_lock(&mtx_sess);
TAILQ_REMOVE(&Sessions, sess, sess_node);
pthread_mutex_unlock(&mtx_sess);

if (call.FiniSessPUB)
call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");

while ((store = SLIST_FIRST(&sess->sess_sndqueue))) {
SLIST_REMOVE_HEAD(&sess->sess_sndqueue, st_node);
free(store);
}

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

if ((v = io_allocVar())) {	if ((v = io_allocVar())) {
AIT_SET_STR(v, sess->sess_addr);	AIT_SET_STR(v, sess->sess_addr);
if (!schedEvent(root, startSession, v, (u_long) sess->sess_sock, sess, ret))	if (!schedEvent(root, startSession, v, (u_long) sess->sess_sock, sess, ret))
io_freeVar(v);	io_freeVar(v);
} else	} else
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");
pthread_mutex_lock(&mtx_sess);
TAILQ_REMOVE(&Sessions, sess, sess_node);
pthread_mutex_unlock(&mtx_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, "Exec PUBLISH topic QoS=%d", hdr->mqtt_msg.qos);
	/*
	if (cmdPUBLISH(sess))
	locKill ^= locKill;
	*/
break;	break;
case MQTT_TYPE_PUBREL:	case MQTT_TYPE_PUBREL:
break;	break;
Line 243 thrSession(struct tagSession *sess)	Line 251 thrSession(struct tagSession *sess)
case MQTT_TYPE_UNSUBSCRIBE:	case MQTT_TYPE_UNSUBSCRIBE:
break;	break;
case MQTT_TYPE_PINGREQ:	case MQTT_TYPE_PINGREQ:
	ioDEBUG(5, "Exec PINGREQ session");
break;	break;
default:	default:
ioDEBUG(5, "Error:: Session %s, wrong command %d - DISCARDED",	ioDEBUG(5, "Error:: Session %s, wrong command %d - DISCARDED",

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

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