Skip to content

Commit

Permalink
added syslog for windowsy
Browse files Browse the repository at this point in the history
  • Loading branch information
[email protected] committed Feb 19, 2021
1 parent bd03a15 commit 08a042e
Show file tree
Hide file tree
Showing 9 changed files with 224 additions and 241 deletions.
8 changes: 5 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ if (WIN32)
# mosquitto has been replaced with Paho
# https://github.com/eclipse/paho.mqtt.c
# https://github.com/eclipse/paho.mqtt.cpp
set(MOSQUITTO_LIBRARIES, "C:\\mqtt\\paho-c\\lib\\")
set(MOSQUITTO_INCLUDE_DIR, "C:\\mqtt\\paho-c\\include\\")
set(MOSQUITTO_LIBRARIES, "windows\\mosquitto\\lib\\")
set(MOSQUITTO_INCLUDE_DIR, "windows\\mosquitto\\include\\")
set(PAHO_LIBRARIES, "C:\\mqtt\\paho-c\\lib\\")
set(PAHO_CPP_LIBRARIES, "C:\\mqtt\\paho-cpp\\lib\\")
set(PAHO_INCLUDE_DIR, "C:\\mqtt\\paho-c\\include\\")
Expand Down Expand Up @@ -270,6 +270,7 @@ add_executable(vscp-works-qt

if (WIN32)
set(LOCAL_WIN_INCLUDE "windows\\include\\")
set(LOCAL_SYSLOG_INCLUDE "windows\\syslog\\include\\")
endif()

include_directories( PUBLIC ./src ./build
Expand All @@ -286,7 +287,8 @@ include_directories( PUBLIC ./src ./build
${MOSQUITTO_INCLUDE_DIR}
${EXPAT_INCLUDE_DIRS}
${DLFCN_INCLUDES}
${LOCAL_WIN_INCLUDE} )
${LOCAL_WIN_INCLUDE}
${LOCAL_SYSLOG_INCLUDE} )

target_link_libraries(vscp-works-qt PRIVATE
Qt5::Widgets
Expand Down
255 changes: 19 additions & 236 deletions vscpworks.pro.user

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion windows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ openssl - Openssl-win64 1.1.1.j (http://slproweb.com/products/Win
expat - expat 2.2.9 (https://libexpat.github.io/)
openssl - Openssl-win64 1.1.1.j (http://slproweb.com/products/Win32OpenSSL.html)
mqtt - paho C and c++ libraries
dlfcn - dlfcn-win32 (https://github.com/dlfcn-win32/dlfcn-win32)
dlfcn - dlfcn-win32 (https://github.com/dlfcn-win32/dlfcn-win32)
syslog - http://syslog-win32.sourceforge.net/ https://sourceforge.net/projects/syslog-win32/
197 changes: 197 additions & 0 deletions windows/syslog/include/syslog.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
/*
* Copyright (c) 1982, 1986, 1988, 1993
* The Regents of the University of California. 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.
* 4. Neither the name of the University 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 THE REGENTS 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.
*
* @(#)syslog.h 8.1 (Berkeley) 6/2/93
*/

#ifndef _SYS_SYSLOG_H
#define _SYS_SYSLOG_H 1

#include <stdarg.h>

/*
* priorities/facilities are encoded into a single 32-bit quantity, where the
* bottom 3 bits are the priority (0-7) and the top 28 bits are the facility
* (0-big number). Both the priorities and the facilities map roughly
* one-to-one to strings in the syslogd(8) source code. This mapping is
* included in this file.
*
* priorities (these are ordered)
*/
#define LOG_EMERG 0 /* system is unusable */
#define LOG_ALERT 1 /* action must be taken immediately */
#define LOG_CRIT 2 /* critical conditions */
#define LOG_ERR 3 /* error conditions */
#define LOG_WARNING 4 /* warning conditions */
#define LOG_NOTICE 5 /* normal but significant condition */
#define LOG_INFO 6 /* informational */
#define LOG_DEBUG 7 /* debug-level messages */

#define LOG_PRIMASK 0x07 /* mask to extract priority part (internal) */
/* extract priority */
#define LOG_PRI(p) ((p) & LOG_PRIMASK)
#define LOG_MAKEPRI(fac, pri) (((fac) << 3) | (pri))

#ifdef SYSLOG_NAMES
#define INTERNAL_NOPRI 0x10 /* the "no priority" priority */
/* mark "facility" */
#define INTERNAL_MARK LOG_MAKEPRI(LOG_NFACILITIES, 0)
typedef struct _code {
char *c_name;
int c_val;
} CODE;

CODE prioritynames[] =
{
{ "alert", LOG_ALERT },
{ "crit", LOG_CRIT },
{ "debug", LOG_DEBUG },
{ "emerg", LOG_EMERG },
{ "err", LOG_ERR },
{ "error", LOG_ERR }, /* DEPRECATED */
{ "info", LOG_INFO },
{ "none", INTERNAL_NOPRI }, /* INTERNAL */
{ "notice", LOG_NOTICE },
{ "panic", LOG_EMERG }, /* DEPRECATED */
{ "warn", LOG_WARNING }, /* DEPRECATED */
{ "warning", LOG_WARNING },
{ NULL, -1 }
};
#endif

/* facility codes */
#define LOG_KERN (0<<3) /* kernel messages */
#define LOG_USER (1<<3) /* random user-level messages */
#define LOG_MAIL (2<<3) /* mail system */
#define LOG_DAEMON (3<<3) /* system daemons */
#define LOG_AUTH (4<<3) /* security/authorization messages */
#define LOG_SYSLOG (5<<3) /* messages generated internally by syslogd */
#define LOG_LPR (6<<3) /* line printer subsystem */
#define LOG_NEWS (7<<3) /* network news subsystem */
#define LOG_UUCP (8<<3) /* UUCP subsystem */
#define LOG_CRON (9<<3) /* clock daemon */
#define LOG_AUTHPRIV (10<<3) /* security/authorization messages (private) */
#define LOG_FTP (11<<3) /* ftp daemon */

/* other codes through 15 reserved for system use */
#define LOG_LOCAL0 (16<<3) /* reserved for local use */
#define LOG_LOCAL1 (17<<3) /* reserved for local use */
#define LOG_LOCAL2 (18<<3) /* reserved for local use */
#define LOG_LOCAL3 (19<<3) /* reserved for local use */
#define LOG_LOCAL4 (20<<3) /* reserved for local use */
#define LOG_LOCAL5 (21<<3) /* reserved for local use */
#define LOG_LOCAL6 (22<<3) /* reserved for local use */
#define LOG_LOCAL7 (23<<3) /* reserved for local use */

#define LOG_NFACILITIES 24 /* current number of facilities */
#define LOG_FACMASK 0x03f8 /* mask to extract facility part */
/* facility of pri */
#define LOG_FAC(p) (((p) & LOG_FACMASK) >> 3)

#ifdef SYSLOG_NAMES
CODE facilitynames[] =
{
{ "auth", LOG_AUTH },
{ "authpriv", LOG_AUTHPRIV },
{ "cron", LOG_CRON },
{ "daemon", LOG_DAEMON },
{ "ftp", LOG_FTP },
{ "kern", LOG_KERN },
{ "lpr", LOG_LPR },
{ "mail", LOG_MAIL },
{ "mark", INTERNAL_MARK }, /* INTERNAL */
{ "news", LOG_NEWS },
{ "security", LOG_AUTH }, /* DEPRECATED */
{ "syslog", LOG_SYSLOG },
{ "user", LOG_USER },
{ "uucp", LOG_UUCP },
{ "local0", LOG_LOCAL0 },
{ "local1", LOG_LOCAL1 },
{ "local2", LOG_LOCAL2 },
{ "local3", LOG_LOCAL3 },
{ "local4", LOG_LOCAL4 },
{ "local5", LOG_LOCAL5 },
{ "local6", LOG_LOCAL6 },
{ "local7", LOG_LOCAL7 },
{ NULL, -1 }
};
#endif

/*
* arguments to setlogmask.
*/
#define LOG_MASK(pri) (1 << (pri)) /* mask for one priority */
#define LOG_UPTO(pri) ((1 << ((pri)+1)) - 1) /* all priorities through pri */

/*
* Option flags for openlog.
*
* LOG_ODELAY no longer does anything.
* LOG_NDELAY is the inverse of what it used to be.
*/
#define LOG_PID 0x01 /* log the pid with each message */
#define LOG_CONS 0x02 /* log on the console if errors in sending */
#define LOG_ODELAY 0x04 /* delay open until first syslog() (default) */
#define LOG_NDELAY 0x08 /* don't delay open */
#define LOG_NOWAIT 0x10 /* don't wait for console forks: DEPRECATED */
#define LOG_PERROR 0x20 /* log to stderr as well */

#define SYSLOG_PORT 514

#ifdef __cplusplus
extern "C" {
#endif

/* Close desriptor used to write to system logger. */
extern void closelog (void);

/* Open connection to system logger. */
extern void openlog (char *__ident, int __option, int __facility);

/* Set the log mask level. */
extern int setlogmask (int __mask);

/* Generate a log message using FMT string and option arguments. */
extern void syslog (int __pri, char *__fmt, ...);

/* Generate a log message using FMT and using arguments pointed to by AP. */
extern void vsyslog (int __pri, char *__fmt, va_list __ap);

/* windows-specific;
set directory from where syslog.host must be read;
this file contains a single line with hostname and port of syslog daemon;
default is localhost:514
*/
extern const char* set_syslog_conf_dir( const char* dir );


#ifdef __cplusplus
}
#endif

#endif /* syslog.h */
Binary file added windows/syslog/lib/iconv.dll
Binary file not shown.
Binary file added windows/syslog/lib/intl.dll
Binary file not shown.
Binary file added windows/syslog/lib/libglib-2.0-0.dll
Binary file not shown.
Binary file added windows/syslog/lib/libsyslog-0.dll
Binary file not shown.

0 comments on commit 08a042e

Please sign in to comment.