Browse Source

AP_HAL_Linux: renamed TCPClientDevice

master
Staroselskii Georgii 10 years ago committed by Andrew Tridgell
parent
commit
0362128265
  1. 18
      libraries/AP_HAL_Linux/TCPServerDevice.cpp
  2. 6
      libraries/AP_HAL_Linux/TCPServerDevice.h
  3. 6
      libraries/AP_HAL_Linux/UARTDriver.cpp

18
libraries/AP_HAL_Linux/TCPClientDevice.cpp → libraries/AP_HAL_Linux/TCPServerDevice.cpp

@ -7,30 +7,30 @@ @@ -7,30 +7,30 @@
#include <errno.h>
#include <stdlib.h>
#include "TCPClientDevice.h"
#include "TCPServerDevice.h"
TCPClientDevice::TCPClientDevice(const char *ip, uint16_t port):
TCPServerDevice::TCPServerDevice(const char *ip, uint16_t port):
_ip(ip),
_port(port)
{
}
TCPClientDevice::~TCPClientDevice()
TCPServerDevice::~TCPServerDevice()
{
}
ssize_t TCPClientDevice::write(const uint8_t *buf, uint16_t n)
ssize_t TCPServerDevice::write(const uint8_t *buf, uint16_t n)
{
return listener.send(buf, n);
}
ssize_t TCPClientDevice::read(uint8_t *buf, uint16_t n)
ssize_t TCPServerDevice::read(uint8_t *buf, uint16_t n)
{
return listener.recv(buf, n, 1);
}
bool TCPClientDevice::open()
bool TCPServerDevice::open()
{
listener.reuseaddress();
@ -47,17 +47,17 @@ bool TCPClientDevice::open() @@ -47,17 +47,17 @@ bool TCPClientDevice::open()
return true;
}
bool TCPClientDevice::close()
bool TCPServerDevice::close()
{
return true;
}
void TCPClientDevice::set_blocking(bool blocking)
void TCPServerDevice::set_blocking(bool blocking)
{
listener.set_blocking(blocking);
}
void TCPClientDevice::set_speed(uint32_t speed)
void TCPServerDevice::set_speed(uint32_t speed)
{
}

6
libraries/AP_HAL_Linux/TCPClientDevice.h → libraries/AP_HAL_Linux/TCPServerDevice.h

@ -4,10 +4,10 @@ @@ -4,10 +4,10 @@
#include "SerialDevice.h"
#include "../AP_HAL/utility/Socket.h"
class TCPClientDevice: public SerialDevice {
class TCPServerDevice: public SerialDevice {
public:
TCPClientDevice(const char *ip, uint16_t port);
virtual ~TCPClientDevice();
TCPServerDevice(const char *ip, uint16_t port);
virtual ~TCPServerDevice();
virtual bool open() override;
virtual bool close() override;

6
libraries/AP_HAL_Linux/UARTDriver.cpp

@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
#include "UARTDevice.h"
#include "UDPDevice.h"
#include "ConsoleDevice.h"
#include "TCPClientDevice.h"
#include "TCPServerDevice.h"
#include "TCPBlockingServerDevice.h"
extern const AP_HAL::HAL& hal;
@ -260,10 +260,10 @@ void LinuxUARTDriver::_tcp_start_connection(void) @@ -260,10 +260,10 @@ void LinuxUARTDriver::_tcp_start_connection(void)
if (!strcmp(_flag, "wait")) {
_device = new TCPBlockingServerDevice(_ip, _base_port);
} else {
_device = new TCPClientDevice(_ip, _base_port);
_device = new TCPServerDevice(_ip, _base_port);
}
} else {
_device = new TCPClientDevice(_ip, _base_port);
_device = new TCPServerDevice(_ip, _base_port);
}
if (_device->open()) {

Loading…
Cancel
Save