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.1.2.5 and 1.2.2.4

version 1.1.2.5, 2011/11/28 22:28:08	version 1.2.2.4, 2012/05/05 14:51:01
Line 20 mqtt_rtlm_log(const char *fmt, ...)	Line 20 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))))


Line 31 mqtt_rtlm_log(const char *fmt, ...)	Line 32 mqtt_rtlm_log(const char *fmt, ...)
* return: NULL error or SQL handle	* return: NULL error or SQL handle
*/	*/
sqlite3 *	sqlite3 *
mqtt_rtlm_open(sl_config *cfg)	mqtt_rtlm_open(cfg_root_t *cfg)
{	{
sqlite3 *sql = NULL;	sqlite3 *sql = NULL;
const char *str = NULL;	const char *str = NULL;
Line 39 mqtt_rtlm_open(sl_config *cfg)	Line 40 mqtt_rtlm_open(sl_config *cfg)
if (!cfg)	if (!cfg)
return NULL;	return NULL;

sqlite3_config(SQLITE_CONFIG_SERIALIZED);	str = (const char*) cfg_getAttribute(cfg, "mqtt_acc", "name");

str = (const char*) cfg_GetAttribute(cfg, CFG("mqtt_acc"), CFG("name"));
if (!str) {	if (!str) {
mqtt_rtlm_log("Error:: Unknown database name ...\n");	mqtt_rtlm_log("Error:: Unknown database name ...\n");
return NULL;	return NULL;
Line 58 mqtt_rtlm_open(sl_config *cfg)	Line 57 mqtt_rtlm_open(sl_config *cfg)
sqlite3_close(sql);	sqlite3_close(sql);
return NULL;	return NULL;
}	}

return sql;	return sql;
}	}

Line 80 mqtt_rtlm_close(sqlite3 *sql)	Line 80 mqtt_rtlm_close(sqlite3 *sql)
* @sql = SQL handle	* @sql = SQL handle
* @user = username	* @user = username
* @pass = password	* @pass = password
* @... = arguments list
* return: -1 error, 0 ALLOW and 1 REJECT	* return: -1 error, 0 ALLOW and 1 REJECT
*/	*/
int	int
mqtt_rtlm_login(sl_config cfg, sqlite3 sql, const char user, const char pass, ...)	mqtt_rtlm_login(cfg_root_t cfg, sqlite3 sql, const char user, const char pass)
{	{
/* insert into Users values (NULL, "", "", 1, strftime('%s','now')); */	/* insert into Users values (NULL, "", "", 1, strftime('%s','now')); */
int ret = 0;	int ret = 0;
Line 94 mqtt_rtlm_login(sl_config cfg, sqlite3 sql, const ch	Line 93 mqtt_rtlm_login(sl_config cfg, sqlite3 sql, const ch
if (!sql)	if (!sql)
return -1;	return -1;

str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_acc"), CFG("tbl_users"));	str = (char*) cfg_getAttribute(cfg, "mqtt_acc", "tbl_users");
if (!str) {	if (!str) {
mqtt_rtlm_log("Error:: not found users table name");	mqtt_rtlm_log("Error:: not found users table name");
return -1;	return -1;

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

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