arduino_osc / libraries / Ethernet / UdpString.cpp

Diff from to

libraries/Ethernet/UdpString.cpp

 	return readPacket(str,ip,port);
 }
 
+/* read packet into String str - if str is too short, expand its capacity */
 int UdpStringClass::readPacket(String &str, byte * ip, unsigned int *port) {
-	if(available() > str.capacity()) {
-		return 0; //can't read - string too small - this is BAD because we didn't drain the buffer
+	int len = available() -8; //skip UDP header
+	if(len <= 0) return 0;
+	if(len > str.capacity()) {
+		//packet is longer than string capacity - 
+		//resize string - this is very implementation dependent on WString
+		str = String(len);		
+		//fall through to read which should be ok now
 	}
 	return (int)recvfrom(_sock,(byte *)(str.cstr()),(uint16_t)str.capacity(),ip,port);
 }
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.