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.18 and 1.1.2.20

version 1.1.2.18, 2011/12/14 12:45:30	version 1.1.2.20, 2011/12/14 15:09:31
Line 9 initSession(int sock, ait_val_t * __restrict v)	Line 9 initSession(int sock, ait_val_t * __restrict v)
struct tagSession *sess = NULL;	struct tagSession *sess = NULL;
const char *str;	const char *str;

FTRACE(5);	ioTRACE(5);

if (!v)	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));	ioDEBUG(3, "Error:: in malloc #%d - %s", errno, strerror(errno));
io_freeVar(v);	io_freeVar(v);
return NULL;	return NULL;
} else	} else
Line 30 initSession(int sock, ait_val_t * __restrict v)	Line 30 initSession(int sock, ait_val_t * __restrict v)

sess->sess_buf = mqtt_msgAlloc(0);	sess->sess_buf = mqtt_msgAlloc(0);
if (!sess->sess_buf) {	if (!sess->sess_buf) {
VERB(3) syslog(LOG_ERR, "Error:: in msgAlloc #%d - %s", mqtt_GetErrno(), mqtt_GetError());	ioDEBUG(3, "Error:: in msgAlloc #%d - %s", mqtt_GetErrno(), mqtt_GetError());
free(sess);	free(sess);
io_freeVar(v);	io_freeVar(v);
return NULL;	return NULL;
}	}

sess->sess_sock = sock;	sess->sess_sock = sock;
strlcpy(sess->sess_addr, 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);
return sess;	return sess;
}	}
Line 48 finiSession(struct tagSession *sess)	Line 48 finiSession(struct tagSession *sess)
register int i;	register int i;
struct tagStore *store;	struct tagStore *store;

FTRACE(5);	ioTRACE(5);

if (!sess)	if (!sess)
return;	return;
Line 82 thrSession(struct tagSession *sess)	Line 82 thrSession(struct tagSession *sess)
pthread_mutex_lock(&mtx_sess);	pthread_mutex_lock(&mtx_sess);
TAILQ_REMOVE(&Sessions, sess, sess_node);	TAILQ_REMOVE(&Sessions, sess, sess_node);
pthread_mutex_unlock(&mtx_sess);	pthread_mutex_unlock(&mtx_sess);
VERB(1) syslog(LOG_DEBUG, "Close socket=%d", sess->sess_sock);	ioDEBUG(1, "Close socket=%d", sess->sess_sock);
finiSession(sess);	finiSession(sess);
}	}

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

FTRACE(2);	ioTRACE(2);

pthread_cleanup_pop(42);	pthread_cleanup_pop(42);
pthread_exit(NULL);	pthread_exit(NULL);
Line 105 startSession(sched_task_t *task)	Line 105 startSession(sched_task_t *task)
int ret;	int ret;
pthread_attr_t attr;	pthread_attr_t attr;

FTRACE(4);	ioTRACE(4);

sess = initSession(TASK_FD(task), TASK_ARG(task));	sess = initSession(TASK_FD(task), TASK_ARG(task));
if (!sess) {	if (!sess) {
Line 116 startSession(sched_task_t *task)	Line 116 startSession(sched_task_t *task)

/* receive & decode packet */	/* 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));	ioDEBUG(3, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
finiSession(sess);	finiSession(sess);
return NULL;	return NULL;
}	}
Line 126 startSession(sched_task_t *task)	Line 126 startSession(sched_task_t *task)
ret = cack.retcode;	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());	ioDEBUG(3, "Error:: in MQTT protocol #%d - %s", mqtt_GetErrno(), mqtt_GetError());
goto end;	goto end;
} else {	} else {
sess->sess_clean = flg.clean_sess;	sess->sess_clean = flg.clean_sess;
Line 137 startSession(sched_task_t *task)	Line 137 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) {	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",	ioDEBUG(0, "Login:: DENIED for username %s and password %s",
sess->sess_user, sess->sess_pass);	sess->sess_user, sess->sess_pass);
goto end;	goto end;
} else	} else
VERB(1) syslog(LOG_WARNING, "Login:: ALLOWED for username %s ...", sess->sess_user);	ioDEBUG(0, "Login:: ALLOWED for username %s ...", sess->sess_user);

ret = mqtt_msgCONNACK(&msg, ret);	ret = mqtt_msgCONNACK(&msg, ret);
if ((ret = send(sess->sess_sock, msg.msg_base, ret, 0)) == -1) {	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));	ioDEBUG(3, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
finiSession(sess);	finiSession(sess);
return NULL;	return NULL;
} else {	} else {
VERB(5) ioLOGGER(LOG_DEBUG, "Sended %d bytes", ret);	ioDEBUG(5, "Sended %d bytes", ret);
mqtt_msgFree((mqtt_msg_t**) &msg, 0);	free(msg.msg_base);
	msg.msg_len = 0;
}	}

/* Start session thread OK ... */	/* Start session thread OK ... */
Line 162 startSession(sched_task_t *task)	Line 163 startSession(sched_task_t *task)
pthread_create(&sess->sess_tid, &attr, (void()(void*)) thrSession, sess);	pthread_create(&sess->sess_tid, &attr, (void()(void*)) thrSession, sess);
pthread_mutex_unlock(&mtx_sess);	pthread_mutex_unlock(&mtx_sess);

VERB(1) ioLOGGER(LOG_DEBUG, "ConnID=%s(%s) for %s login OK!",	ioDEBUG(1, "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);	pthread_attr_destroy(&attr);
return NULL;	return NULL;
end: /* close client connection */	end: /* close client connection */
ret = mqtt_msgCONNACK(&msg, ret);	ret = mqtt_msgCONNACK(&msg, ret);
if ((ret = send(sess->sess_sock, msg.msg_base, ret, 0)) == -1) {	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));	ioDEBUG(3, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
} else {	} else {
VERB(5) ioLOGGER(LOG_DEBUG, "Sended %d bytes", ret);	ioDEBUG(5, "Sended %d bytes", ret);
mqtt_msgFree((mqtt_msg_t**) &msg, 0);	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);	ioDEBUG(1, "Close client %s with socket=%d", sess->sess_addr, sess->sess_sock);
finiSession(sess);	finiSession(sess);
return NULL;	return NULL;
}	}
Line 186 end: /* close client connection */	Line 187 end: /* close client connection */
static void *	static void *
thrSched(void *arg __unused)	thrSched(void *arg __unused)
{	{
FTRACE(1);
struct tagSession *sess;	struct tagSession *sess;

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

	schedRun(root, &Kill);
	printf("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n");

TAILQ_FOREACH(sess, &Sessions, sess_node)	TAILQ_FOREACH(sess, &Sessions, sess_node)
if (sess->sess_tid)	if (sess->sess_tid)
pthread_cancel(sess->sess_tid);	pthread_cancel(sess->sess_tid);
Line 206 Run(int sock)	Line 209 Run(int sock)
pthread_t tid;	pthread_t tid;
ait_val_t *v;	ait_val_t *v;

FTRACE(1);	ioTRACE(1);

if (pthread_create(&tid, NULL, thrSched, NULL)) {	if (pthread_create(&tid, NULL, thrSched, NULL)) {
syslog(LOG_ERR, "Error:: thread scheduler #%d - %s", errno, strerror(errno));	ioLOGERR(0);
return -1;	return -1;
} else	} else
pthread_detach(tid);	pthread_detach(tid);
VERB(2) ioLOGGER(LOG_DEBUG, "Run scheduler management thread");	ioDEBUG(2, "Run scheduler management thread");

if (listen(sock, SOMAXCONN) == -1) {	if (listen(sock, 5 /SOMAXCONN/) == -1) {
syslog(LOG_ERR, "Error:: listen(%d) #%d - %s\n", sock, errno, strerror(errno));	ioLOGERR(0);
pthread_cancel(tid);
return -1;	return -1;
}	}

while (!Kill) {	while (!Kill) {
	printf("%%%%%%%%%%rrrrrrrrrrrrrrrrrrrrr errno=%d\n", errno);
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));	printf("rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr errno=%d\n", errno);
continue;	if (!Kill)
	continue;
	ioLOGERR(0);
	break;
}	}
v = io_allocVar();	v = io_allocVar();
if (!v) {	if (!v) {
Line 232 Run(int sock)	Line 238 Run(int sock)
break;	break;
} else	} else
io_n2addr(&sa, v);	io_n2addr(&sa, v);
VERB(1) ioLOGGER(LOG_DEBUG, "Connected client with socket=%d from %s:%d", cli,	ioDEBUG(1, "Connected client with socket=%d from %s:%d", cli,
AIT_GET_STR(v), io_n2port(&sa));	AIT_GET_STR(v), io_n2port(&sa));

	/*
if (!schedRead(root, startSession, v, cli)) {	if (!schedRead(root, startSession, v, cli)) {
io_freeVar(v);	io_freeVar(v);
close(cli);	close(cli);
VERB(1) ioLOGGER(LOG_DEBUG, "Terminated client with socket=%d", cli);	ioDEBUG(1, "Terminated client with socket=%d", cli);
}	}
	*/
}	}
	printf("rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr\n");

return 0;	return 0;
}	}

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

Removed from v.1.1.2.18
changed lines
	Added in v.1.1.2.20