mqtt/src/mqttd.c - diff

Return to mqttd.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / mqtt / src

Diff for /mqtt/src/mqttd.c between versions 1.2.2.4 and 1.4

version 1.2.2.4, 2012/04/15 21:52:12	version 1.4, 2012/07/03 12:46:00
Line 1	Line 1
	/*************************************************************************
	* (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
	* by Michael Pounov <misho@openbsd-bg.org>
	*
	* $Author$
	* $Id$
	*
	**************************************************************************
	The ELWIX and AITNET software is distributed under the following
	terms:

	All of the documentation and software included in the ELWIX and AITNET
	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

	Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
	by Michael Pounov <misho@elwix.org>. All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions
	are met:
	1. Redistributions of source code must retain the above copyright
	notice, this list of conditions and the following disclaimer.
	2. Redistributions in binary form must reproduce the above copyright
	notice, this list of conditions and the following disclaimer in the
	documentation and/or other materials provided with the distribution.
	3. All advertising materials mentioning features or use of this software
	must display the following acknowledgement:
	This product includes software developed by Michael Pounov <misho@elwix.org>
	ELWIX - Embedded LightWeight unIX and its contributors.
	4. Neither the name of AITNET nor the names of its contributors
	may be used to endorse or promote products derived from this software
	without specific prior written permission.

	THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	SUCH DAMAGE.
	*/
#include "global.h"	#include "global.h"
#include "mqttd.h"	#include "mqttd.h"
#include "rtlm.h"	#include "rtlm.h"
Line 11 cfg_root_t cfg;	Line 56 cfg_root_t cfg;
sessions_t Sessions;	sessions_t Sessions;
sched_root_task_t *root;	sched_root_task_t *root;
sqlite3 acc, pub;	sqlite3 acc, pub;
pthread_mutex_t mtx_sess, mtx_pub;
FILE *logg;	FILE *logg;
extern char compiled[], compiledby[], compilehost[];	extern char compiled[], compiledby[], compilehost[];
static char szCfgName[MAXPATHLEN];	static char szCfgName[MAXPATHLEN];
intptr_t Kill;	volatile intptr_t Kill;


static void	static void
Line 44 sigHand(int sig)	Line 88 sigHand(int sig)
}	}

ioLIBERR(cfg);	ioLIBERR(cfg);
	case SIGINT:
case SIGTERM:	case SIGTERM:
ioDEBUG(1, "Terminate MQTT service in progress");	ioDEBUG(1, "Terminate MQTT service in progress");
Kill++;	Kill++;
Line 93 main(int argc, char **argv)	Line 138 main(int argc, char **argv)
printf("Error:: can't load #%d - %s\n", cfg_GetErrno(), cfg_GetError());	printf("Error:: can't load #%d - %s\n", cfg_GetErrno(), cfg_GetError());
return 1;	return 1;
}	}
pthread_mutex_init(&mtx_sess, NULL);
pthread_mutex_init(&mtx_pub, NULL);
openlog("mqttd", LOG_PID \| LOG_CONS, LOG_DAEMON);	openlog("mqttd", LOG_PID \| LOG_CONS, LOG_DAEMON);
/* load 3 plugins */	/* load 3 plugins */
for (i = 0; i < 3; i++)	for (i = 0; i < 3; i++)
if (!mqttLoadRTLM(&cfg, i)) {	if (!mqttLoadRTLM(&cfg, i)) {
printf("Error:: Can't load RTL module\n");	printf("Error:: Can't load RTL module\n");
while (i--)	mqttUnloadRTLM(acc);
mqttUnloadRTLM(i);	mqttUnloadRTLM(pub);
	mqttUnloadRTLM(logg);
cfgUnloadConfig(&cfg);	cfgUnloadConfig(&cfg);
closelog();	closelog();
pthread_mutex_destroy(&mtx_pub);
pthread_mutex_destroy(&mtx_sess);
return 2;	return 2;
}	}
acc = call.OpenACC(&cfg);	acc = call.OpenACC(&cfg);
Line 124 main(int argc, char **argv)	Line 166 main(int argc, char **argv)
goto end;	goto end;
}	}


if (mqttMkDir(&cfg)) {	if (mqttMkDir(&cfg)) {
printf("Error:: in statedir #%d - %s\n", errno, strerror(errno));	printf("Error:: in statedir #%d - %s\n", errno, strerror(errno));
ret = 3;	ret = 3;
Line 161 main(int argc, char **argv)	Line 204 main(int argc, char **argv)
sigemptyset(&sa.sa_mask);	sigemptyset(&sa.sa_mask);
sa.sa_handler = sigHand;	sa.sa_handler = sigHand;
sigaction(SIGHUP, &sa, NULL);	sigaction(SIGHUP, &sa, NULL);
	sigaction(SIGINT, &sa, NULL);
sigaction(SIGTERM, &sa, NULL);	sigaction(SIGTERM, &sa, NULL);
sigaction(SIGCHLD, &sa, NULL);	sigaction(SIGCHLD, &sa, NULL);
sigaction(SIGPIPE, &sa, NULL);	sigaction(SIGPIPE, &sa, NULL);
Line 195 end: /* free all resources */	Line 239 end: /* free all resources */
call.CloseLOG(logg);	call.CloseLOG(logg);
call.ClosePUB(pub);	call.ClosePUB(pub);
call.CloseACC(acc);	call.CloseACC(acc);
for (i = 0; i < 3; i++)	mqttUnloadRTLM(acc);
mqttUnloadRTLM(i);	mqttUnloadRTLM(pub);
closelog();	mqttUnloadRTLM(logg);
cfgUnloadConfig(&cfg);	cfgUnloadConfig(&cfg);
pthread_mutex_destroy(&mtx_pub);	closelog();
pthread_mutex_destroy(&mtx_sess);
return ret;	return ret;
}	}

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

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