Browse files

limit outgoing searches to 300 / allow multisource / compile all loca…

…lizations / bump version number
  • Loading branch information...
1 parent 801e93a commit ce81ce3b60e93871e6ff22ebe3effa642a16683d @isdal isdal committed May 18, 2011
View
4 oneswarm_az_mods/OneSwarmAzMods.properties
@@ -1,5 +1,5 @@
#Build version info
#Wed Aug 11 11:58:54 PDT 2010
OS_AZ_MODS_MAJOR_VERSION=3.0.5.0
-OS_AZ_MODS_MINOR_VERSION=7501
-OS_AZ_MODS_VERSION=3.0.5.0.7501
+OS_AZ_MODS_MINOR_VERSION=7502
+OS_AZ_MODS_VERSION=3.0.5.0.7502
View
13 oneswarm_f2f/src/edu/washington/cs/oneswarm/f2f/network/FriendConnection.java
@@ -78,7 +78,7 @@
/*
* the max search rate, average over 10 s
*/
- public final static double MAX_OUTGOING_SEARCH_RATE = 1000;
+ public final static double MAX_OUTGOING_SEARCH_RATE = 300;
// This is set to 1000 for legacy clients who had a MAX_OUTGOING_SEARCH_RATE
// of 1000.
@@ -1006,9 +1006,8 @@ private void handleSearch(Message message) {
possiblePrune = false;
} else {
// Just always skip sha1;, ed2k; searches for now.
- // TODO(piatek): remove this when some more principled thing is
- // figured out.
- return;
+ // No search drop in 0.7.5
+ // return;
}
} else {
// For now, just disable early drops
@@ -1380,6 +1379,12 @@ private void sendMessage(OSF2FMessage msg, boolean skipQueue) {
private void sendMessage(OSF2FMessage msg, QueueBuckets queueBuckets, boolean skipQueue) {
if (!handShakeReceived) {
+ // We don't buffer search messages -- if the handshake takes a long
+ // time, a large queue may build up, resulting in a flood.
+ if (msg instanceof OSF2FSearch) {
+ logger.finest("Dropping search message prior to handshake.");
+ return;
+ }
bufferedMessages.add(msg);
logger.finer(getDescription() + "waiting for handshake to complete, queue size: "
+ bufferedMessages.size());
View
6 oneswarm_gwt_ui/src/edu/washington/cs/oneswarm/ui/gwt/OneSwarmGWT.gwt.xml
@@ -44,10 +44,10 @@
<source path="rpc" />
<source path="client" />
- <!-- speed up compilation during development -->
+ <!-- speed up compilation during development
<set-property name="user.agent" value="safari,gecko1_8" /> -->
- <!-- localization
+ <!-- localization -->
<extend-property name="locale" values="de_DE" />
<extend-property name="locale" values="es_ES" />
<extend-property name="locale" values="fi_FI" />
@@ -59,6 +59,6 @@
<extend-property name="locale" values="ro_RO" />
<extend-property name="locale" values="ru_RU" />
<extend-property name="locale" values="sv_SE" />
- <extend-property name="locale" values="zh_HANS" /> -->
+ <extend-property name="locale" values="zh_HANS" />
</module>

0 comments on commit ce81ce3

Please sign in to comment.