Changeset 187 for vtcross/trunk/src/include

Timestamp:

03/23/09 10:51:57 (15 years ago)

Author:

bhilburn

Message:

Abandoning the RemoteComponent? struct; migrating to a simple socketFD
and boolean field.

Location:

vtcross/trunk/src/include/vtcross

Files:

• components.h (modified) (3 diffs)
• containers.h (modified) (1 diff)
• socketcomm.h (modified) (1 diff)

vtcross/trunk/src/include/vtcross/components.h

@@ -78 +78 @@
         virtual void RegisterServices(int32_t socketFD) = 0;
         virtual void DeregisterServices(int32_t socketFD) = 0;
-
-
-        /* The RemoteComponent struct represents either the VTCROSS shell or the
-         * VTCROSS SML.  If 'SML_present' is false, it is the former. Otherwise,
-         * it is the latter.
-         */
-        bool SML_present;
-        struct RemoteComponent *control;
 };
 
@@ -186 +178 @@
         void ValidateParameters(struct Parameter pList[], \
                 struct CE_Info *ce_info, int decision_array[]);
+
+
+        /* The SML_present bool reflects whether or not the remote component
+         * this object is connected to is an SML.  If it isn't, then it must be
+         * a shell.  The socketFD stores the socket file descriptor for this
+         * connection.
+         */
+        bool SML_present;
+        int32_t socketFD;
 };
 
@@ -239 +240 @@
                 Parameter *parameters, std::string service);
 
-
-        /* Contains information regarding the presence of a service management
-         * layer.  If this pointer is NULL, then there is no SML present in the
-         * radio system.
-         */
-        struct SML_Info *SML;
+        /* The SML_present bool reflects whether or not the remote component
+         * this object is connected to is an SML.  If it isn't, then it must be
+         * a shell.  The socketFD stores the socket file descriptor for this
+         * connection.
+         */
+        bool SML_present;
+        int32_t socketFD;
 };
 

vtcross/trunk/src/include/vtcross/containers.h

@@ -77 +77 @@
 };
 
-
-/* Contains information regarding a remote component in a VTCROSS system.  Note
- * that this information is independent of component type, but technically will
- * only ever be the SML or shell.
- *
- * TODO I'm not 100% certain I'm doing this in the most efficient way.  Need
- * someone to look it over.
- */
-struct RemoteComponent {
-    std::string serverName;
-    int32_t serverPort;
-    int32_t socketFD;
-};
-
 #endif

vtcross/trunk/src/include/vtcross/socketcomm.h

@@ -39 +39 @@
 
 
-/* TODO
- * This is meant as the future replacement for the function below it.  It is
- * still a work in progress, and needs a code-review before we move to it
- * entirely.
- */
-void CreateClientSocket(struct RemoteComponent* serverInfo);
-
-
 /* This is the original function that does what the above function is supposed
  * to do.