Move expressInterestHelpler from WebSocketTransport up to NDN.
diff --git a/js/WebSocketTransport.js b/js/WebSocketTransport.js
index 316a1f0..15862f4 100644
--- a/js/WebSocketTransport.js
+++ b/js/WebSocketTransport.js
@@ -96,42 +96,8 @@
}
WebSocketTransport.prototype.expressInterest = function(ndn, interest, closure) {
- if (this.ws == null || this.connectedHost != ndn.host || this.connectedPort != ndn.port) {
- var self = this;
- this.connect(ndn, function() { self.expressInterestHelper(ndn, interest, closure); });
- }
+ if (this.ws == null || this.connectedHost != ndn.host || this.connectedPort != ndn.port)
+ this.connect(ndn, function() { ndn.expressInterestHelper(interest, closure); });
else
- this.expressInterestHelper(ndn, interest, closure);
-};
-
-WebSocketTransport.prototype.expressInterestHelper = function(ndn, interest, closure) {
- //TODO: check local content store first
- if (closure != null) {
- var pitEntry = new PITEntry(interest, closure);
- // TODO: This needs to be a single thread-safe transaction on a global object.
- NDN.PITTable.push(pitEntry);
- closure.pitEntry = pitEntry;
- }
-
- // Set interest timer
- if (closure != null) {
- pitEntry.timerID = setTimeout(function() {
- if (LOG > 3) console.log("Interest time out.");
-
- // Remove PIT entry from NDN.PITTable.
- // TODO: Make this a thread-safe operation on the global PITTable.
- var index = NDN.PITTable.indexOf(pitEntry);
- //console.log(NDN.PITTable);
- if (index >= 0)
- NDN.PITTable.splice(index, 1);
- //console.log(NDN.PITTable);
- //console.log(pitEntry.interest.name.getName());
-
- // Raise closure callback
- closure.upcall(Closure.UPCALL_INTEREST_TIMED_OUT, new UpcallInfo(ndn, interest, 0, null));
- }, interest.interestLifetime); // interestLifetime is in milliseconds.
- //console.log(closure.timerID);
- }
-
- this.send(encodeToBinaryInterest(interest));
+ ndn.expressInterestHelper(interest, closure);
};