Skip to content

Commit a388e5e

Browse files
committed
SignalHandler
1 parent d1a2b79 commit a388e5e

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

ArduinoCore-Linux/cores/arduino/Ethernet.h

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,6 @@ class EthernetClient : public Client {
8484
}
8585
}
8686

87-
private:
88-
void registerCleanup() {
89-
static bool signal_registered = false;
90-
if (!signal_registered) {
91-
SignalHandler::registerHandler(SIGINT, cleanupAll);
92-
SignalHandler::registerHandler(SIGTERM, cleanupAll);
93-
signal_registered = true;
94-
}
95-
}
96-
9787
//EthernetClient(const EthernetClient&) = delete;
9888

9989
// checks if we are connected - using a timeout
@@ -261,6 +251,15 @@ class EthernetClient : public Client {
261251
IPAddress address{0, 0, 0, 0};
262252
uint16_t port = 0;
263253

254+
void registerCleanup() {
255+
static bool signal_registered = false;
256+
if (!signal_registered) {
257+
SignalHandler::registerHandler(SIGINT, cleanupAll);
258+
SignalHandler::registerHandler(SIGTERM, cleanupAll);
259+
signal_registered = true;
260+
}
261+
}
262+
264263
int read(uint8_t* buffer, size_t len) override {
265264
Logger.debug(WIFICLIENT, "read");
266265
int result = 0;

ArduinoCore-Linux/cores/arduino/WiFiUdp.h

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,6 @@ class WiFiUDP : public UDP {
7070
public:
7171
WiFiUDP();
7272
~WiFiUDP();
73-
void registerCleanup() {
74-
static bool signal_registered = false;
75-
if (!signal_registered) {
76-
SignalHandler::registerHandler(SIGINT, cleanupAll);
77-
SignalHandler::registerHandler(SIGTERM, cleanupAll);
78-
signal_registered = true;
79-
}
80-
}
8173
uint8_t begin(IPAddress a, uint16_t p);
8274
uint8_t begin(uint16_t p);
8375
uint8_t beginMulticast(IPAddress a, uint16_t p);
@@ -98,6 +90,17 @@ class WiFiUDP : public UDP {
9890
void flush();
9991
IPAddress remoteIP();
10092
uint16_t remotePort();
93+
94+
protected:
95+
void registerCleanup() {
96+
static bool signal_registered = false;
97+
if (!signal_registered) {
98+
SignalHandler::registerHandler(SIGINT, cleanupAll);
99+
SignalHandler::registerHandler(SIGTERM, cleanupAll);
100+
signal_registered = true;
101+
}
102+
}
103+
101104
};
102105

103106
} // namespace arduino

0 commit comments

Comments
 (0)