Diff: TcpClient.cpp

Revision:

10:e4ddab81e6a8

Parent:

9:a156d3de5647

Child:

11:647d53d146f1

--- a/TcpClient.cpp	Tue Aug 27 15:01:10 2019 +0000
+++ b/TcpClient.cpp	Tue Aug 27 22:08:54 2019 +0000
@@ -31,7 +31,7 @@
 
 #define UIP_TCP_PHYH_LEN    UIP_LLH_LEN + UIP_IPTCPH_LEN
 
-uip_userdata_t TcpClient::all_data[UIP_CONNS];
+uip_userdata_t TcpClient::  all_data[UIP_CONNS];
 
 /**
  * @brief
@@ -194,7 +194,7 @@
  * @param
  * @retval
  */
-size_t TcpClient::write(uint8_t c)
+size_t TcpClient::send(uint8_t c)
 {
     return _write(data, &c, 1);
 }
@@ -205,7 +205,7 @@
  * @param
  * @retval
  */
-size_t TcpClient::write(const uint8_t* buf, size_t size)
+size_t TcpClient::send(const uint8_t* buf, size_t size)
 {
     return _write(data, buf, size);
 }
@@ -293,7 +293,7 @@
  * @param
  * @retval
  */
-int TcpClient::available()
+size_t TcpClient::available()
 {
     if (*this)
         return _available(data);
@@ -306,9 +306,9 @@
  * @param
  * @retval
  */
-int TcpClient::_available(uip_userdata_t* u)
+size_t TcpClient::_available(uip_userdata_t* u)
 {
-    int len = 0;
+    size_t  len = 0;
     for (uint8_t i = 0; i < UIP_SOCKET_NUMPACKETS; i++) {
         len += UipEthernet::ethernet->phy.blockSize(u->packets_in[i]);
     }
@@ -322,7 +322,7 @@
  * @param
  * @retval
  */
-int TcpClient::read(uint8_t* buf, size_t size)
+int TcpClient::recv(uint8_t* buf, size_t size)
 {
     if (*this) {
         uint16_t    remain = size;
@@ -366,10 +366,10 @@
  * @param
  * @retval
  */
-int TcpClient::read()
+size_t TcpClient::recv()
 {
     static uint8_t  c;
-    if (read(&c, 1) < 0)
+    if (recv(&c, 1) < 0)
         return -1;
     return c;
 }
@@ -412,6 +412,31 @@
  * @param
  * @retval
  */
+const char* TcpClient::getpeername()
+{
+    static char buf[16];
+    IpAddress   remoteIp = ip_addr_uip(data->ripaddr);
+
+    return remoteIp.toString(buf);
+}
+
+/**
+ * @brief
+ * @note
+ * @param
+ * @retval
+ */
+IpAddress TcpClient::getRemoteIp()
+{
+    return ip_addr_uip(data->ripaddr);
+}
+
+/**
+ * @brief
+ * @note
+ * @param
+ * @retval
+ */
 void TcpClient::close()
 {
     delete this;