Changeset e4d3f23 in nscp for include

Timestamp:

06/23/07 10:44:30 (6 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

e6e297e

Parents:

6c5375b

Message:

Fixed problem with missing \0 on ns-client streams (but I am doubtfull that it will "work" better it will simply not crash any longer, nsclient has to be \n terminated...

Location:

include

Files:

• EnumNtSrv.cpp (modified) (3 diffs)
• EnumNtSrv.h (modified) (2 diffs)
• PDHCounter.h (modified) (1 diff)
• Socket.h (modified) (6 diffs)

include/EnumNtSrv.cpp

@@ -177 +177 @@
 }
 
-#define SC_BUF_LEN 1024
+#define SC_BUF_LEN 4096
 TNtServiceInfo TNtServiceInfo::GetService(std::string name)
 {
@@ -189 +189 @@
   if (!sh) {
     DWORD bufLen = SC_BUF_LEN;
-    TCHAR *buf = new TCHAR[bufLen];
-    if (!GetServiceKeyName(scman, name.c_str(), buf, &bufLen)) {
-      throw NTServiceException(name, "Could not open Service", GetLastError());
+    TCHAR *buf = new TCHAR[bufLen+1];
+    std::cout << "name: '" << name << "'" << std::endl;
+    if (GetServiceKeyName(scman, name.c_str(), buf, &bufLen) == 0) {
       ::CloseServiceHandle(scman);
-    }
+      throw NTServiceException(name, "GetServiceKeyName: Could not translate service name", GetLastError());
+    }
+    /*
+    Why does this not work? (a bug in the API? says it should return the correct size?)
     if (bufLen >= SC_BUF_LEN) {
-      throw NTServiceException(name, "Could not open Service", GetLastError());
       ::CloseServiceHandle(scman);
+      throw NTServiceException(name, "Service name to long to handle", GetLastError());
     }
     buf[bufLen] = 0;
-    SC_HANDLE sh = ::OpenService(scman,buf,SERVICE_QUERY_STATUS);
-    if (!sh) {
-      throw NTServiceException(name, "Could not open Service", GetLastError());
+    */
+    sh = ::OpenService(scman,buf,SERVICE_QUERY_STATUS);
+    if (sh == NULL) {
       ::CloseServiceHandle(scman);
+      throw NTServiceException(name, "OpenService: Could not open Service", GetLastError());
     }
   }
@@ -210 +214 @@
     info.m_dwServiceType = state.dwServiceType;
   } else {
-    info.m_dwCurrentState = -1;
-    info.m_dwServiceType = -1;
+    ::CloseServiceHandle(sh);
+    ::CloseServiceHandle(scman);
+    throw NTServiceException(name, "QueryServiceStatus: Could not query service status", GetLastError());
   }
   // TODO: Get more info here 

include/EnumNtSrv.h

@@ -25 +25 @@
 #include <list>
 #include <string>
+#include <strEx.h>
 
 class TNtServiceInfo;
@@ -44 +45 @@
 
   std::string getError() {
-    return "Service: " + name_ + " caused: " + msg_;
+    return "Service: " + name_ + " caused: " + msg_ + "(" + strEx::itos(error_) + ")";
   }
 };

include/PDHCounter.h

@@ -326 +326 @@
         LPTSTR szInstanceBuffer = NULL;
         status = PdhEnumObjectItems(NULL, NULL, (*it).name.c_str(), szCounterBuffer, &dwCounterBufLen, szInstanceBuffer, &dwInstanceBufLen, dwDetailLevel, 0);
-        if (status != PDH_MORE_DATA)
-          throw PDHException("PdhEnumObjectItems failed when trying to retrieve size for " + (*it).name, status);
-        szCounterBuffer = new char[dwCounterBufLen+1024];
-        szInstanceBuffer = new char[dwInstanceBufLen+1024];
-        status = PdhEnumObjectItems(NULL, NULL, (*it).name.c_str(), szCounterBuffer, &dwCounterBufLen, szInstanceBuffer, &dwInstanceBufLen, dwDetailLevel, 0);
-        if (status != ERROR_SUCCESS)
-          throw PDHException("PdhEnumObjectItems failed when trying to retrieve buffer for " + (*it).name, status);
-
-        if (dwCounterBufLen > 0) {
-          cp=szCounterBuffer;
-          while(*cp != '\0') {
-            Counter o;
-            o.name = cp;
-            (*it).counters.push_back(o);
-            cp += lstrlen(cp)+1;
+        if (status == PDH_MORE_DATA) {
+          szCounterBuffer = new char[dwCounterBufLen+1024];
+          szInstanceBuffer = new char[dwInstanceBufLen+1024];
+          status = PdhEnumObjectItems(NULL, NULL, (*it).name.c_str(), szCounterBuffer, &dwCounterBufLen, szInstanceBuffer, &dwInstanceBufLen, dwDetailLevel, 0);
+          if (status != ERROR_SUCCESS)
+            throw PDHException("PdhEnumObjectItems failed when trying to retrieve buffer for " + (*it).name, status);
+
+          if (dwCounterBufLen > 0) {
+            cp=szCounterBuffer;
+            while(*cp != '\0') {
+              Counter o;
+              o.name = cp;
+              (*it).counters.push_back(o);
+              cp += lstrlen(cp)+1;
+            }
           }
+          if (dwInstanceBufLen > 0) {
+            cp=szInstanceBuffer;
+            while(*cp != '\0') {
+              Instance o;
+              o.name = cp;
+              (*it).instances.push_back(o);
+              cp += lstrlen(cp)+1;
+            }
+          }
+          delete [] szCounterBuffer;
+          delete [] szInstanceBuffer;
+          //throw PDHException("PdhEnumObjectItems failed when trying to retrieve size for " + (*it).name, status);
         }
-        if (dwInstanceBufLen > 0) {
-          cp=szInstanceBuffer;
-          while(*cp != '\0') {
-            Instance o;
-            o.name = cp;
-            (*it).instances.push_back(o);
-            cp += lstrlen(cp)+1;
-          }
-        }
-        delete [] szCounterBuffer;
-        delete [] szInstanceBuffer;
       }
       return ret;

include/Socket.h

@@ -47 +47 @@
     }
     DataBuffer(const DataBuffer &other) {
-      buffer_ = new char[other.getLength()];
-      memcpy(buffer_, other.getBuffer(), other.getLength());
+      buffer_ = new char[other.getLength()+2];
+      memcpy(buffer_, other.getBuffer(), other.getLength()+1);
       length_ = other.getLength();
     }
@@ -54 +54 @@
       delete [] buffer_;
       length_ = 0;
+      buffer_ = NULL;
     }
     void append(const char* buffer, const unsigned int length) {
-      char *tBuf = new char[length_+length+1];
+      char *tBuf = new char[length_+length+2];
       memcpy(tBuf, buffer_, length_);
       memcpy(&tBuf[length_], buffer, length);
@@ -62 +63 @@
       buffer_ = tBuf;
       length_ += length;
-    }
+      buffer_[length_+1] = 0;
+    }
+    /**
+     * returns a const reference to the internal buffer
+     * Use with care!
+     *
+     * @access public 
+     * @returns const char *
+     * @qualifier const
+     */
     const char * getBuffer() const {
       return buffer_;
@@ -69 +79 @@
       return length_;
     }
+    /**
+     * Eats a specified number of bytes from the beginning of the buffer
+     * @access public 
+     * @returns void
+     * @qualifier
+     * @param const unsigned int length the amount of bytes to eat
+     */
     void nibble(const unsigned int length) {
       if (length > length_)
         return;
       unsigned int newLen = length_-length;
-      char *tBuf = new char[newLen+1];
-      memcpy(tBuf, &buffer_[length], newLen);
+      char *tBuf = new char[newLen+2];
+      memcpy(tBuf, &buffer_[length], newLen+1);
       char *oldBuf = buffer_;
       buffer_ = tBuf;
@@ -87 +104 @@
       ret.copyFrom(buffer_, length);
       unsigned int newLen = length_-length;
-      char *tBuf = new char[newLen+1];
-      memcpy(tBuf, &buffer_[length], newLen);
+      char *tBuf = new char[newLen+2];
+      memcpy(tBuf, &buffer_[length], newLen+1);
       char *oldBuf = buffer_;
       buffer_ = tBuf;
@@ -107 +124 @@
     void copyFrom(const char* buffer, const unsigned int length) {
       delete [] buffer_;
-      buffer_ = new char[length+1];
+      buffer_ = new char[length+2];
       memcpy(buffer_, buffer, length);
       length_ = length;
+      buffer_[length_+1] = 0;
     }
   };