From: srossbac <sro...@in...> - 2011-07-19 18:56:12
|
----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://saros-build.imp.fu-berlin.de/reviews/r/109/#review261 ----------------------------------------------------------- /trunk/dpp/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/net/UPnP/UPnPManager.java <http://saros-build.imp.fu-berlin.de/reviews/r/109/#comment218> try { InetAddress address = InetAddress.getByName("..."); return address.isAnyLocalAddress() ? null : address.getHostAddress(); } catch (UnknownHostException e) { } this will also handle ip6 - srossbac On July 19, 2011, 8:42 p.m., gustavs wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://saros-build.imp.fu-berlin.de/reviews/r/109/ > ----------------------------------------------------------- > > (Updated July 19, 2011, 8:42 p.m.) > > > Review request for Saros. > > > Summary > ------- > > Refering to bug report #3348912, switching to UPnP was not working when enabled during session. > > It was difficult to recreate this, but I explored two reasons. > - established IBB bytestream was reused (D'oh!) > - public IP of peers Socks5Proxy was set as last possible stream host address, so local adresses were used first to connect to. > > This patch addresses these two main problems and some minor "nicemakings". > > > Diffs > ----- > > /trunk/dpp/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/Saros.java 3473 > /trunk/dpp/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/net/StunHelper.java 3473 > /trunk/dpp/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/net/UPnP/UPnPManager.java 3473 > /trunk/dpp/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/net/internal/DataTransferManager.java 3473 > /trunk/dpp/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/net/util/NetworkingUtils.java 3473 > /trunk/dpp/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/preferencePages/AdvancedPreferencePage.java 3473 > /trunk/dpp/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/util/UPnPUIUtils.java 3473 > > Diff: http://saros-build.imp.fu-berlin.de/reviews/r/109/diff > > > Testing > ------- > > Manual tested with Saros on a home network behind a UPnP router and a Saros in the FULan. HomeSaros requesting bytestream connection, so FUSaros attempts TCP connection to HomeSaros. > First tested with deactivated portmapping -> IBB > Then activating portmapping in HomeSaros (no restart, no manual disconnect) -> Socks5B (was not possible before patch). > And a test with new sessions, new ports -> Sockst5B > > > Thanks, > > gustavs > > |