Diff: TcpClient.h

Revision:

10:e4ddab81e6a8

Parent:

9:a156d3de5647

Child:

11:647d53d146f1

--- a/TcpClient.h	Tue Aug 27 15:01:10 2019 +0000
+++ b/TcpClient.h	Tue Aug 27 22:08:54 2019 +0000
@@ -20,7 +20,7 @@
 #define UIPCLIENT_H
 
 #include "mbed.h"
-#include "Client.h"
+#include "IpAddress.h"
 #include "utility/MemPool.h"
 
 extern "C"
@@ -44,53 +44,56 @@
 
 typedef struct
 {
-    uint8_t     state;
-    memhandle   packets_in[UIP_SOCKET_NUMPACKETS];
-    uint16_t    lport;  /**< The local TCP port, in network byte order. */
+    uint8_t         state;
+    memhandle       packets_in[UIP_SOCKET_NUMPACKETS];
+    uint16_t        lport;      /**< The local TCP port, in network byte order. */
 } uip_userdata_closed_t;
 
 typedef struct
 {
-    Timer       pollTimer;
-    uint8_t     state;
-    memhandle   packets_in[UIP_SOCKET_NUMPACKETS];
-    memhandle   packets_out[UIP_SOCKET_NUMPACKETS];
-    memaddress  out_pos;
+    Timer           pollTimer;
+    uint8_t         state;
+    uip_ipaddr_t    ripaddr;    /**< The IP address of the remote host. */
+    memhandle       packets_in[UIP_SOCKET_NUMPACKETS];
+    memhandle       packets_out[UIP_SOCKET_NUMPACKETS];
+    memaddress      out_pos;
 } uip_userdata_t;
 
-class TcpClient : public Client
+class TcpClient
 {
 public:
     TcpClient();
-    //TcpClient(UIPEthernet* ethernet);
-    //TcpClient(struct uip_conn* _conn);
-    //TcpClient(struct uip_conn* _conn, UIPEthernet* ethernet);
     TcpClient(uip_userdata_t* conn_data);
-    //TcpClient(uip_userdata_t* conn_data, UIPEthernet* ethernet);
     virtual ~TcpClient() {}
+
     int                     connect(IpAddress ip, uint16_t port);
     int                     connect(const char* host, uint16_t port);
-    int                     read(uint8_t* buf, size_t size);
+    int                     recv(uint8_t* buf, size_t size);
     void                    stop();
     uint8_t                 connected();
     operator                bool();
     virtual bool operator   ==(const TcpClient& );
     virtual bool operator   !=(const TcpClient& rhs)    { return !this->operator ==(rhs); }
-    size_t                  write(uint8_t);
-    size_t                  write(const uint8_t* buf, size_t size);
-    int                     available();
-    int                     read();
+    size_t                  send(uint8_t);
+    size_t                  send(const uint8_t* buf, size_t size);
+    size_t                  available();
+    size_t                  recv();
     int                     peek();
     void                    flush();
+    const char*             getpeername();
+    IpAddress               getRemoteIp();
     void                    close();
 
     static uip_userdata_t   all_data[UIP_CONNS];
     static size_t           _write(uip_userdata_t* , const uint8_t* buf, size_t size);
 
+protected:
+    uint8_t*                rawIPAddress(IpAddress& addr)   { return addr.rawAddress(); }
+
 private:
     uip_userdata_t*         data;
     static uip_userdata_t*  _allocateData();
-    static int              _available(uip_userdata_t* );
+    static size_t           _available(uip_userdata_t* );
     static uint8_t          _currentBlock(memhandle* blocks);
     static void             _eatBlock(memhandle* blocks);
     static void             _flushBlocks(memhandle* blocks);