Permalink
Browse files

merge

  • Loading branch information...
2 parents 8a472e5 + 12f6246 commit 3d0c23035d35537f792b676fc2065b1d455899d6 @CSEMike committed May 23, 2011
Showing with 395 additions and 39 deletions.
  1. +1 −39 .gitignore
  2. +20 −0 404.html
  3. +1 −0 CNAME
  4. +4 −0 _config.yml
  5. +44 −0 _layouts/default.html
  6. +80 −0 about.html
  7. BIN builds/Install_OneSwarm.exe
  8. BIN builds/OneSwarm.dmg
  9. BIN builds/OneSwarm_linux_x86.tar.gz
  10. BIN builds/OneSwarm_linux_x86_64.tar.gz
  11. +21 −0 builds/index.html
  12. +117 −0 css/home.css
  13. +44 −0 download.html
  14. BIN f2f_tr.pdf
  15. BIN favicon.ico
  16. BIN images/dlbutton.png
  17. BIN images/oneswarm_header.jpg
  18. BIN images/osx.jpg
  19. BIN images/preview_overview.jpg
  20. BIN images/preview_remote_access.jpg
  21. BIN images/src.jpg
  22. BIN images/tux.jpg
  23. BIN images/vista.jpg
  24. BIN images/xp.jpg
  25. +56 −0 index.html
  26. +7 −0 uatest.html
  27. BIN wiki-images/configuring-sharing/Manage_visibility_menu.png
  28. BIN wiki-images/configuring-sharing/Manual_sharing.png
  29. BIN wiki-images/configuring-sharing/Permissions.png
  30. BIN wiki-images/configuring-sharing/Share_button.png
  31. BIN wiki-images/configuring-sharing/Watch_directories.png
  32. BIN wiki-images/configuring-sharing/Watchdir_type.png
  33. BIN wiki-images/getting-started/Tut_step1.png
  34. BIN wiki-images/getting-started/Tut_step2.png
  35. BIN wiki-images/getting-started/Tut_step3.png
  36. BIN wiki-images/getting-started/Tut_step4.png
  37. BIN wiki-images/managing-friends/Add_server_dlog.png
  38. BIN wiki-images/managing-friends/Friend_import_wizard.png
  39. BIN wiki-images/managing-friends/Friend_list_addfriend_button.png
  40. BIN wiki-images/managing-friends/Friend_list_notifications.png
  41. BIN wiki-images/managing-friends/Gtalk_import_wizard.png
  42. BIN wiki-images/managing-friends/LAN_exchange.png
  43. BIN wiki-images/managing-friends/Manual_exchange.png
  44. BIN wiki-images/managing-friends/Per_friend_name_limiting.png
  45. BIN wiki-images/managing-friends/Subscribe_feed_selected.png
  46. BIN wiki-images/remote-access/Remote_access_panel.png
  47. BIN wiki-images/remote-access/Settings.png
  48. BIN wiki-images/troubleshooting/Expanded_info.png
  49. BIN wiki-images/troubleshooting/Friend_more_info.png
View
@@ -1,39 +1 @@
-*.class
-.classpath
-.project
-.DS_Store
-.settings
-.svn
-.cvsignore
-.externalToolBuilders
-OneSwarmAzMods.properties
-
-# Build output.
-OneSwarm.jar
-OneSwarmAzMods.jar
-core-bin
-core-dist
-f2f-dist
-gwt-bin
-gwt-dist
-merge-scratch
-build.properties
-build.txt
-error.log
-.gwt/
-
-# Run output
-plugins/
-speed_check.log
-
-# Eclipse
-eclipse-bin/
-
-# Auto-generated source
-oneswarm_gwt_ui/src/edu/washington/cs/oneswarm/ui/gwt/client/i18n/OSMessages.java
-
-# GWT hosted mode
-tomcat/
-oneswarm_gwt_ui/war/WEB-INF/classes/
-oneswarm_gwt_ui/war/oneswarmgwt/
-.gwt-tmp/
+_site/
View
@@ -0,0 +1,20 @@
+<html>
+<HEAD>
+<SCRIPT language="JavaScript">
+<!--
+ function getgoing()
+ {
+ top.location="http://www.oneswarm.org/";
+ }
+
+ setTimeout('getgoing()',10);
+ //-->
+</SCRIPT>
+<title>404 -- Redirect</title>
+</HEAD>
+
+<body>
+<p><a href="http://www.oneswarm.org/">OneSwarm</a></p>
+</body>
+
+</html>
View
1 CNAME
@@ -0,0 +1 @@
+www.oneswarm.org
View
@@ -0,0 +1,4 @@
+markdown: rdiscount
+rdiscount:
+ extensions: [smart]
+pygments: true
View
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+
+ <head>
+ <meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
+ <title>{{ page.title }}</title>
+
+ <link title="styles" href="css/home.css" type="text/css" rel="stylesheet" media="all"/>
+ </head>
+
+ <body bgcolor="#ffffff">
+ <p align="center"><a href="index.html"><img border="0" src="images/oneswarm_header.jpg" alt="OneSwarm" width="800" height="268"></a></p>
+
+ <p id="nav">
+ <a href="index.html">home</a> |
+ <a href="about.html">about</a> |
+ <a href="http://forum.oneswarm.org/">forum</a> |
+ <a href="http://twitter.com/oneswarm">@oneswarm</a> |
+ <a href="https://github.com/CSEMike/OneSwarm/wiki">wiki</a> |
+ <a href="https://github.com/CSEMike/OneSwarm">github</a>
+ <br>
+ </p>
+
+ {{ content }}
+
+ <p id="footer">
+ <a href="http://www.cs.washington.edu/htbin-post/unrestricted/mailto2.pl?to=oneswarm;sub=OneSwarm%20project">Contact</a>
+ </p>
+
+ <!-- Google Analytics -->
+ <script type="text/javascript">
+ var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+ </script>
+ <script type="text/javascript">
+ try {
+ var pageTracker = _gat._getTracker("UA-958379-4");
+ pageTracker._trackPageview();
+ } catch(err) {}</script>
+ <!-- End Google Analytics -->
+
+ </body>
+</html>
View
@@ -0,0 +1,80 @@
+---
+layout: default
+title: OneSwarm - About
+---
+
+<p>Although widely used, currently popular peer-to-peer (P2P) applications offer no user privacy. By design, services like BitTorrent and Gnutella share data with anyone that asks for it, allowing a third-party to <a href="http://dmca.cs.washington.edu/">systematically monitor</a> user behavior. As a result, using a P2P network means that your online activities become public knowledge. </p>
+
+<p>OneSwarm is a new peer-to-peer tool that provides users with explicit control over their privacy by letting them determine how data is shared. Instead of sharing data indiscriminately, data shared with OneSwarm can be made public, it can be shared with friends, shared with some friends but not others, and so forth. We call this friend-to-friend (F2F) data sharing. OneSwarm is:</p>
+
+<ul>
+ <li>
+ <strong>Privacy preserving: </strong>OneSwarm uses source address rewriting to protect user privacy. Instead of always transmitting data directly from sender to receiver (immediately identifying both), OneSwarm may forward data through multiple intermedaries, obscuring the identity of both sender and receiver. For more details, check out the papers below</a>.
+ </li>
+ <li>
+ <strong>User friendly: </strong>OneSwarm&#146;s interface is web-based and supports real-time transcoding of many audio and video formats for in-browser playback, eliminating the need for casual users to master a new application&#146;s interface or search for custom media codecs.
+ </li>
+ <li>
+ <strong>Open: </strong>OneSwarm is freely available and built on existing standards. OneSwarm can operate as a fully backwards compatible BitTorrent client, and its friend-to-friend data sharing features are built on cryptographic standards, e.g., X.509 certificates and SSL encryption.
+ </li>
+</ul>
+
+<h3>Papers</h3>
+
+<p>This paper describes the data sharing features of OneSwarm:</p>
+<ul>
+ <li><a href="http://www.michaelpiatek.com/papers/oneswarm_SIGCOMM.pdf">Privacy-preserving P2P data sharing with OneSwarm</a><br>
+ <div class="nocolor">
+ <a href="http://www.cs.washington.edu/homes/isdal/">Tomas Isdal</a>, <a href="http://www.michaelpiatek.com/">Michael Piatek</a>, <a href="http://www.cs.washington.edu/homes/arvind/">Arvind Krishnamurthy</a>, <a href="http://www.cs.washington.edu/homes/tom/">Thomas Anderson</a><br>
+ <a href="http://www.sigcomm.org/sigcomm2010/">SIGCOMM 2010</a>. </div></li>
+</ul>
+<p>OneSwarm builds on our current and recent work regarding P2P system design. For more information, check out the papers below. </p>
+<ul>
+ <li><a href="http://www.michaelpiatek.com/papers/piatek_hotnets09_p2p_isps.pdf">Pitfalls for ISP-friendly P2P design</a>
+ <br>
+ <div class="nocolor">
+ <a href="http://www.michaelpiatek.com/">Michael Piatek</a>, <a href="http://www.cs.washington.edu/homes/harsha">Harsha V. Madhyastha</a>, <a href="http://www.cs.washington.edu/homes/jjohn/">John P. John</a>, <a href="http://www.cs.washington.edu/homes/arvind/">Arvind Krishnamurthy</a>, <a href="http://www.cs.washington.edu/homes/tom/">Thomas Anderson</a> <br>
+ <a href="http://conferences.sigcomm.org/hotnets/2009/">HotNets 2009</a>.</div></li>
+
+ <li><a href="http://www.michaelpiatek.com/papers/piatek_hotsec08.pdf">Challenges and Directions for Monitoring P2P File Sharing Networks &ndash;or&ndash; Why My Printer Received a DMCA Takedown Notice</a><br>
+ <div class="nocolor">
+ <a href="http://www.michaelpiatek.com/">Michael Piatek</a>, <a href="http://www.cs.washington.edu/homes/yoshi/">Tadayoshi Kohno</a>, <a href="http://www.cs.washington.edu/homes/arvind/">Arvind Krishnamurthy<br>
+ </a><a href="http://www.usenix.org/event/hotsec08/">HotSec 2008</a>. </div></li>
+
+ <li><a href="http://www.michaelpiatek.com/papers/onehop_nsdi08.pdf">One hop Reputations for Peer to Peer File Sharing Workloads</a><br>
+ <div class="nocolor">
+ <a href="http://www.michaelpiatek.com/">Michael Piatek</a>, <a href="http://www.cs.washington.edu/homes/isdal/">Tomas Isdal</a>, <a href="http://www.cs.washington.edu/homes/arvind/">Arvind Krishnamurthy</a>, <a href="http://www.cs.washington.edu/homes/tom/">Thomas Anderson</a><br>
+ <a href="http://www.usenix.org/events/nsdi08/">NSDI 2008</a>.</div></li>
+
+ <li><a href="http://www.michaelpiatek.com/papers/dht_imc_falkner.pdf">Profiling a million user DHT</a><br>
+ <div class="nocolor">
+ Jarret Falkner, <a href="http://www.michaelpiatek.com/">Michael Piatek</a>, <a href="http://www.cs.washington.edu/homes/jjohn/">John P. John</a>, <a href="http://www.cs.washington.edu/homes/arvind/">Arvind Krishnamurthy</a>, <a href="http://www.cs.washington.edu/homes/tom/">Thomas Anderson</a><br>
+ <a href="http://www.imconf.net/imc-2007/">IMC 2007</a>.</div></li>
+
+ <li><a href="http://www.michaelpiatek.com/papers/piatek_fudico3.pdf">A case for holistic incentive design</a><br>
+ <div class="nocolor">
+ <a href="http://www.michaelpiatek.com/">Michael Piatek</a>, <a href="http://www.cs.washington.edu/homes/tom/">Thomas Anderson</a>, <a href="http://www.cs.washington.edu/homes/arvind/">Arvind Krishnamurthy</a><br>
+ Workshop on Future Directions in Distributed Computing (<a href="http://www.cs.utexas.edu/~lorenzo/FuDiCoIII/">FuDiCo III</a>), 2007.</div>
+ </li>
+
+ <li><a href="http://www.michaelpiatek.com/papers/BitTyrant.pdf">Do incentives build robustness in BitTorrent?</a><br>
+ <div class="nocolor">
+ <a href="http://www.michaelpiatek.com/">Michael Piatek</a>, <a href="http://www.cs.washington.edu/homes/isdal/">Tomas Isdal</a>, <a href="http://www.cs.washington.edu/homes/tom/">Thomas Anderson</a>, <a href="http://www.cs.washington.edu/homes/arvind/">Arvind Krishnamurthy</a>, <a href="http://www.cs.umass.edu/%7earun/">Arun Venkataramani</a><br>
+ <a href="http://www.usenix.org/events/nsdi07/">NSDI 2007</a>.</div> </li>
+
+ <li><a href="http://www.michaelpiatek.com/papers/bitprobes_pam.pdf">Leveraging BitTorrent for End Host Measurements</a><br>
+ <div class="nocolor">
+ <a href="http://www.cs.washington.edu/homes/isdal/">Tomas Isdal</a>, <a href="http://www.michaelpiatek.com/">Michael Piatek</a>, <a href="http://www.cs.washington.edu/homes/arvind/">Arvind Krishnamurthy</a>, <a href="http://www.cs.washington.edu/homes/tom/">Thomas Anderson</a><br>
+ <a href="http://pam2007.info.ucl.ac.be/">PAM 2007</a>.</div></li>
+</ul>
+
+<h3>People</h3>
+
+<table id="peopletable" width="750" border="0" cellspacing="2" cellpadding="0">
+ <tr>
+ <td width="25%"><div align="center"><a href="http://www.cs.washington.edu/homes/isdal/">Tomas Isdal</a></div></td>
+ <td width="25%"><div align="center"><a href="http://www.michaelpiatek.com/">Michael Piatek</a></div></td>
+ <td width="25%"><div align="center"><a href="http://www.cs.washington.edu/homes/arvind/">Arvind Krishnamurthy</a></div></td>
+ <td width="25%"><div align="center"><a href="http://www.cs.washington.edu/homes/tom/">Tom Anderson</a></div></td>
+ </tr>
+</table>
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -0,0 +1,21 @@
+<html>
+<HEAD>
+<SCRIPT language="JavaScript">
+<!--
+ function getgoing()
+ {
+ top.location="http://www.oneswarm.org/download.html";
+ }
+
+ setTimeout('getgoing()',10);
+ //-->
+</SCRIPT>
+<title>Redirect</title>
+</HEAD>
+
+<body>
+<p><a href="http://www.oneswarm.org/download.html">Downloads</a></p>
+</body>
+
+</html>
+
View
@@ -0,0 +1,117 @@
+body {
+ font-family: Georgia, Times New Roman, Times, serif;
+ text-align: left;
+ direction: ltr;
+ width: 800px;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+div.mainhead {
+ font-size: 16pt;
+ margin-bottom: 15px;
+ text-align: center;
+font-family: HelveticaNeue-Light, Helvetica, sans-serif;
+ background-color: #feffff;
+}
+
+table#peopletable {
+ font-family: Georgia, Times New Roman, Times, serif;
+}
+
+#nav {
+ text-align: center;
+ padding-bottom: 5px;
+ border-bottom: 1px solid gray;
+ font-family: 'Open Sans', arial, sans-serif;
+ font-size: 21px;
+}
+
+a {
+ text-decoration: none;
+ color: #2200C1;
+}
+
+a:hover {
+ text-decoration: underline;
+ cursor: hand;
+}
+
+div.nocolor a {
+ color: #000000;
+}
+
+.dlbutton {
+ display:block;
+ width:257px;
+ height:67px;
+ text-indent:-9999px;
+}
+
+.dlbutton a {
+ display:block;
+ width:100%;
+ height:100%;
+ background: url(/images/dlbutton.png) no-repeat 0 0;
+ outline:none;
+}
+.dlbutton a:hover {
+ background-position:0 -67px;
+}
+
+div.dltext {
+ font-family: 'Open Sans', arial, sans-serif;
+ font-size: 13px;
+ margin-top: -10px;
+ text-align: center;
+}
+
+div.maincontent {
+ position: relative;
+}
+
+div.buttonpos {
+ margin-left: 13px;
+}
+
+div.dlbox {
+ position: absolute;
+ top: 0;
+ right: 0;
+ float: right;
+ width: 280px;
+ border: 1px solid #ccf;
+ background-color: #f2f2fe;
+}
+
+div.overview {
+ width: 500px;
+}
+
+h3 {
+ border-bottom: 1px solid #36322f;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-variant: normal;
+ font-weight: bold;
+ text-align: left;
+}
+
+li {
+ margin-bottom: 10px;
+}
+
+#footer {
+ text-align: center;
+ font-size: 10pt;
+ border-top: 1px solid #36322f;
+ padding-top: 10px;
+}
+
+#download_table {
+ border: 1px solid #c2c2c2;
+ border-collapse: collapse;
+}
+
+blockquote {
+ width: 650px;
+}
View
@@ -0,0 +1,44 @@
+---
+layout: default
+title: OneSwarm - Private P2P data sharing
+---
+
+<div align="center">
+<table width="725" border="1" cellspacing="0" cellpadding="2">
+ <tr>
+ <td width="44" height="44" align="center" valign="middle">
+ <div align="center"><a href="builds/OneSwarm.dmg"><img
+ src="images/osx.jpg" alt="OSX" width="44" height="44" border="0"></a></div> </td>
+ <td><a href="builds/OneSwarm.dmg">Mac OS X</a> &ndash; 10.6+, 64-bit Intel (Note: 0.7.5 pre-release, includes work-around for 10.6 kernel bug.)</td>
+ </tr>
+ <tr>
+ <td height="44" align="center" valign="middle"><a
+ href="builds/Install_OneSwarm.exe"><img
+ src="images/vista.jpg" alt="Vista" width="39" height="39" border="0"></a></td>
+ <td><a href="builds/Install_OneSwarm.exe">Windows
+ XP/Vista/7</a> (Note: This includes a bundled JRE7 to correct a JVM crash bug in the latest JRE)</td>
+ </tr>
+ <tr>
+ <td width="44" height="44" align="center" valign="middle">
+ <div align="center"><a
+ href="builds/OneSwarm_linux_x86.tar.gz"><img
+ src="images/tux.jpg" alt="Linux32" width="37" height="44" border="0"></a></div> </td>
+ <td><a href="builds/OneSwarm_linux_x86.tar.gz">Linux (32
+ bit)</a></td>
+ </tr>
+ <tr>
+ <td height="44" align="center" valign="middle"><a
+ href="builds/OneSwarm_linux_x86_64.tar.gz"><img
+ src="images/tux.jpg" alt="Linux64" width="37" height="44" border="0"></a></td>
+ <td><a href="builds/OneSwarm_linux_x86_64.tar.gz">Linux
+ (64 bit) </a></td>
+ </tr>
+</table>
+</div>
+
+<p>Thanks for trying out OneSwarm. Remember that OneSwarm is <strong>research
+software</strong> that is still under active development. Do not
+rely on OneSwarm for strong anonymity. Although
+OneSwarm is in active use by many thousands of users, many bugs likely remain
+undiscovered. OneSwarm is free and open source software that is offered
+as is with no warranty.<br>
View
Binary file not shown.
View
Binary file not shown.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.

0 comments on commit 3d0c230

Please sign in to comment.