commit 17a9da85467bf1e7bcc1d6bb4296cf0eb14823ff
author Jeff Thompson <jeff@thefirst.org> Mon Nov 12 01:11:01 2012 -0800
committer Jeff Thompson <jeff@thefirst.org> Mon Nov 12 01:11:01 2012 -0800
tree 746e79478847dbc63d2d145dba453184dda39b71
parent e306190a5eddc1f8291b64fa82d8dc5ad0e81261

Rename NDNSocketTransport.js to XpcomTransport.js and implement expressInterest.

js/ccnxProtocol/components/ccnxProtocolService.js

diff --git a/js/ccnxProtocol/components/ccnxProtocolService.js b/js/ccnxProtocol/components/ccnxProtocolService.js
index 95e00bd..f5d526d 100644
--- a/js/ccnxProtocol/components/ccnxProtocolService.js
+++ b/js/ccnxProtocol/components/ccnxProtocolService.js
@@ -1,5 +1,5 @@
 /*

- * @author: ucla-cs

+ * @author: Jeff Thompson

  * See COPYING for copyright and distribution information.

  * This is the ccnx protocol handler for NDN.

  * Protocol handling code derived from http://mike.kaply.com/2011/01/18/writing-a-firefox-protocol-handler/

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

                    nsIProtocolHandler.URI_NOAUTH |

                    nsIProtocolHandler.URI_LOADABLE_BY_ANYONE,

+    transport: new XpcomTransport(),

 

     newURI: function(aSpec, aOriginCharset, aBaseURI)

     {

@@ -33,6 +34,8 @@
 

     newChannel: function(aURI)

     {

+        var thisCcnxProtocol = this;

+        

         try {

             var trimmedSpec = aURI.spec.trim();

     

@@ -49,7 +52,9 @@
                 // TODO: Strip off an ending implicit digest before checking the last component?

                 var uriEndsWithSegmentNumber = endsWithSegmentNumber(name);

                 

-                var ndn = new NDN("lioncub.metwi.ucla.edu");

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

+                      // Use the same transport object each time.

+                      getTransport: function() { return thisCcnxProtocol.transport; } });

                 ndn.expressInterest(name, new ContentClosure

                     (ndn, contentListener, uriEndsWithSegmentNumber, aURI.originCharset));

             };