fixed crash in node poller
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 13 Dec 2013 16:52:53 +0000 (18:52 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 13 Dec 2013 16:52:53 +0000 (18:52 +0200)
android/src/console/.project
build/build_number
include/build.h
src/java/build/set_build_number.cmd
src/java/netxms-base/src/main/java/org/netxms/base/BuildNumber.java
src/server/core/np.cpp

index 659be1b..227beb0 100644 (file)
                        <arguments>
                        </arguments>
                </buildCommand>
+               <buildCommand>
+                       <name>net.rim.ajde.internal.verifier</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
        </buildSpec>
        <natures>
                <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>net.rim.ajde.BlackBerryAndroidNature</nature>
        </natures>
 </projectDescription>
index 2a5038d..293b33c 100644 (file)
@@ -1 +1 @@
-7854
+7855
index fb63be4..25706f6 100644 (file)
@@ -1,5 +1,5 @@
 #ifndef __build_h
 #define __build_h
-#define NETXMS_VERSION_BUILD 7854
-#define NETXMS_VERSION_BUILD_STRING _T("7854")
+#define NETXMS_VERSION_BUILD 7855
+#define NETXMS_VERSION_BUILD_STRING _T("7855")
 #endif
index fc1929a..0dacca7 100644 (file)
@@ -1,5 +1,5 @@
 package org.netxms.base;
 public final class BuildNumber {
-   public static final String TEXT = "7854";
-   public static final int NUMBER = 7854;
+   public static final String TEXT = "7855";
+   public static final int NUMBER = 7855;
 }
index 3f14910..f6514e3 100644 (file)
@@ -397,7 +397,11 @@ static bool HostIsReachable(UINT32 ipAddr, UINT32 zoneId, bool fullCheck, SNMP_T
                ((SNMP_UDPTransport *)pTransport)->createUDPTransport(NULL, htonl(ipAddr), 161);
        }
        int version;
-   SNMP_SecurityContext *ctx = SnmpCheckCommSettings(pTransport, &version, NULL, NULL);
+   StringList oids;
+   oids.add(_T(".1.3.6.1.2.1.1.2.0"));
+   oids.add(_T(".1.3.6.1.2.1.1.1.0"));
+   AddDriverSpecificOids(&oids);
+   SNMP_SecurityContext *ctx = SnmpCheckCommSettings(pTransport, &version, NULL, &oids);
        if (ctx != NULL)
        {
                delete ctx;