Skip to content

W
White Rabbit Switch - Software
Commit b00e15dd authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

Merge branch 'adam-snmp' 

Allow to use pr_* functions in files linked in wrsSnmp.so
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parents 6c0510b0 7060e4d2
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 53 deletions
userspace/snmpd/Makefile
View file @ b00e15dd
......@@ -30,6 +30,7 @@ SOURCES = \
snmp_shmem.c \
snmp_mmap.c \
util.c \
snmp_msg.c \
wrsScalar.c \
wrsGeneralStatusGroup.c \
wrsOSStatusGroup.c \
......
userspace/snmpd/snmp_msg.c 0 → 100644
View file @ b00e15dd
#include <net-snmp/net-snmp-config.h>
#include <net-snmp/net-snmp-includes.h>
#include <net-snmp/agent/net-snmp-agent-includes.h>
/* definition of a function __wrs_msg using snmp_vlog */
void __wrs_msg(int level, const char *func, int line, const char *fmt, ...)
{
va_list args;
/* The actual message */
va_start(args, fmt);
snmp_vlog(level, fmt, args);
va_end(args);
}
userspace/snmpd/wrsPortStatusTable.c
View file @ b00e15dd
......@@ -126,8 +126,8 @@ time_t wrsPortStatusTable_data_fill(unsigned int *n_rows)
((port_state->mode != HEXP_PORT_MODE_NON_WR) &&
(wrsPortStatusTable_array[i].sfp_in_db == 1)));
logmsg("reading ports name %s link %d, mode %d, "
"locked %d\n", port_state->name,
snmp_log(LOG_DEBUG, "reading ports name %s link %d, "
"mode %d, locked %d\n", port_state->name,
wrsPortStatusTable_array[i].link_up,
wrsPortStatusTable_array[i].port_mode,
wrsPortStatusTable_array[i].port_locked);
......
userspace/snmpd/wrsSnmp.h
View file @ b00e15dd
......@@ -15,60 +15,9 @@
#undef INST
#include <ppsi/ieee1588_types.h> /* for ClockIdentity */
/*
* local hack: besides the file pointer, that is there anyways,
* everything else is not actually built if WRS_WITH_SNMP_HACKISH_LOG
* is set 0 at build time (currently the default)
*/
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
extern FILE *wrs_logf;
static inline int logmsg(const char *fmt, ...)
{
va_list args;
int ret;
if (WRS_WITH_SNMP_HACKISH_LOG) {
if (!wrs_logf) {
char *fname = getenv("WRS_SNMP_LOGFILE");
if (!fname)
fname = "/dev/console";
wrs_logf = fopen(fname, "w");
}
if (!wrs_logf)
return 0;
va_start(args, fmt);
ret = vfprintf(wrs_logf, fmt, args);
va_end(args);
return ret;
} else {
return 0;
}
}
static inline int dumpstruct(FILE *dest, char *name, void *ptr, int size)
{
int ret = 0, i;
unsigned char *p = ptr;
if (WRS_WITH_SNMP_HACKISH_LOG) {
ret = fprintf(dest, "dump %s at %p (size 0x%x)\n",
name, ptr, size);
for (i = 0; i < size; ) {
ret += fprintf(dest, "%02x", p[i]);
i++;
ret += fprintf(dest, i & 3 ? " " : i & 0xf ? " " : "\n");
}
if (i & 0xf)
ret += fprintf(dest, "\n");
}
return ret;
}
/* end local hack */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment