Win32 bugfixes.

diff --git a/base/base.vcxproj b/base/base.vcxproj
index d22ca8f05d7cceff3640c700a492f6b0ad9a4ceb..26fbe3feb29fe5186e09f09267c5b55b709dc960 100644 (file)
--- a/base/base.vcxproj
+++ b/base/base.vcxproj
@@ -21,6 +21,7 @@
     <ClCompile Include="object.cpp" />
     <ClCompile Include="objectmap.cpp" />
     <ClCompile Include="objectset.cpp" />
+    <ClCompile Include="ringbuffer.cpp" />
     <ClCompile Include="socket.cpp" />
     <ClCompile Include="tcpclient.cpp" />
     <ClCompile Include="tcpserver.cpp" />
@@ -45,6 +46,7 @@
     <ClInclude Include="fifo.h" />
     <ClInclude Include="i2-base.h" />
     <ClInclude Include="object.h" />
+    <ClInclude Include="ringbuffer.h" />
     <ClInclude Include="socket.h" />
     <ClInclude Include="tcpclient.h" />
     <ClInclude Include="tcpserver.h" />

diff --git a/base/ringbuffer.h b/base/ringbuffer.h
index a74f784fb95f11b3d3630089cf65b0c3d184b485..5806c461bd8d2b4d635defb141f9fb71ca5cacde 100644 (file)
--- a/base/ringbuffer.h
+++ b/base/ringbuffer.h
@@ -4,7 +4,7 @@
 namespace icinga
 {
 
-class Ringbuffer
+class I2_BASE_API Ringbuffer
 {
 public:
        Ringbuffer(int slots);

diff --git a/components/discovery/discoverycomponent.cpp b/components/discovery/discoverycomponent.cpp
index 9c67c1bbca3f6ae9fe76cf566390fb7b67744e3f..d7b71e8406f4995f3984d5a47ffba539bc7360e8 100644 (file)
--- a/components/discovery/discoverycomponent.cpp
+++ b/components/discovery/discoverycomponent.cpp
@@ -333,7 +333,7 @@ bool DiscoveryComponent::HasMessagePermission(const Dictionary::Ptr& roles, cons
                if (!permissions)
                        throw runtime_error("Object is not a dictionary.");
 
-               for (DictionaryIterator is = permissions->Begin(); is != permissions->End(); is++) {
+               for (Dictionary::Iterator is = permissions->Begin(); is != permissions->End(); is++) {
                        if (Utility::Match(is->second.GetString(), message))
                                return true;
                }
@@ -383,7 +383,7 @@ void DiscoveryComponent::ProcessDiscoveryMessage(const string& identity, const D
 
        MessagePart publications;
        if (message.GetPublications(&publications)) {
-               DictionaryIterator i;
+               Dictionary::Iterator i;
                for (i = publications.Begin(); i != publications.End(); i++) {
                        if (trusted || HasMessagePermission(roles, "publications", i->second)) {
                                info->Publications.insert(i->second);
@@ -395,7 +395,7 @@ void DiscoveryComponent::ProcessDiscoveryMessage(const string& identity, const D
 
        MessagePart subscriptions;
        if (message.GetSubscriptions(&subscriptions)) {
-               DictionaryIterator i;
+               Dictionary::Iterator i;
                for (i = subscriptions.Begin(); i != subscriptions.End(); i++) {
                        if (trusted || HasMessagePermission(roles, "subscriptions", i->second)) {
                                info->Subscriptions.insert(i->second);

diff --git a/icinga-app/icinga-c1.pem b/icinga-app/icinga-c1.pem
new file mode 100644 (file)
index 0000000..0a2ac33
--- /dev/null
+++ b/icinga-app/icinga-c1.pem
@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIICtzCCAiCgAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJERTEQ
+MA4GA1UECAwHQmF2YXJpYTESMBAGA1UEBwwJTnVyZW1iZXJnMRUwEwYDVQQKDAxO
+RVRXQVlTIEdtYkgxHDAaBgNVBAMME0ljaW5nYSBTbmFrZSBPaWwgQ0EwHhcNMTIw
+NDI0MTE0NzQ2WhcNMTMwNDI0MTE0NzQ2WjBeMQswCQYDVQQGEwJERTEQMA4GA1UE
+CAwHQmF2YXJpYTESMBAGA1UEBwwJTnVyZW1iZXJnMRUwEwYDVQQKDAxORVRXQVlT
+IEdtYkgxEjAQBgNVBAMMCWljaW5nYS1jMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEAysHrzHs9WfQR4cEUx2hFZQmbM+Ssi5L63yqnzxEvVQ3GlM+uIceK1Kvx
+9EexoUDLhxJOaUmigc6Pcs2mAjcpEwObnzW4pLuMKa7ngGLrnUpmmDXdGoxkCbi7
+CP3s5yC7ZZ6bDiPMhRi/TRvY6+uQf+yew5daA3p87jocgRjhRicCAwEAAaN7MHkw
+CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
+dGlmaWNhdGUwHQYDVR0OBBYEFPzsYbQZdbq+pcFJWoenWREW6WhMMB8GA1UdIwQY
+MBaAFNVJHVPJNwqEcG51lpqZJWVPaysFMA0GCSqGSIb3DQEBBQUAA4GBAMLP1GJf
+0hFdrEpGq+NvxTVx7wD30enAot5x2HLx4HuFohQJz/VZ45v+srrA+HEXbBFXPOd4
+nB2XtcDDidFKTt5E03HBwDGGZvnB3f1KXYi7B50imKrwVVzgp5nGBM4hSzWGovEX
+EYofmhk0fQg9qiKQrjwNib/4/b0srwEswfdj
+-----END CERTIFICATE-----
+-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMrB68x7PVn0EeHB
+FMdoRWUJmzPkrIuS+t8qp88RL1UNxpTPriHHitSr8fRHsaFAy4cSTmlJooHOj3LN
+pgI3KRMDm581uKS7jCmu54Bi651KZpg13RqMZAm4uwj97Ocgu2Wemw4jzIUYv00b
+2OvrkH/snsOXWgN6fO46HIEY4UYnAgMBAAECgYBj/1QOG1HcxXT0REe9OP3QoPY8
+l7FJfQnheqYch7syVYL07aBR5Jnh3ZONCLbgcpZuXWbyonBVWMyCsE4Jla7ZYnBB
+plZPMYmzGxEbTM5Bu+PZ0M1NLvdLCRq24IVwTZwBBZ3sr7rVSnAYi2Li0SWQEaCN
+P+PbZP1P9i9WiI+VIQJBAPYBfVWNk3gY1V0YuuH9fmYRBg5/B1qy8bYS9FLVIq2z
+5r7eI1EypcVtyTx6yMmLuWj4mpNOKv5sxQsHalzRo18CQQDS/qPoDqMkDB9r9XeZ
+qS2XQdX6YxzGisqL8vWcZ/Y6YX81qm3Lpp2wEexUXvWXRI5RdguctZFKTVyG/Mic
+C9o5AkAEtvKX+SaiXpd4OUkbm6gYfKsJDBYv/s3zF1nnXH5VpeT+M3Op0raqmfgJ
+WLEQa8UZ5enQeOcKCTudgn7fWIUxAkEAmXWfXP6YZXVzvR+xt08225aEvTItEbKM
+krFJNlLe4aNb1Hp6lO5ALnk6vDq8wSKZqGIFHBtq6vHNZFiix+xO8QJAIZ3pB/Bz
+Il8NjZMg8t/1sJdn32Xe9D0lZRtZTKC8zF/78NDFEo9qqE4Sr1CUfqlx18HXOxCO
+Vg4lv6+jUj+LmA==
+-----END PRIVATE KEY-----
\ No newline at end of file

diff --git a/icinga-app/icinga-c2.pem b/icinga-app/icinga-c2.pem
new file mode 100644 (file)
index 0000000..e1bc7de
--- /dev/null
+++ b/icinga-app/icinga-c2.pem
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIICtzCCAiCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJERTEQ
+MA4GA1UECAwHQmF2YXJpYTESMBAGA1UEBwwJTnVyZW1iZXJnMRUwEwYDVQQKDAxO
+RVRXQVlTIEdtYkgxHDAaBgNVBAMME0ljaW5nYSBTbmFrZSBPaWwgQ0EwHhcNMTIw
+NDI0MTE0NzU1WhcNMTMwNDI0MTE0NzU1WjBeMQswCQYDVQQGEwJERTEQMA4GA1UE
+CAwHQmF2YXJpYTESMBAGA1UEBwwJTnVyZW1iZXJnMRUwEwYDVQQKDAxORVRXQVlT
+IEdtYkgxEjAQBgNVBAMMCWljaW5nYS1jMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEArOcVui1AWojbPuK/7We9uwIBLaOLfBxQRI3+k6PzzjdtaXT4ijT/DSav
+Q5U4wGOLYh0yuSyqS88QX/DsqDGLXnSVs8mT37bioMOw2XinqaNQ6xK4vyi0FYxS
+ewI6YOkYi7135NEaSUgd82hk4wFtiIb67T7hkHRc7Aui6FmT/SkCAwEAAaN7MHkw
+CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
+dGlmaWNhdGUwHQYDVR0OBBYEFGvpolD5na6L70kNFO1tYGYIwDhqMB8GA1UdIwQY
+MBaAFNVJHVPJNwqEcG51lpqZJWVPaysFMA0GCSqGSIb3DQEBBQUAA4GBAIhhjKWw
+5JKirNidgG9PuD8x47VsRTkESLlq/pS7KjkE1nWCG9JpR5oVSzx2WXomiaAZ4q2C
+WS1z4HD9HF4NbhY+xVBi0Fj/kotuXCCweRo5EVp7Q4fabm1maJemFwMTHGhBLu7a
+v4dquYyOk9Dhkwcjajyn+KWceCoUTdI3LB2t
+-----END CERTIFICATE----------BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKznFbotQFqI2z7i
+v+1nvbsCAS2ji3wcUESN/pOj8843bWl0+Io0/w0mr0OVOMBji2IdMrksqkvPEF/w
+7Kgxi150lbPJk9+24qDDsNl4p6mjUOsSuL8otBWMUnsCOmDpGIu9d+TRGklIHfNo
+ZOMBbYiG+u0+4ZB0XOwLouhZk/0pAgMBAAECgYEAkbEavslYm7EMRX4dyXcMCaNT
+yNgxNcBJ5qpbpJ6XVuGfoSf+Mb8cV0GMl38K1hpLHb6Kujwntz9ghedmEwfEbcw0
+TkSaNz1+7omM+485S2YvXJyR1kO8eEKONVlGuxgO/ItiR+e1J6wMnY5JhctgRH6W
+aOqy+5Ua1ATIdiOYrI0CQQDku3CNDOipwDmguBIrlxa+6NsATJRjqFmHqWdu2pYh
+KRl3Sypn+LfhdFRbo3licU5a1OqydGmVpRTpQPJO7MoHAkEAwYPQIGZd/60O2LWV
+M5eLnwKrrQSfrQ/Lngz0Qko4Yo913Ef2PC2QQ6p9cOt3vMPZDK5znlzQbBCa6cAH
+tBvzTwJAT+uaaP5wsRdkS17lomt5XB1aoCEh3Cxvk/JCHL6tpEqLBl6yI4AJJ/KQ
+ozBccmQqv5wToWUBm3MB+nph7+fWswJAMKcQQ6UZCvganHeCzJbUXqUQPo7ECoHH
+IrSFEMmSRY1mB3z8NoMKG0kZArPgxc/DmUGfBfi12gWOvSgvh6PjVwJBALKECoe5
+nmxhHTFbs4+UCFTzp6BGtSBdr6to0ID7ykZWT6kBX/BHUnoJUEpDtNLXzbek/KeI
+ymg0LgRkHoWNpLY=
+-----END PRIVATE KEY-----
\ No newline at end of file

diff --git a/icinga-app/icinga-c3.pem b/icinga-app/icinga-c3.pem
new file mode 100644 (file)
index 0000000..9dff47c
--- /dev/null
+++ b/icinga-app/icinga-c3.pem
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIICNTCCAZ4CAQQwDQYJKoZIhvcNAQEFBQAwaDELMAkGA1UEBhMCREUxEDAOBgNV
+BAgMB0JhdmFyaWExEjAQBgNVBAcMCU51cmVtYmVyZzEVMBMGA1UECgwMTkVUV0FZ
+UyBHbWJIMRwwGgYDVQQDDBNJY2luZ2EgU25ha2UgT2lsIENBMB4XDTEyMDUwODA3
+MzkxOVoXDTIyMDUwNjA3MzkxOVowXjELMAkGA1UEBhMCREUxEDAOBgNVBAgMB0Jh
+dmFyaWExEjAQBgNVBAcMCU51cmVtYmVyZzEVMBMGA1UECgwMTkVUV0FZUyBHbWJI
+MRIwEAYDVQQDDAlpY2luZ2EtYzMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+AKFf+UkCgbNtEP0OoeF+K02L5SRlqkkkp6eaieh0IN7NNAxeELcGpZmycv4sHp30
+qv0zDtKU1HYrpm8TEBsz2AoT+J36QT9IysfcWdM9o3WZGMDUVqYBUscurkxBQJCK
+cFwXijTJ8Djn82xVgNUm/E44AdbrIwUlx23yllErx8hfAgMBAAEwDQYJKoZIhvcN
+AQEFBQADgYEAsZOKZQ2+ksPiNTCJrY+uiUZs6lFSbcJ9BHHaAt0ytQPiblufz3xl
+AR5Hza5fHt+lN9aGxM7TWMhjZHhmoctSRz8AW1KZTdbxJhRdbqmBjl95c2wBiDxs
+ERpyU9m9Rp42IjTyU4Vr/yO7DgMcG2k4KYzNquA5O8rqqtPRAp3H6n0=
+-----END CERTIFICATE----------BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQChX/lJAoGzbRD9DqHhfitNi+UkZapJJKenmonodCDezTQMXhC3
+BqWZsnL+LB6d9Kr9Mw7SlNR2K6ZvExAbM9gKE/id+kE/SMrH3FnTPaN1mRjA1Fam
+AVLHLq5MQUCQinBcF4o0yfA45/NsVYDVJvxOOAHW6yMFJcdt8pZRK8fIXwIDAQAB
+AoGASJwWXnNySHlam4Jp9DwA3/OCNs5HwIFtrkwqoR0fbSCHusjYXIHxISbZ9uOD
+Iy9jgGno0XeF4WXijTfWl2bMXYWTS7ISMBg96bPZtG/RTdgd1LT69s82a+apbgSd
+bxB64cyn8KtuABfZ9AMR+TV28TDmnGMdhVoaM66iWKv4a4ECQQDNmk3NTZ+s/y5F
+5qOgJqH5yX1hZLLmm8e8lpghqDT43HR3cMJLN6b5oS1UdMcEw1Q6q3hjFl+MbnZa
+AzvzpT9DAkEAyO5YdpbRG1OR7sNmidowvr1NkIjV/C4UuSpGrx9XJFAZkLxEEmMu
+13QssdHjAkX5yFjkoNPC+wA6DeVjtvHatQJBAMG1qavOgKyLV9t/65XOEDm5Pqnu
+KCfhiZQDBp5fTllRy2FlGYmoi2cSFhVGWOQB7G/CchBZWfiDcnpoJanufOUCQGr7
+bKKHnoKcNmEYLOpNABMum7PPB5AjwOjt94CagT1WYKZNdzkLEg+pTXrIM8QsGdhw
+bBqtZW1bK43mivcHQtkCQF+p7LfzmPo9uzRrOfjgTDYLuh3MD8EKNs0M6l15UqbQ
+nfBBE0oIPH4j+K++7xWUQ7vbiyBc7C7H3NZeE6xqfS0=
+-----END RSA PRIVATE KEY-----
\ No newline at end of file

diff --git a/icinga/checkresult.h b/icinga/checkresult.h
index 44abdbc76919269674cfbe3d25da64112aeb4076..dd71c86d26647fe515595549c0eeac50a51f8e1d 100644 (file)
--- a/icinga/checkresult.h
+++ b/icinga/checkresult.h
@@ -4,7 +4,7 @@
 namespace icinga
 {
 
-class CheckResult : public MessagePart
+class I2_ICINGA_API CheckResult : public MessagePart
 {
 public:
        CheckResult(void) : MessagePart() { }

diff --git a/icinga/icinga.vcxproj b/icinga/icinga.vcxproj
index 78bb39497b7696668a1bbef0d6382b172d4cc183..ec5070cf87516c37bbe68fb447fcd2fa71db154d 100644 (file)
--- a/icinga/icinga.vcxproj
+++ b/icinga/icinga.vcxproj
@@ -11,32 +11,38 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="checkresult.cpp" />
     <ClCompile Include="checktask.cpp" />
+    <ClCompile Include="cib.cpp" />
     <ClCompile Include="configobjectadapter.cpp" />
     <ClCompile Include="endpoint.cpp" />
     <ClCompile Include="endpointmanager.cpp" />
     <ClCompile Include="host.cpp" />
+    <ClCompile Include="hostgroup.cpp" />
     <ClCompile Include="icingaapplication.cpp" />
-    <ClCompile Include="icingacomponent.cpp" />
     <ClCompile Include="jsonrpcendpoint.cpp" />
     <ClCompile Include="macroprocessor.cpp" />
     <ClCompile Include="nagioschecktask.cpp" />
     <ClCompile Include="service.cpp" />
+    <ClCompile Include="servicegroup.cpp" />
     <ClCompile Include="virtualendpoint.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="checkresult.h" />
     <ClInclude Include="checktask.h" />
+    <ClInclude Include="cib.h" />
     <ClInclude Include="configobjectadapter.h" />
     <ClInclude Include="endpoint.h" />
     <ClInclude Include="endpointmanager.h" />
     <ClInclude Include="host.h" />
+    <ClInclude Include="hostgroup.h" />
     <ClInclude Include="i2-icinga.h" />
     <ClInclude Include="icingaapplication.h" />
-    <ClInclude Include="icingacomponent.h" />
     <ClInclude Include="jsonrpcendpoint.h" />
     <ClInclude Include="macroprocessor.h" />
     <ClInclude Include="nagioschecktask.h" />
     <ClInclude Include="service.h" />
+    <ClInclude Include="servicegroup.h" />
     <ClInclude Include="virtualendpoint.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">

diff --git a/icinga/service.cpp b/icinga/service.cpp
index 246ebee11429a2f93edce1d4ca69b39b0ad814c5..2c8621c172bc48f561125790be310d9b368208c5 100644 (file)
--- a/icinga/service.cpp
+++ b/icinga/service.cpp
@@ -186,7 +186,7 @@ Dictionary::Ptr Service::GetLastCheckResult(void) const
 
 void Service::SetLastStateChange(time_t ts)
 {
-       GetConfigObject()->SetTag("last_state_change", ts);
+       GetConfigObject()->SetTag("last_state_change", static_cast<long>(ts));
 }
 
 time_t Service::GetLastStateChange(void) const
@@ -199,7 +199,7 @@ time_t Service::GetLastStateChange(void) const
 
 void Service::SetLastHardStateChange(time_t ts)
 {
-       GetConfigObject()->SetTag("last_hard_state_change", ts);
+       GetConfigObject()->SetTag("last_hard_state_change", static_cast<long>(ts));
 }
 
 time_t Service::GetLastHardStateChange(void) const

diff --git a/icinga/service.h b/icinga/service.h
index 4f144bf599002fcf96ff5e5a8b3d64d9b56a34a1..383dd2698e130ec62bac3c2235875ed78fa3fd91 100644 (file)
--- a/icinga/service.h
+++ b/icinga/service.h
@@ -20,7 +20,7 @@ enum ServiceStateType
        StateTypeHard
 };
 
-struct CheckResult;
+class CheckResult;
 
 class I2_ICINGA_API Service : public ConfigObjectAdapter
 {