Changeset 8cf56a5 in nscp

Timestamp:

02/16/05 23:28:38 (8 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

402f042

Parents:

ac676a8

Message:

port is now loaded from the settings

File:

• TCPSocketResponder.cpp (modified) (3 diffs)

TCPSocketResponder.cpp

@@ -4 +4 @@
 #include "NSClient++.h"
 #include "TCPSocketResponder.h"
+#include "Settings.h"
 
 extern NSClient mainClient;
@@ -79 +80 @@
   local.sin_family=AF_INET;
   local.sin_addr.s_addr=INADDR_ANY;
-  local.sin_port=htons((u_short)1234);
+  local.sin_port=htons(static_cast<u_short>(Settings::getInstance()->getInt("generic", "port", DEFAULT_TCP_PORT)));
   server=socket(AF_INET,SOCK_STREAM,0);
   if(server==INVALID_SOCKET) {
@@ -102 +103 @@
   while(isRunning()) {
     client=accept(server, (struct sockaddr*)&from,&fromlen);
-    char *buff = new char[RECV_BUFFER_LEN+1];
-    int n=recv(client,buff,RECV_BUFFER_LEN,0);
-    if ((n!=SOCKET_ERROR )&&(n > 0)&&(n < RECV_BUFFER_LEN)) {
-      buff[n] = '\0';
-      LOG_DEBUG("Incoming data: ");
-      LOG_DEBUG(buff);
-      std::string ret = parseCommand(buff);
-      LOG_DEBUG("Outgoing data: ");
-      LOG_DEBUG(ret.c_str());
-      send(client, ret.c_str(), ret.length(), 0);
-    } else {
-      std::string str = "ERROR: Unknown socket error";
-      send(client,str.c_str(),str.length(),0);
+    if (client != INVALID_SOCKET) {
+      LOG_ERROR_STD("Accept returned: " + strEx::itos((DWORD)client));
+      char *buff = new char[RECV_BUFFER_LEN+1];
+      int n=recv(client,buff,RECV_BUFFER_LEN,0);
+      if ((n!=SOCKET_ERROR )&&(n > 0)&&(n < RECV_BUFFER_LEN)) {
+        buff[n] = '\0';
+        LOG_DEBUG("Incoming data: ");
+        LOG_DEBUG(buff);
+        std::string ret = parseCommand(buff);
+        LOG_DEBUG("Outgoing data: ");
+        LOG_DEBUG(ret.c_str());
+        send(client, ret.c_str(), ret.length(), 0);
+      } else {
+        std::string str = "ERROR: Unknown socket error";
+        send(client,str.c_str(),str.length(),0);
+      }
+      delete [] buff;
+      closesocket(client);
     }
-    delete [] buff;
-    closesocket(client);
   }
   closesocket(server);