aboutsummaryrefslogtreecommitdiff
path: root/libraries/Ethernet
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/Ethernet')
-rw-r--r--libraries/Ethernet/Client.cpp9
-rw-r--r--libraries/Ethernet/Client.h2
-rw-r--r--libraries/Ethernet/Server.cpp15
-rw-r--r--libraries/Ethernet/Server.h2
4 files changed, 26 insertions, 2 deletions
diff --git a/libraries/Ethernet/Client.cpp b/libraries/Ethernet/Client.cpp
index c62e26c..51096db 100644
--- a/libraries/Ethernet/Client.cpp
+++ b/libraries/Ethernet/Client.cpp
@@ -2,6 +2,7 @@ extern "C" {
#include "types.h"
#include "w5100.h"
#include "socket.h"
+ #include "string.h"
}
#include "Ethernet.h"
@@ -50,6 +51,14 @@ void Client::write(uint8_t b) {
send(_sock, &b, 1);
}
+void Client::write(const char *str) {
+ send(_sock, (const uint8_t *)str, strlen(str));
+}
+
+void Client::write(const uint8_t *buf, size_t size) {
+ send(_sock, buf, size);
+}
+
int Client::available() {
return getSn_RX_RSR(_sock);
}
diff --git a/libraries/Ethernet/Client.h b/libraries/Ethernet/Client.h
index f269e9b..7c0ccdf 100644
--- a/libraries/Ethernet/Client.h
+++ b/libraries/Ethernet/Client.h
@@ -15,6 +15,8 @@ public:
uint8_t status();
uint8_t connect();
virtual void write(uint8_t);
+ virtual void write(const char *str);
+ virtual void write(const uint8_t *buf, size_t size);
int available();
int read();
void flush();
diff --git a/libraries/Ethernet/Server.cpp b/libraries/Ethernet/Server.cpp
index 351f838..d17a5d3 100644
--- a/libraries/Ethernet/Server.cpp
+++ b/libraries/Ethernet/Server.cpp
@@ -2,6 +2,7 @@ extern "C" {
#include "types.h"
#include "w5100.h"
#include "socket.h"
+ #include "string.h"
}
#include "Ethernet.h"
@@ -67,6 +68,16 @@ Client Server::available()
void Server::write(uint8_t b)
{
+ write(&b, 1);
+}
+
+void Server::write(const char *str)
+{
+ write((const uint8_t *)str, strlen(str));
+}
+
+void Server::write(const uint8_t *buffer, size_t size)
+{
accept();
for (int sock = 0; sock < MAX_SOCK_NUM; sock++) {
@@ -74,7 +85,7 @@ void Server::write(uint8_t b)
if (EthernetClass::_server_port[sock] == _port &&
client.status() == SOCK_ESTABLISHED) {
- client.write(b);
+ client.write(buffer, size);
}
}
-} \ No newline at end of file
+}
diff --git a/libraries/Ethernet/Server.h b/libraries/Ethernet/Server.h
index d35e691..73d6a5e 100644
--- a/libraries/Ethernet/Server.h
+++ b/libraries/Ethernet/Server.h
@@ -18,6 +18,8 @@ public:
Client available();
void begin();
virtual void write(uint8_t);
+ virtual void write(const char *str);
+ virtual void write(const uint8_t *buf, size_t size);
};
#endif