mirror of
https://github.com/arduino/Arduino.git
synced 2024-12-10 21:24:12 +01:00
a642f0a15d
The switch from checking _sock against a default value, combined with the checking for unconnected clients in status(), broke the Client. I went back to checking the value of _sock against the default and removed the _connected member altogether because it was redundant (and therefore needed to be kept in sync with _sock).
140 lines
2.8 KiB
C++
140 lines
2.8 KiB
C++
#include "w5100.h"
|
|
#include "socket.h"
|
|
|
|
extern "C" {
|
|
#include "string.h"
|
|
}
|
|
|
|
#include "WProgram.h"
|
|
|
|
#include "Ethernet.h"
|
|
#include "Client.h"
|
|
#include "Server.h"
|
|
|
|
uint16_t Client::_srcport = 1024;
|
|
|
|
Client::Client(uint8_t sock) : _sock(sock) {
|
|
}
|
|
|
|
Client::Client(uint8_t *ip, uint16_t port) : _ip(ip), _port(port), _sock(MAX_SOCK_NUM) {
|
|
}
|
|
|
|
uint8_t Client::connect() {
|
|
if (_sock != MAX_SOCK_NUM)
|
|
return 0;
|
|
|
|
for (int i = 0; i < MAX_SOCK_NUM; i++) {
|
|
uint8_t s = W5100.readSnSR(i);
|
|
if (s == SnSR::CLOSED || s == SnSR::FIN_WAIT) {
|
|
_sock = i;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (_sock == MAX_SOCK_NUM)
|
|
return 0;
|
|
|
|
_srcport++;
|
|
if (_srcport == 0) _srcport = 1024;
|
|
socket(_sock, SnMR::TCP, _srcport, 0);
|
|
|
|
if (!::connect(_sock, _ip, _port)) {
|
|
_sock = MAX_SOCK_NUM;
|
|
return 0;
|
|
}
|
|
|
|
while (status() != SnSR::ESTABLISHED) {
|
|
delay(1);
|
|
if (status() == SnSR::CLOSED) {
|
|
_sock = MAX_SOCK_NUM;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
void Client::write(uint8_t b) {
|
|
if (_sock != MAX_SOCK_NUM)
|
|
send(_sock, &b, 1);
|
|
}
|
|
|
|
void Client::write(const char *str) {
|
|
if (_sock != MAX_SOCK_NUM)
|
|
send(_sock, (const uint8_t *)str, strlen(str));
|
|
}
|
|
|
|
void Client::write(const uint8_t *buf, size_t size) {
|
|
if (_sock != MAX_SOCK_NUM)
|
|
send(_sock, buf, size);
|
|
}
|
|
|
|
int Client::available() {
|
|
if (_sock != MAX_SOCK_NUM)
|
|
return W5100.getRXReceivedSize(_sock);
|
|
return 0;
|
|
}
|
|
|
|
int Client::read() {
|
|
uint8_t b;
|
|
if (!available())
|
|
return -1;
|
|
recv(_sock, &b, 1);
|
|
return b;
|
|
}
|
|
|
|
void Client::flush() {
|
|
while (available())
|
|
read();
|
|
}
|
|
|
|
void Client::stop() {
|
|
if (_sock == MAX_SOCK_NUM)
|
|
return;
|
|
|
|
// attempt to close the connection gracefully (send a FIN to other side)
|
|
disconnect(_sock);
|
|
unsigned long start = millis();
|
|
|
|
// wait a second for the connection to close
|
|
while (status() != SnSR::CLOSED && millis() - start < 1000)
|
|
delay(1);
|
|
|
|
// if it hasn't closed, close it forcefully
|
|
if (status() != SnSR::CLOSED)
|
|
close(_sock);
|
|
|
|
EthernetClass::_server_port[_sock] = 0;
|
|
_sock = MAX_SOCK_NUM;
|
|
}
|
|
|
|
uint8_t Client::connected() {
|
|
if (_sock == MAX_SOCK_NUM) return 0;
|
|
|
|
uint8_t s = status();
|
|
return !(s == SnSR::LISTEN || s == SnSR::CLOSED || s == SnSR::FIN_WAIT ||
|
|
(s == SnSR::CLOSE_WAIT && !available()));
|
|
}
|
|
|
|
uint8_t Client::status() {
|
|
if (_sock == MAX_SOCK_NUM) return SnSR::CLOSED;
|
|
return W5100.readSnSR(_sock);
|
|
}
|
|
|
|
// the next three functions are a hack so we can compare the client returned
|
|
// by Server::available() to null, or use it as the condition in an
|
|
// if-statement. this lets us stay compatible with the Processing network
|
|
// library.
|
|
|
|
uint8_t Client::operator==(int p) {
|
|
return _sock == MAX_SOCK_NUM;
|
|
}
|
|
|
|
uint8_t Client::operator!=(int p) {
|
|
return _sock != MAX_SOCK_NUM;
|
|
}
|
|
|
|
Client::operator bool() {
|
|
return _sock != MAX_SOCK_NUM;
|
|
}
|