rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

Merge branch 'master' into ide-1.5.x

Browse Source 
Conflicts:
	app/src/processing/app/Base.java
This commit is contained in:
Cristian Maglie 2014-10-10 00:14:22 +02:00
commit 2a912bab62
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build/shared/revisions.txt
View File

@ -1,3 +1,14 @@
ARDUINO 1.5.9
[ide]
* Updated AStyle formatter to v2.04: http://astyle.sourceforge.net/notes.html
The following changes are included also in the Arduino IDE 1.0.7:
[libraries]
* EthernetClien: use IANA recommended ephemeral port range, 49152-65535 (Jack Christensen, cifer-lee)
ARDUINO 1.5.8 BETA - 2014.10.01 ARDUINO 1.5.8 BETA - 2014.10.01
[ide] [ide]
@ -329,6 +340,12 @@ ARDUINO 1.5 BETA - 2012.10.22
* For more info refer to this press release: * For more info refer to this press release:
http://arduino.cc/blog/2012/10/22/arduino-1-5-support-for-the-due-and-other-processors-easier-library-installation-simplified-board-menu-etc/ http://arduino.cc/blog/2012/10/22/arduino-1-5-support-for-the-due-and-other-processors-easier-library-installation-simplified-board-menu-etc/
ARDUINO 1.0.7
[libraries]
* Backported GSM from IDE 1.5.x
* EthernetClien: use IANA recommended ephemeral port range, 49152-65535 (Jack Christensen, cifer-lee)
ARDUINO 1.0.6 - 2014.09.16 ARDUINO 1.0.6 - 2014.09.16
[core] [core]

4
libraries/Ethernet/src/EthernetClient.cpp
View File

@ -12,7 +12,7 @@ extern "C" {
#include "EthernetServer.h" #include "EthernetServer.h"
#include "Dns.h" #include "Dns.h"
uint16_t EthernetClient::_srcport = 1024; uint16_t EthernetClient::_srcport = 49152; //Use IANA recommended ephemeral port range 49152-65535
EthernetClient::EthernetClient() : _sock(MAX_SOCK_NUM) { EthernetClient::EthernetClient() : _sock(MAX_SOCK_NUM) {
} }
@ -51,7 +51,7 @@ int EthernetClient::connect(IPAddress ip, uint16_t port) {
return 0; return 0;
_srcport++; _srcport++;
if (_srcport == 0) _srcport = 1024; if (_srcport == 0) _srcport = 49152; //Use IANA recommended ephemeral port range 49152-65535
socket(_sock, SnMR::TCP, _srcport, 0); socket(_sock, SnMR::TCP, _srcport, 0);
if (!::connect(_sock, rawIPAddress(ip), port)) { if (!::connect(_sock, rawIPAddress(ip), port)) {