Skip to content

Commit 2a912ba

Browse files
committed
Merge branch 'master' into ide-1.5.x
Conflicts: app/src/processing/app/Base.java
2 parents 35d616f + ed5ad42 commit 2a912ba

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

build/shared/revisions.txt

+17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
2+
ARDUINO 1.5.9
3+
4+
[ide]
5+
* Updated AStyle formatter to v2.04: http://astyle.sourceforge.net/notes.html
6+
7+
The following changes are included also in the Arduino IDE 1.0.7:
8+
9+
[libraries]
10+
* EthernetClien: use IANA recommended ephemeral port range, 49152-65535 (Jack Christensen, cifer-lee)
11+
112
ARDUINO 1.5.8 BETA - 2014.10.01
213

314
[ide]
@@ -329,6 +340,12 @@ ARDUINO 1.5 BETA - 2012.10.22
329340
* For more info refer to this press release:
330341
http://arduino.cc/blog/2012/10/22/arduino-1-5-support-for-the-due-and-other-processors-easier-library-installation-simplified-board-menu-etc/
331342

343+
ARDUINO 1.0.7
344+
345+
[libraries]
346+
* Backported GSM from IDE 1.5.x
347+
* EthernetClien: use IANA recommended ephemeral port range, 49152-65535 (Jack Christensen, cifer-lee)
348+
332349
ARDUINO 1.0.6 - 2014.09.16
333350

334351
[core]

libraries/Ethernet/src/EthernetClient.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ extern "C" {
1212
#include "EthernetServer.h"
1313
#include "Dns.h"
1414

15-
uint16_t EthernetClient::_srcport = 1024;
15+
uint16_t EthernetClient::_srcport = 49152; //Use IANA recommended ephemeral port range 49152-65535
1616

1717
EthernetClient::EthernetClient() : _sock(MAX_SOCK_NUM) {
1818
}
@@ -51,7 +51,7 @@ int EthernetClient::connect(IPAddress ip, uint16_t port) {
5151
return 0;
5252

5353
_srcport++;
54-
if (_srcport == 0) _srcport = 1024;
54+
if (_srcport == 0) _srcport = 49152; //Use IANA recommended ephemeral port range 49152-65535
5555
socket(_sock, SnMR::TCP, _srcport, 0);
5656

5757
if (!::connect(_sock, rawIPAddress(ip), port)) {

0 commit comments

Comments
 (0)