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.1.1.1.2.7 and 1.1.1.1.2.8

version 1.1.1.1.2.7, 2011/12/01 00:10:18	version 1.1.1.1.2.8, 2011/12/01 08:15:25
Line 7	Line 7
sl_config cfg;	sl_config cfg;
sched_root_task_t *root;	sched_root_task_t *root;
extern char compiled[], compiledby[], compilehost[];	extern char compiled[], compiledby[], compilehost[];
int Verbose;	static char szCfgName[MAXPATHLEN];
	int Verbose, Kill;


static void	static void
Line 22 Usage(void)	Line 23 Usage(void)
compiledby, compilehost, compiled);	compiledby, compilehost, compiled);
}	}

	static void
	sigHand(int sig)
	{
	int stat;

	switch (sig) {
	case SIGHUP:
	UnloadConfig(&cfg);
	if (!LoadConfig(szCfgName, &cfg)) {
	VERB(1) syslog(LOG_DEBUG, "Config reload OK!");
	break;
	}

	syslog(LOG_ERR, "Error:: can't reload #%d - %s", cfg_GetErrno(), cfg_GetError());
	case SIGTERM:
	VERB(1) syslog(LOG_DEBUG, "Terminate MQTT service in progress");
	Kill++;
	break;
	case SIGCHLD:
	while (waitpid(-1, &stat, WNOHANG) > 0);
	break;
	}
	}


int	int
main(int argc, char **argv)	main(int argc, char **argv)
{	{
char ch, batch = 0, szStr[STRSIZ], szCfgName[MAXPATHLEN];	char ch, batch = 0, szStr[STRSIZ];
register int i;	register int i;
sqlite3 acc = NULL, pub = NULL;	sqlite3 acc = NULL, pub = NULL;
FILE *logg = NULL;	FILE *logg = NULL;
int sock = -1, ret = 0;	int sock = -1, ret = 0;
struct passwd *pass;	struct passwd *pass;
	struct sigaction sa;

strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);	strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);
while ((ch = getopt(argc, argv, "hvbc:")) != -1)	while ((ch = getopt(argc, argv, "hvbc:")) != -1)
Line 89 main(int argc, char **argv)	Line 115 main(int argc, char **argv)
goto end;	goto end;
}	}

VERB(2) syslog(LOG_DEBUG, "Service is ready for start engine ...");	memset(&sa, 0, sizeof sa);
	sigemptyset(&sa.sa_mask);
	sa.sa_handler = sigHand;
	sigaction(SIGHUP, &sa, NULL);
	sigaction(SIGTERM, &sa, NULL);
	sigaction(SIGCHLD, &sa, NULL);

if ((sock = srv_Socket(&cfg)) == -1) {
ret = 4;
goto end;
}

if (!batch)	if (!batch)
switch (fork()) {	switch (fork()) {
case -1:	case -1:
Line 104 main(int argc, char **argv)	Line 130 main(int argc, char **argv)
goto end;	goto end;
case 0:	case 0:
setsid();	setsid();
cfg_LoadAttribute(&cfg, CFG("mqttd"), CFG("user"), CFG(szStr),
sizeof szStr, MQTT_USER);
pass = getpwnam(szStr);
if (pass) {
setgid(pass->pw_gid);
setuid(pass->pw_uid);
VERB(1) syslog(LOG_WARNING, "Try to change group #%d and user #%d",
pass->pw_gid, pass->pw_uid);
}
ret = open("/dev/null", O_RDWR);	ret = open("/dev/null", O_RDWR);
if (ret != -1) {	if (ret != -1) {
dup2(ret, STDIN_FILENO);	dup2(ret, STDIN_FILENO);
Line 124 main(int argc, char **argv)	Line 142 main(int argc, char **argv)
break;	break;
default:	default:
VERB(2) syslog(LOG_DEBUG, "MQTT service go to shadow land ...");	VERB(2) syslog(LOG_DEBUG, "MQTT service go to shadow land ...");
	sleep(1);
ret = 0;	ret = 0;
goto end;	goto end;
}	}
else	else
VERB(1) printf("Start service in batch mode ...\n");	VERB(1) printf("Start service in batch mode ...\n");

	VERB(2) syslog(LOG_DEBUG, "Service is ready for start engine ...");

	if ((sock = srv_Socket(&cfg)) == -1) {
	ret = 4;
	goto end;
	}

	cfg_LoadAttribute(&cfg, CFG("mqttd"), CFG("user"), CFG(szStr), sizeof szStr, MQTT_USER);
	pass = getpwnam(szStr);
	if (pass) {
	setgid(pass->pw_gid);
	setuid(pass->pw_uid);
	VERB(1) syslog(LOG_WARNING, "Try to change group #%d and user #%d", pass->pw_gid, pass->pw_uid);
	}

if (!(root = schedBegin())) {	if (!(root = schedBegin())) {
printf("Error:: scheduler #%d - %s\n", sched_GetErrno(), sched_GetError());	printf("Error:: scheduler #%d - %s\n", sched_GetErrno(), sched_GetError());

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

Removed from v.1.1.1.1.2.7
changed lines
	Added in v.1.1.1.1.2.8