From a8b752c9cfad0a41c25cb6b8199c237d8f6b6212 Mon Sep 17 00:00:00 2001 From: Bjango Date: Thu, 29 Mar 2018 07:59:31 +1100 Subject: [PATCH] fixed a crash on OpenBSD 6.2 when opening kvm #11 version bump --- README | 4 ++++ readme.md | 2 +- src/Stats.cpp | 6 +++++- src/System.h | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/README b/README index ebdb589..05c818b 100644 --- a/README +++ b/README @@ -18,6 +18,10 @@ Requirements - sqlite3 + development libraries. - libxml2 + development libraries. +Optional Libraries +- libavahi + development libraries. +- lm_sensors/libsensors4 + development libraries. + We have a package guide available to help you install all the required packages for your OS - https://github.com/bjango/istatserverlinux/wiki/Package-Guide diff --git a/readme.md b/readme.md index a586e4d..9db6c83 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ # iStat Server -iStat Server is a system monitoring daemon that is used in conjunction with [iStat View for iOS](https://bjango.com/ios/istat/) and [iStat View for Mac](https://bjango.com/mac/istat/) to remotely monitor computers. +iStat Server is a system monitoring daemon that is used in conjunction with [iStat View for iOS](https://bjango.com/ios/istat/) and [iStat View for macOS](https://bjango.com/mac/istat/) to remotely monitor computers. ----- diff --git a/src/Stats.cpp b/src/Stats.cpp index d0926d0..c7abae3 100644 --- a/src/Stats.cpp +++ b/src/Stats.cpp @@ -103,7 +103,11 @@ void Stats::prepare() #ifdef HAVE_LIBKVM kvm_t *kd; - if ((kd = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL)) != NULL) + #if defined(__NetBSD__) || defined(__OpenBSD__) + if ((kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, "kvm_open")) != NULL) + #else + if ((kd = kvm_open(NULL, NULL, NULL, O_RDONLY, "kvm_open")) != NULL) + #endif { cpuStats.kd = kd; loadStats.kd = kd; diff --git a/src/System.h b/src/System.h index 5115854..4e0df2d 100644 --- a/src/System.h +++ b/src/System.h @@ -35,8 +35,8 @@ #include #include -#define SERVER_VERSION 3.02 -#define SERVER_BUILD 104 +#define SERVER_VERSION 3.03 +#define SERVER_BUILD 105 #define PROTOCOL_VERSION 3 #define HISTORY_SIZE 600