commit 3d6ce9414248cfb923e5ca2fdb43e17c8be72588
author Jeff Thompson <jeff@thefirst.org> Sun Dec 16 12:11:42 2012 -0800
committer Jeff Thompson <jeff@thefirst.org> Sun Dec 16 12:11:42 2012 -0800
tree f264ac8f5e3b3803d67e5ade293c7be25d65060c
parent 35cfc26b37046bbf2d03f7d425822a6bccc061ea

Create and keep one NDN object.  Allow it to use XpcomTransport.defaultGetHostAndPort to select a testbed host at random.

js/ndnProtocol/components/ndnProtocolService.js

diff --git a/js/ndnProtocol/components/ndnProtocolService.js b/js/ndnProtocol/components/ndnProtocolService.js
index 290f91a..31749d5 100644
--- a/js/ndnProtocol/components/ndnProtocolService.js
+++ b/js/ndnProtocol/components/ndnProtocolService.js
@@ -16,6 +16,8 @@
 Components.utils.import("chrome://modules/content/ContentChannel.jsm");

 

 function NdnProtocol() {

+    this.ndn = new NDN({ getTransport: function() { return new XpcomTransport(); } });

+    this.ndn.host = null; // TODO: Remove this when null is the default.

 }

 

 NdnProtocol.prototype = {

@@ -23,7 +25,6 @@
     protocolFlags: nsIProtocolHandler.URI_NORELATIVE |

                    nsIProtocolHandler.URI_NOAUTH |

                    nsIProtocolHandler.URI_LOADABLE_BY_ANYONE,

-    transport: new XpcomTransport(),

 

     newURI: function(aSpec, aOriginCharset, aBaseURI)

     {

@@ -55,7 +56,7 @@
     

             var template = new Interest(new Name([]));

             // Use the same default as NDN.expressInterest.

-            template.interestLifetime = 4200;

+            template.interestLifetime = 4.0;

             var searchWithoutNdn = extractNdnSearch(search, template);

     

             var requestContent = function(contentListener) {                

@@ -63,11 +64,9 @@
                 // TODO: Strip off an ending implicit digest before checking the last component?

                 var uriEndsWithSegmentNumber = endsWithSegmentNumber(name);

                 

-                var ndn = new NDN({ host: "lioncub.metwi.ucla.edu", port: 9695,

-                      // Use the same transport object each time.

-                      getTransport: function() { return thisNdnProtocol.transport; } });

-                ndn.expressInterest(name, 

-                    new ContentClosure(ndn, contentListener, uriEndsWithSegmentNumber, 

+                // Use the same NDN object each time.

+                thisNdnProtocol.ndn.expressInterest(name, 

+                    new ContentClosure(thisNdnProtocol.ndn, contentListener, uriEndsWithSegmentNumber, 

                             aURI.originCharset, searchWithoutNdn + hash),

                     template);

             };

@@ -82,7 +81,7 @@
     contractID: "@mozilla.org/network/protocol;1?name=" + "ndn",

     classID: Components.ID('{8122e660-1012-11e2-892e-0800200c9a66}'),

     QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler])

-}

+};

 

 if (XPCOMUtils.generateNSGetFactory)

     var NSGetFactory = XPCOMUtils.generateNSGetFactory([NdnProtocol]);

@@ -112,7 +111,7 @@
     this.firstReceivedSegmentNumber = null;

     this.firstReceivedContentObject = null;

     this.contentSha256 = null;

-}

+};

 

 ContentClosure.prototype.upcall = function(kind, upcallInfo) {

     if (!(kind == Closure.UPCALL_CONTENT ||