Updated to match changes in radiostack.[ch]xx

[flightgear.git] / src / FDM / JSBSim / FGfdmSocket.cpp

diff --git a/src/FDM/JSBSim/FGfdmSocket.cpp b/src/FDM/JSBSim/FGfdmSocket.cpp
index 97d731af9b3b1b8e3b5d99c98099a41ab94db126..9d86bbab5b96f9b81201e3c618adb71b71139689 100644 (file)
--- a/src/FDM/JSBSim/FGfdmSocket.cpp
+++ b/src/FDM/JSBSim/FGfdmSocket.cpp
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
  Module:       FGfdmSocket.cpp
  Author:       Jon S. Berndt
@@ -33,26 +33,27 @@ HISTORY
 --------------------------------------------------------------------------------
 11/08/99   JSB   Created
 
-********************************************************************************
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 INCLUDES
-*******************************************************************************/
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "FGfdmSocket.h"
 
-static const char *IdSrc = "$Header$";
+static const char *IdSrc = "$Id$";
 static const char *IdHdr = ID_FDMSOCKET;
 
-/*******************************************************************************
-************************************ CODE **************************************
-*******************************************************************************/
+/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+CLASS IMPLEMENTATION
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 FGfdmSocket::FGfdmSocket(string address, int port)
 {
   size = 0;
+  connected = false;
 
-  #if defined(__BORLANDC__) || defined(_MSC_VER)
+#if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__)
     WSADATA wsaData;
-    int PASCAL FAR wsaReturnCode;
+    int wsaReturnCode;
     wsaReturnCode = WSAStartup(MAKEWORD(1,1), &wsaData);
     if (wsaReturnCode == 0) cout << "Winsock DLL loaded ..." << endl;
     else cout << "Winsock DLL not initialized ..." << endl;
@@ -80,6 +81,7 @@ FGfdmSocket::FGfdmSocket(string address, int port)
       int len = sizeof(struct sockaddr_in);
       if (connect(sckt, (struct sockaddr*)&scktName, len) == 0) {   // successful
         cout << "Successfully connected to socket ..." << endl;
+        connected = true;
       } else {                // unsuccessful
         cout << "Could not connect to socket ..." << endl;
       }
@@ -87,9 +89,12 @@ FGfdmSocket::FGfdmSocket(string address, int port)
       cout << "Could not create socket for FDM, error = " << errno << endl;
     }
   }
+  Debug(0);
 }
 
-FGfdmSocket::~FGfdmSocket(void)
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+FGfdmSocket::~FGfdmSocket()
 {
   #ifndef macintosh
   if (sckt) shutdown(sckt,2);
@@ -98,14 +103,19 @@ FGfdmSocket::~FGfdmSocket(void)
   #ifdef __BORLANDC__
     WSACleanup();
   #endif
+  Debug(1);
 }
 
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 void FGfdmSocket::Clear(void)
 {
   buffer = "";
   size = 0;
 }
 
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 void FGfdmSocket::Append(const char* item)
 {
   if (size == 0) buffer += string(item);
@@ -113,28 +123,34 @@ void FGfdmSocket::Append(const char* item)
   size++;
 }
 
-void FGfdmSocket::Append(float item)
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGfdmSocket::Append(double item)
 {
   char s[25];
 
-  sprintf(s,"%12.7f\0",item);
+  sprintf(s,"%12.7f",item);
 
   if (size == 0) buffer += string(s);
   else buffer += string(",") + string(s);
   size++;
 }
 
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 void FGfdmSocket::Append(long item)
 {
   char s[25];
 
-  sprintf(s,"%12d\0",item);
+  sprintf(s,"%12ld",item);
 
   if (size == 0) buffer += string(s);
   else buffer += string(",") + string(s);
   size++;
 }
 
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 void FGfdmSocket::Send(void)
 {
   buffer += string("\n");
@@ -144,3 +160,48 @@ void FGfdmSocket::Send(void)
   }
 }
 
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+//    The bitmasked value choices are as follows:
+//    unset: In this case (the default) JSBSim would only print
+//       out the normally expected messages, essentially echoing
+//       the config files as they are read. If the environment
+//       variable is not set, debug_lvl is set to 1 internally
+//    0: This requests JSBSim not to output any messages
+//       whatsoever.
+//    1: This value explicity requests the normal JSBSim
+//       startup messages
+//    2: This value asks for a message to be printed out when
+//       a class is instantiated
+//    4: When this value is set, a message is displayed when a
+//       FGModel object executes its Run() method
+//    8: When this value is set, various runtime state variables
+//       are printed out periodically
+//    16: When set various parameters are sanity checked and
+//       a message is printed out when they go out of bounds
+
+void FGfdmSocket::Debug(int from)
+{
+  if (debug_lvl <= 0) return;
+
+  if (debug_lvl & 1) { // Standard console startup message output
+    if (from == 0) { // Constructor
+    }
+  }
+  if (debug_lvl & 2 ) { // Instantiation/Destruction notification
+    if (from == 0) cout << "Instantiated: FGfdmSocket" << endl;
+    if (from == 1) cout << "Destroyed:    FGfdmSocket" << endl;
+  }
+  if (debug_lvl & 4 ) { // Run() method entry print for FGModel-derived objects
+  }
+  if (debug_lvl & 8 ) { // Runtime state variables
+  }
+  if (debug_lvl & 16) { // Sanity checking
+  }
+  if (debug_lvl & 64) {
+    if (from == 0) { // Constructor
+      cout << IdSrc << endl;
+      cout << IdHdr << endl;
+    }
+  }
+}
+