mqtt/src/accmqtt.c - diff

Return to accmqtt.c CVS log

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

Diff for /mqtt/src/accmqtt.c between versions 1.2.2.1 and 1.4

version 1.2.2.1, 2012/04/11 15:08:27	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"


Line 20 mqtt_rtlm_log(const char *fmt, ...)	Line 65 mqtt_rtlm_log(const char *fmt, ...)
vsyslog(LOG_ERR, fmt, lst);	vsyslog(LOG_ERR, fmt, lst);
va_end(lst);	va_end(lst);
}	}
#define MQTT_RTLM_LOG(_sql) (assert((_sql)), mqtt_rtlm_log("Error:: SQL #%d - %s", \	#define MQTT_RTLM_LOG(_sql) (assert((_sql)), mqtt_rtlm_log("Error:: %s(%d) SQL #%d - %s", \
	__func__, __LINE__, \
sqlite3_errcode((_sql)), sqlite3_errmsg((_sql))))	sqlite3_errcode((_sql)), sqlite3_errmsg((_sql))))

	/* library pre-loaded actions */
	void
	_init()
	{
	sqlite3_initialize();
	}

	void
	_fini()
	{
	sqlite3_shutdown();
	}


/*	/*
* mqtt_rtlm_open() Open database connection	* mqtt_rtlm_open() Open database connection
*	*
Line 39 mqtt_rtlm_open(cfg_root_t *cfg)	Line 98 mqtt_rtlm_open(cfg_root_t *cfg)
if (!cfg)	if (!cfg)
return NULL;	return NULL;

if (!sqlite3_threadsafe() \|\| sqlite3_config(SQLITE_CONFIG_SERIALIZED))
return NULL;

str = (const char*) cfg_getAttribute(cfg, "mqtt_acc", "name");	str = (const char*) cfg_getAttribute(cfg, "mqtt_acc", "name");
if (!str) {	if (!str) {
mqtt_rtlm_log("Error:: Unknown database name ...\n");	mqtt_rtlm_log("Error:: Unknown database name ...\n");
Line 59 mqtt_rtlm_open(cfg_root_t *cfg)	Line 115 mqtt_rtlm_open(cfg_root_t *cfg)
sqlite3_close(sql);	sqlite3_close(sql);
return NULL;	return NULL;
}	}

return sql;	return sql;
}	}

Line 89 mqtt_rtlm_login(cfg_root_t cfg, sqlite3 sql, const c	Line 146 mqtt_rtlm_login(cfg_root_t cfg, sqlite3 sql, const c
/* insert into Users values (NULL, "", "", 1, strftime('%s','now')); */	/* insert into Users values (NULL, "", "", 1, strftime('%s','now')); */
int ret = 0;	int ret = 0;
sqlite3_stmt *stmt;	sqlite3_stmt *stmt;
char *str, szStmt[BUFSIZ] = { 0 };	char str, psStmt;

if (!sql)	if (!sql)
return -1;	return -1;
Line 99 mqtt_rtlm_login(cfg_root_t cfg, sqlite3 sql, const c	Line 156 mqtt_rtlm_login(cfg_root_t cfg, sqlite3 sql, const c
mqtt_rtlm_log("Error:: not found users table name");	mqtt_rtlm_log("Error:: not found users table name");
return -1;	return -1;
}	}
snprintf(szStmt, sizeof szStmt, "SELECT DISTINCT Username, Password, Access FROM %s "	psStmt = sqlite3_mprintf("SELECT DISTINCT Username, Password, Access FROM %s "
"WHERE Username = '%s' AND Password = '%s' AND Access > 0;", str, user, pass);	"WHERE Username = '%q' AND Password = '%q' AND Access > 0;", str, user, pass);

if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {	if (sqlite3_prepare_v2(sql, psStmt, strlen(psStmt), &stmt, NULL)) {
MQTT_RTLM_LOG(sql);	MQTT_RTLM_LOG(sql);
	sqlite3_free(psStmt);
return -1;	return -1;
}	} else
	sqlite3_free(psStmt);
while (sqlite3_step(stmt) == SQLITE_ROW) {	while (sqlite3_step(stmt) == SQLITE_ROW) {
if (sqlite3_data_count(stmt) < 1)	if (sqlite3_data_count(stmt) < 1)
ret = 0;	ret = 0;

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

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