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.15 and 1.1.2.19

version 1.1.2.15, 2011/12/09 14:01:37	version 1.1.2.19, 2011/12/14 13:15:35
Line 1	Line 1
#include "global.h"	#include "global.h"
	#include "rtlm.h"
#include "mqttd.h"	#include "mqttd.h"


extern char cliCmd[], *cliStr[];


static inline struct tagSession *	static inline struct tagSession *
initSession(int sock, char * __restrict addr)	initSession(int sock, ait_val_t * __restrict v)
{	{
struct tagSession *sess = NULL;	struct tagSession *sess = NULL;
const char *str;	const char *str;

FTRACE(5);	FTRACE(5);

if (!addr)	if (!v)
return NULL;	return NULL;

sess = malloc(sizeof(struct tagSession));	sess = malloc(sizeof(struct tagSession));
if (!sess) {	if (!sess) {
VERB(3) syslog(LOG_ERR, "Error:: in malloc #%d - %s", errno, strerror(errno));	VERB(3) syslog(LOG_ERR, "Error:: in malloc #%d - %s", errno, strerror(errno));
	io_freeVar(v);
return NULL;	return NULL;
} else	} else
memset(sess, 0, sizeof(struct tagSession));	memset(sess, 0, sizeof(struct tagSession));

str = 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;
else	else
Line 33 initSession(int sock, char * __restrict addr)	Line 32 initSession(int sock, char * __restrict addr)
if (!sess->sess_buf) {	if (!sess->sess_buf) {
VERB(3) syslog(LOG_ERR, "Error:: in msgAlloc #%d - %s", mqtt_GetErrno(), mqtt_GetError());	VERB(3) syslog(LOG_ERR, "Error:: in msgAlloc #%d - %s", mqtt_GetErrno(), mqtt_GetError());
free(sess);	free(sess);
	io_freeVar(v);
return NULL;	return NULL;
}	}

sess->sess_sock = sock;	sess->sess_sock = sock;
strlcpy(sess->sess_addr, addr, sizeof sess->sess_addr);	strlcpy(sess->sess_addr, (char*) AIT_GET_STR(v), sizeof sess->sess_addr);
free(addr);	io_freeVar(v);
return sess;	return sess;
}	}

Line 71 finiSession(struct tagSession *sess)	Line 71 finiSession(struct tagSession *sess)

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

if (sess->sess_tid)
pthread_cancel(sess->sess_tid);
free(sess);	free(sess);
}	}

static void *	static void *
thrSession(struct tagSession *sess)	thrSession(struct tagSession *sess)
{	{
	void thrClean(struct tagSession *sess)
	{
	pthread_mutex_lock(&mtx_sess);
	TAILQ_REMOVE(&Sessions, sess, sess_node);
	pthread_mutex_unlock(&mtx_sess);
	VERB(1) syslog(LOG_DEBUG, "Close socket=%d", sess->sess_sock);
	finiSession(sess);
	}

	pthread_cleanup_push((void()(void)) thrClean, sess);

FTRACE(2);	FTRACE(2);

TAILQ_REMOVE(&Sessions, sess, sess_node);	pthread_cleanup_pop(42);
pthread_exit(NULL);	pthread_exit(NULL);
return NULL;
}	}

static void *	static void *
startSession(sched_task_t *task)	startSession(sched_task_t *task)
{	{
u_char basebuf[USHRT_MAX];	u_char basebuf[USHRT_MAX];
mqtt_msg_t buf = { basebuf, sizeof basebuf };	mqtt_msg_t msg = { NULL, 0 }, buf = { basebuf, sizeof basebuf };
mqtthdr_connflgs_t flg;	mqtthdr_connflgs_t flg;
mqtthdr_connack_t cack;	mqtthdr_connack_t cack;
struct tagSession *sess = NULL;	struct tagSession *sess = NULL;
	int ret;
	pthread_attr_t attr;

FTRACE(4);	FTRACE(4);

sess = initSession(TASK_FD(task), TASK_ARG(task));	sess = initSession(TASK_FD(task), TASK_ARG(task));
if (!sess) {	if (!sess) {
if (TASK_ARG(task))	io_freeVar(TASK_ARG(task));
free(TASK_ARG(task));
close(TASK_FD(task));	close(TASK_FD(task));
return NULL;	return NULL;
}	}

	/* receive & decode packet */
if (recv(sess->sess_sock, buf.msg_base, buf.msg_len, 0) == -1) {	if (recv(sess->sess_sock, buf.msg_base, buf.msg_len, 0) == -1) {
VERB(3) syslog(LOG_ERR, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));	VERB(3) syslog(LOG_ERR, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
goto end;	finiSession(sess);
	return NULL;
}	}
cack = mqtt_readCONNECT(&buf, &sess->sess_ka, sess->sess_cid, sizeof sess->sess_cid,	cack = mqtt_readCONNECT(&buf, &sess->sess_ka, sess->sess_cid, sizeof sess->sess_cid,
sess->sess_user, sizeof sess->sess_user, sess->sess_pass, sizeof sess->sess_pass,	sess->sess_user, sizeof sess->sess_user, sess->sess_pass, sizeof sess->sess_pass,
&sess->sess_will.topic, &sess->sess_will.msg);	&sess->sess_will.topic, &sess->sess_will.msg);
	ret = cack.retcode;
flg.flags = cack.reserved;	flg.flags = cack.reserved;
if (flg.reserved) {	if (flg.reserved) {
VERB(3) syslog(LOG_ERR, "Error:: in MQTT protocol #%d - %s", mqtt_GetErrno(), mqtt_GetError());	VERB(3) syslog(LOG_ERR, "Error:: in MQTT protocol #%d - %s", mqtt_GetErrno(), mqtt_GetError());
Line 124 startSession(sched_task_t *task)	Line 136 startSession(sched_task_t *task)
}	}

/* check online table for user */	/* check online table for user */
	if (call.LoginACC(&cfg, acc, sess->sess_user, sess->sess_pass) < 1) {
	VERB(1) syslog(LOG_WARNING, "Login:: DENIED for username %s and password %s",
	sess->sess_user, sess->sess_pass);
	goto end;
	} else
	VERB(1) syslog(LOG_WARNING, "Login:: ALLOWED for username %s ...", sess->sess_user);

	ret = mqtt_msgCONNACK(&msg, ret);
	if ((ret = send(sess->sess_sock, msg.msg_base, ret, 0)) == -1) {
	VERB(3) syslog(LOG_ERR, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
	finiSession(sess);
	return NULL;
	} else {
	VERB(5) ioLOGGER(LOG_DEBUG, "Sended %d bytes", ret);
	free(msg.msg_base);
	msg.msg_len = 0;
	}

/* Start session thread OK ... */	/* Start session thread OK ... */
	pthread_attr_init(&attr);
	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);

	pthread_mutex_lock(&mtx_sess);
TAILQ_INSERT_TAIL(&Sessions, sess, sess_node);	TAILQ_INSERT_TAIL(&Sessions, sess, sess_node);
pthread_create(&sess->sess_tid, NULL, (void()(void*)) thrSession, sess);	pthread_create(&sess->sess_tid, &attr, (void()(void*)) thrSession, sess);
pthread_detach(sess->sess_tid);	pthread_mutex_unlock(&mtx_sess);
VERB(1) syslog(LOG_DEBUG, "ConnID=%s(%s) for %s login OK!",
	VERB(1) ioLOGGER(LOG_DEBUG, "ConnID=%s(%s) for %s login OK!",
sess->sess_cid, sess->sess_user, sess->sess_addr);	sess->sess_cid, sess->sess_user, sess->sess_addr);

	pthread_attr_destroy(&attr);
return NULL;	return NULL;
end: /* close client connection */	end: /* close client connection */
VERB(1) syslog(LOG_DEBUG, "Close client %s with socket=%d",	ret = mqtt_msgCONNACK(&msg, ret);
(char*) TASK_ARG(task), (int) TASK_FD(task));	if ((ret = send(sess->sess_sock, msg.msg_base, ret, 0)) == -1) {
	VERB(3) syslog(LOG_ERR, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
	} else {
	VERB(5) ioLOGGER(LOG_DEBUG, "Sended %d bytes", ret);
	free(msg.msg_base);
	msg.msg_len = 0;
	}

	VERB(1) ioLOGGER(LOG_DEBUG, "Close client %s with socket=%d", sess->sess_addr, sess->sess_sock);
finiSession(sess);	finiSession(sess);
return NULL;	return NULL;
}	}
Line 145 static void *	Line 189 static void *
thrSched(void *arg __unused)	thrSched(void *arg __unused)
{	{
FTRACE(1);	FTRACE(1);
	struct tagSession *sess;

schedRun(root, (intptr_t*) &Kill);	schedRun(root, (intptr_t*) &Kill);

	TAILQ_FOREACH(sess, &Sessions, sess_node)
	if (sess->sess_tid)
	pthread_cancel(sess->sess_tid);
pthread_exit(NULL);	pthread_exit(NULL);
}	}

Line 156 Run(int sock)	Line 205 Run(int sock)
io_sockaddr_t sa;	io_sockaddr_t sa;
socklen_t sslen = sizeof sa.ss;	socklen_t sslen = sizeof sa.ss;
int cli;	int cli;
char *str = NULL, szAddr[STRSIZ] = { 0 };
pthread_t tid;	pthread_t tid;
	ait_val_t *v;

FTRACE(1);	FTRACE(1);

Line 166 Run(int sock)	Line 215 Run(int sock)
return -1;	return -1;
} else	} else
pthread_detach(tid);	pthread_detach(tid);
VERB(2) syslog(LOG_DEBUG, "Run scheduler management thread");	VERB(2) ioLOGGER(LOG_DEBUG, "Run scheduler management thread");

if (listen(sock, SOMAXCONN) == -1) {	if (listen(sock, SOMAXCONN) == -1) {
syslog(LOG_ERR, "Error:: listen(%d) #%d - %s\n", sock, errno, strerror(errno));	syslog(LOG_ERR, "Error:: listen(%d) #%d - %s\n", sock, errno, strerror(errno));
Line 178 Run(int sock)	Line 227 Run(int sock)
if ((cli = accept(sock, &sa.sa, &sslen)) == -1) {	if ((cli = accept(sock, &sa.sa, &sslen)) == -1) {
syslog(LOG_ERR, "Error:: accept() #%d - %s", errno, strerror(errno));	syslog(LOG_ERR, "Error:: accept() #%d - %s", errno, strerror(errno));
continue;	continue;
	}
	v = io_allocVar();
	if (!v) {
	ioLIBERR(mqtt);
	break;
} else	} else
VERB(1) {	io_n2addr(&sa, v);
switch (sa.sa.sa_family) {	VERB(1) ioLOGGER(LOG_DEBUG, "Connected client with socket=%d from %s:%d", cli,
case AF_INET:	AIT_GET_STR(v), io_n2port(&sa));
inet_ntop(AF_INET, &sa.sin.sin_addr, szAddr, sslen);
snprintf(szAddr, sizeof szAddr, "%s:%d",
szAddr, ntohs(sa.sin.sin_port));
break;
case AF_INET6:
inet_ntop(AF_INET6, &sa.sin6.sin6_addr, szAddr, sslen);
snprintf(szAddr, sizeof szAddr, "%s:%d",
szAddr, ntohs(sa.sin6.sin6_port));
break;
case AF_LOCAL:
strlcpy(szAddr, sa.sun.sun_path, sizeof szAddr);
break;
default:
close(cli);
syslog(LOG_ERR, "Error:: unsupported address type %d",
sa.sa.sa_family);
continue;
}
str = strdup(szAddr);
syslog(LOG_DEBUG, "Connected client with socket=%d from %s", cli, str);
}

if (!schedRead(root, startSession, str, cli)) {	if (!schedRead(root, startSession, v, cli)) {
	io_freeVar(v);
close(cli);	close(cli);
VERB(1) syslog(LOG_DEBUG, "Terminated client with socket=%d", cli);	VERB(1) ioLOGGER(LOG_DEBUG, "Terminated client with socket=%d", cli);
if (str)
free(str);
}	}
}	}

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

Removed from v.1.1.2.15
changed lines
	Added in v.1.1.2.19