From: Ramakrishnan Muthukrishnan <ram@rkrishnan.org>
Date: Sun, 12 Jul 2015 10:53:54 +0000 (+0530)
Subject: Merge branch 'piece-manager'
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=fc0b86a82c6c8a3155163a1864820ea779ffb7e4;hp=e047e30d9d83a4f44ad56f0a70c953350a3cb55a;p=functorrent.git

Merge branch 'piece-manager'
---

diff --git a/README.md b/README.md
index 4885b0e..6100197 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # A bittorrent client.
 
+[![Join the chat at https://gitter.im/vu3rdd/functorrent](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/vu3rdd/functorrent?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 [![Build Status](https://travis-ci.org/vu3rdd/functorrent.svg?branch=master)](https://travis-ci.org/vu3rdd/functorrent)
 
 ## Building
@@ -30,6 +32,8 @@ shell which has all the package dependencies installed.
 
 ## Goals
 
+- [Optimized for Fun](http://www.slideshare.net/autang/ofun-optimizing-for-fun).
+  (should have called it "funtorrent")
 - Become more profient with Haskell.
 - Implement something non-trivial with Haskell (crypto, file operations, network
   operations, concurrency, bit twiddling, DHT).
@@ -44,11 +48,13 @@ shell which has all the package dependencies installed.
 - talk to the tracker and get the peer list
 - the `main' program takes a torrent file (in the local file system) as input and
   prints the {ip,port} for each peer, after talking to the tracker.
+- can handshake with the peer.
+- peer wire protocol (in progress)
 
 ## TODO
 
 *    Test suite.
-*    Peer protocol.
+*    Peer protocol (in progress).
 *    Get the file download working in the simplest possible way.
 *    Concurrency (threads per peer)
 *    other advanced features of Bit Torrent (like DHT).