主采集逻辑修改中，添加了部分写文件实现

source/OSIF/include/common/buses/network/IPv4NetworkProtocol.h

@@ -0,0 +1,75 @@
+/***************************************************//**
+ * @file    IPv4NetworkProtocol.h
+ * @date    February 2016
+ * @author  Ocean Optics, Inc.
+ *
+ * LICENSE:
+ *
+ * SeaBreeze Copyright (C) 2016, Ocean Optics Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject
+ * to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *******************************************************/
+
+#ifndef SEABREEZE_IPV4NETWORKPROTOCOL_H
+#define SEABREEZE_IPV4NETWORKPROTOCOL_H
+
+#include <string>
+#include <vector>
+
+namespace seabreeze {
+    class IPv4NetworkProtocol {
+    public:
+        virtual ~IPv4NetworkProtocol();
+        virtual std::string getName() const;
+        virtual bool equals(const IPv4NetworkProtocol &that) const;
+
+    protected:
+        IPv4NetworkProtocol(std::string name, int id);
+
+    private:
+        std::string protocolName;
+        int type;
+    };
+    
+    class TCP_IPv4 : public IPv4NetworkProtocol {
+    public:
+        TCP_IPv4();
+        virtual ~TCP_IPv4();
+    };
+    
+    class UDP_IPv4 : public IPv4NetworkProtocol {
+    public:
+        UDP_IPv4();
+        virtual ~UDP_IPv4();
+    };
+
+    class IPv4NetworkProtocols {
+    public:
+        const TCP_IPv4 TCP_IP4;
+        const UDP_IPv4 UDP_IP4;
+
+        IPv4NetworkProtocols();
+        ~IPv4NetworkProtocols();
+        std::vector<IPv4NetworkProtocol *> getAllIPv4NetworkProtocols();
+    };
+}
+
+#endif /* SEABREEZE_IPV4NETWORKPROTOCOL_H */
+

source/OSIF/include/common/buses/network/IPv4SocketDeviceLocator.h

@@ -0,0 +1,66 @@
+/***************************************************//**
+ * @file    IPv4SocketDeviceLocator.h
+ * @date    February 2016
+ * @author  Ocean Optics, Inc.
+ *
+ * LICENSE:
+ *
+ * SeaBreeze Copyright (C) 2016, Ocean Optics Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject
+ * to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *******************************************************/
+
+#ifndef SEABREEZE_IPV4SOCKETDEVICELOCATOR_H
+#define SEABREEZE_IPV4SOCKETDEVICELOCATOR_H
+
+#include "common/buses/DeviceLocatorInterface.h"
+#include "common/buses/network/IPv4NetworkProtocol.h"
+#include <string>
+
+namespace seabreeze {
+    class IPv4SocketDeviceLocator : public DeviceLocatorInterface {
+    public:
+        IPv4SocketDeviceLocator(const IPv4NetworkProtocol &proto, std::string ip,
+            int portNumber);
+        virtual ~IPv4SocketDeviceLocator();
+        
+        std::string getIPv4Address();
+        int getPort();
+        IPv4NetworkProtocol getIPv4NetworkProtocol();
+        
+        /* Inherited from DeviceLocatorInterface */
+        virtual unsigned long getUniqueLocation() const;
+        virtual bool equals(DeviceLocatorInterface &that);
+        virtual std::string getDescription();
+        virtual BusFamily getBusFamily() const;
+        virtual DeviceLocatorInterface *clone() const;
+        
+    protected:
+        unsigned long computeLocationHash();
+        
+        IPv4NetworkProtocol protocol;
+        std::string ipAddr;
+        int port;
+        unsigned long locationHash;
+    };
+}
+
+#endif /* SEABREEZE_IPV4SOCKETDEVICELOCATOR_H */
+

source/OSIF/include/common/buses/network/TCPIPv4SocketBus.h

@@ -0,0 +1,75 @@
+/***************************************************//**
+ * @file    TCPIPv4SocketBus.h
+ * @date    February 2016
+ * @author  Ocean Optics, Inc.
+ *
+ * LICENSE:
+ *
+ * SeaBreeze Copyright (C) 2016, Ocean Optics Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject
+ * to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *******************************************************/
+
+#ifndef SEABREEZE_TCPIPV4SOCKETBUS_H
+#define SEABREEZE_TCPIPV4SOCKETBUS_H
+
+#include "common/buses/Bus.h"
+#include "common/exceptions/IllegalArgumentException.h"
+#include "native/network/Socket.h"
+#include <vector>
+
+namespace seabreeze {
+    class TCPIPv4SocketBus : public Bus {
+    public:
+        TCPIPv4SocketBus();
+        virtual ~TCPIPv4SocketBus();
+        
+        virtual Socket *getSocketDescriptor();
+        
+        virtual BusFamily getBusFamily() const;
+        
+        virtual void setLocation(const DeviceLocatorInterface &location)
+                throw (IllegalArgumentException);
+        virtual DeviceLocatorInterface *getLocation();
+        virtual TransferHelper *getHelper(
+                const std::vector<ProtocolHint *> &hints) const;
+        
+        /* Pure virtual methods */
+        virtual bool open() = 0;
+        virtual void close() = 0;
+        
+        
+    protected:
+        void addHelper(ProtocolHint *hint, TransferHelper *helper);
+        void clearHelpers();
+        
+        Socket *socket;
+        DeviceLocatorInterface *deviceLocator;
+        
+        /* These vectors should really be in a map, but that didn't want to
+         * work easily.  Since there will likely be about 2 entries in here,
+         * storing in a pair of vectors for now won't hurt anything.
+         */
+        std::vector<ProtocolHint *> helperKeys;
+        std::vector<TransferHelper *> helperValues;
+    };
+}
+
+#endif /* SEABREEZE_TCPIPV4SOCKETBUS_H */

source/OSIF/include/common/buses/network/TCPIPv4SocketTransferHelper.h

@@ -0,0 +1,52 @@
+/***************************************************//**
+ * @file    TCPIPv4SocketTransferHelper.h
+ * @date    February 2016
+ * @author  Ocean Optics, Inc.
+ *
+ * LICENSE:
+ *
+ * SeaBreeze Copyright (C) 2016, Ocean Optics Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject
+ * to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *******************************************************/
+
+#ifndef SEABREEZE_TCPIPV4SOCKETTRANSFERHELPER_H
+#define SEABREEZE_TCPIPV4SOCKETTRANSFERHELPER_H
+
+#include "common/buses/TransferHelper.h"
+#include "native/network/Socket.h"
+
+namespace seabreeze {
+    class TCPIPv4SocketTransferHelper : public TransferHelper {
+    public:
+        TCPIPv4SocketTransferHelper(Socket *sock);
+        virtual ~TCPIPv4SocketTransferHelper();
+        
+        virtual int receive(std::vector<byte> &buffer, unsigned int length)
+            throw (BusTransferException);
+        virtual int send(const std::vector<byte> &buffer, unsigned int length) const
+            throw (BusTransferException);
+        
+    protected:
+        Socket *socket;
+    };
+}
+
+#endif /* SEABREEZE_TCPIPV4SOCKETTRANSFERHELPER_H */