Skip to content

Commit c11f226

Browse files
commnting code not yet ready to be compiled
1 parent d1e284b commit c11f226

File tree

3 files changed

+33
-32
lines changed

3 files changed

+33
-32
lines changed

Diff for: libraries/Ethernet/src/EthernetClient.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
class EthernetClient : public lwipClient {
88
public:
99
EthernetClient() {}
10-
EthernetClient(struct tcp_struct *tcpClient) : lwipClient(tcpClient) {}
10+
EthernetClient(struct tcp_struct *tcpClient) : lwipClient() {} // FIXME
1111
};
1212

1313
#endif

Diff for: libraries/lwIpWrapper/src/lwipServer.cpp

+19-18
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ void lwipServer::accept()
5151
/* Free client if disconnected */
5252
for (int n = 0; n < MAX_CLIENT; n++) {
5353
if (_tcp_client[n] != NULL) {
54-
lwipClient client(_tcp_client[n]);
55-
if (client.status() == TCP_CLOSING) {
56-
mem_free(_tcp_client[n]);
57-
_tcp_client[n] = NULL;
58-
}
54+
// lwipClient client(_tcp_client[n]); // FIXME
55+
// if (client.status() == TCP_CLOSING) {
56+
// mem_free(_tcp_client[n]);
57+
// _tcp_client[n] = NULL;
58+
// }
5959
}
6060
}
6161
}
@@ -67,19 +67,20 @@ lwipClient lwipServer::available()
6767
for (int n = 0; n < MAX_CLIENT; n++) {
6868
if (_tcp_client[n] != NULL) {
6969
if (_tcp_client[n]->pcb != NULL) {
70-
lwipClient client(_tcp_client[n]);
71-
uint8_t s = client.status();
72-
if (s == TCP_ACCEPTED) {
73-
if (client.available()) {
74-
return client;
75-
}
76-
}
70+
// lwipClient client(_tcp_client[n]); // FIXME
71+
// uint8_t s = client.status();
72+
// if (s == TCP_ACCEPTED) {
73+
// if (client.available()) {
74+
// return client;
75+
// }
76+
// }
7777
}
7878
}
7979
}
8080

8181
struct tcp_struct* default_client = NULL;
82-
return lwipClient(default_client);
82+
return lwipClient(); // FIXME
83+
// return lwipClient(default_client);
8384
}
8485

8586
size_t lwipServer::write(uint8_t b)
@@ -96,11 +97,11 @@ size_t lwipServer::write(const uint8_t* buffer, size_t size)
9697
for (int n = 0; n < MAX_CLIENT; n++) {
9798
if (_tcp_client[n] != NULL) {
9899
if (_tcp_client[n]->pcb != NULL) {
99-
lwipClient client(_tcp_client[n]);
100-
uint8_t s = client.status();
101-
if (s == TCP_ACCEPTED) {
102-
n += client.write(buffer, size);
103-
}
100+
// lwipClient client(_tcp_client[n]);
101+
// uint8_t s = client.status();
102+
// if (s == TCP_ACCEPTED) {
103+
// n += client.write(buffer, size);
104+
// }
104105
}
105106
}
106107
}

Diff for: libraries/lwIpWrapper/src/lwipUDP.cpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ uint8_t lwipUDP::begin(IPAddress ip, uint16_t port, bool multicast)
6464

6565
ip_addr_t ipaddr;
6666
err_t err;
67-
u8_to_ip_addr(rawIPAddress(ip), &ipaddr);
67+
// u8_to_ip_addr(rawIPAddress(ip), &ipaddr); // FIXME
6868
if (multicast) {
6969
err = udp_bind(_udp.pcb, IP_ADDR_ANY, port);
7070
} else {
@@ -86,7 +86,7 @@ uint8_t lwipUDP::begin(IPAddress ip, uint16_t port, bool multicast)
8686
_port = port;
8787
_remaining = 0;
8888

89-
CLwipIf::getInstance().lwip_task();
89+
// CLwipIf::getInstance().lwip_task();
9090

9191
return 1;
9292
}
@@ -107,7 +107,7 @@ void lwipUDP::stop()
107107
_udp.pcb = NULL;
108108
}
109109

110-
CLwipIf::getInstance().lwip_task();
110+
// CLwipIf::getInstance().lwip_task();
111111
}
112112

113113
int lwipUDP::beginPacket(const char* host, uint16_t port)
@@ -135,7 +135,7 @@ int lwipUDP::beginPacket(IPAddress ip, uint16_t port)
135135
_sendtoPort = port;
136136

137137
udp_recv(_udp.pcb, &udp_receive_callback, &_udp);
138-
CLwipIf::getInstance().lwip_task();
138+
// CLwipIf::getInstance().lwip_task();
139139

140140
return 1;
141141
}
@@ -147,16 +147,16 @@ int lwipUDP::endPacket()
147147
}
148148

149149
ip_addr_t ipaddr;
150-
if (ERR_OK != udp_sendto(_udp.pcb, _data, u8_to_ip_addr(rawIPAddress(_sendtoIP), &ipaddr), _sendtoPort)) {
151-
__disable_irq();
152-
_data = pbuffer_free_data(_data);
153-
__enable_irq();
154-
return 0;
155-
}
150+
// if (ERR_OK != udp_sendto(_udp.pcb, _data, u8_to_ip_addr(rawIPAddress(_sendtoIP), &ipaddr), _sendtoPort)) {
151+
// __disable_irq();
152+
// _data = pbuffer_free_data(_data);
153+
// __enable_irq();
154+
// return 0;
155+
// }
156156

157157
_data = NULL;
158158

159-
CLwipIf::getInstance().lwip_task();
159+
// CLwipIf::getInstance().lwip_task();
160160

161161
return 1;
162162
}
@@ -188,10 +188,10 @@ int lwipUDP::parsePacket()
188188
// read();
189189
// }
190190

191-
CLwipIf::getInstance().lwip_task();
191+
// CLwipIf::getInstance().lwip_task();
192192

193193
if (_udp.data.available > 0) {
194-
_remoteIP = IPAddress(ip_addr_to_u32(&(_udp.ip)));
194+
// _remoteIP = IPAddress(ip_addr_to_u32(&(_udp.ip))); // FIXME
195195
_remotePort = _udp.port;
196196
_remaining = _udp.data.available;
197197

0 commit comments

Comments
 (0)