Connections now use two separate threads for writing and listening
- this should avoid dead locks, specifically when connecting to Jabit :/ - also, Java 8 features are now allowed in modules not needed by Android clients
This commit is contained in:
@ -23,7 +23,6 @@ import ch.dissem.bitmessage.entity.Plaintext;
|
||||
import ch.dissem.bitmessage.entity.payload.*;
|
||||
import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
|
||||
import ch.dissem.bitmessage.exception.NodeException;
|
||||
import ch.dissem.bitmessage.ports.Security;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -155,7 +154,7 @@ public class Factory {
|
||||
}
|
||||
}
|
||||
// fallback: just store the message - we don't really care what it is
|
||||
// LOG.info("Unexpected object type: " + objectType);
|
||||
LOG.trace("Unexpected object type: " + objectType);
|
||||
return GenericPayload.read(version, stream, streamNumber, length);
|
||||
}
|
||||
|
||||
|
@ -26,17 +26,32 @@ import java.util.List;
|
||||
* The Inventory stores and retrieves objects, cleans up outdated objects and can tell which objects are still missing.
|
||||
*/
|
||||
public interface Inventory {
|
||||
/**
|
||||
* Returns the IVs of all valid objects we have for the given streams
|
||||
*/
|
||||
List<InventoryVector> getInventory(long... streams);
|
||||
|
||||
/**
|
||||
* Returns the IVs of all objects in the offer that we don't have already. Implementations are allowed to
|
||||
* ignore the streams parameter, but it must be set when calling this method.
|
||||
*/
|
||||
List<InventoryVector> getMissing(List<InventoryVector> offer, long... streams);
|
||||
|
||||
ObjectMessage getObject(InventoryVector vector);
|
||||
|
||||
/**
|
||||
* This method is mainly used to search for public keys to newly added addresses or broadcasts from new
|
||||
* subscriptions.
|
||||
*/
|
||||
List<ObjectMessage> getObjects(long stream, long version, ObjectType... types);
|
||||
|
||||
void storeObject(ObjectMessage object);
|
||||
|
||||
boolean contains(ObjectMessage object);
|
||||
|
||||
/**
|
||||
* Deletes all objects that expired 5 minutes ago or earlier
|
||||
* (so we don't accidentally request objects we just deleted)
|
||||
*/
|
||||
void cleanup();
|
||||
}
|
||||
|
@ -12,7 +12,6 @@
|
||||
109.147.204.113:1195
|
||||
178.11.46.221:8444
|
||||
|
||||
# Add named nodes at the end, as resolving them might take time
|
||||
dissem.ch:8444
|
||||
|
||||
[stream 2]
|
||||
|
Reference in New Issue
Block a user