The rest of the renaming.

diff --git a/compat.h b/compat.h
index ffd1378..67a0125 100644 (file)
--- a/compat.h
+++ b/compat.h
@@ -6,8 +6,8 @@
  *  Copyright 2009 Delft University of Technology. All rights reserved.
  *
  */
-#ifndef P2TP_COMPAT_H
-#define P2TP_COMPAT_H
+#ifndef SWIFT_COMPAT_H
+#define SWIFT_COMPAT_H
 
 #ifdef _MSC_VER
 #include "compat/stdint.h"

diff --git a/datagram.cpp b/datagram.cpp
index 93124e0..116b495 100644 (file)
--- a/datagram.cpp
+++ b/datagram.cpp
@@ -215,7 +215,7 @@ std::string sock2str (struct sockaddr_in addr) {
 }
 
 /*
-std::string Datagram::to_string () const { // TODO: pretty-print P2TP
+std::string Datagram::to_string () const { // TODO: pretty-print swift
     std::string addrs = sock2str(addr);
     char hex[MAXDGRAMSZ*2];
     for(int i=offset; i<length; i++)

diff --git a/exec/leecher.cpp b/exec/leecher.cpp
index 38cdaa7..be35e35 100644 (file)
--- a/exec/leecher.cpp
+++ b/exec/leecher.cpp
@@ -13,7 +13,7 @@
 using namespace swift;
 
 
-/** P2TP downloader. Params: root hash, filename, tracker ip/port, own ip/port */
+/** swift downloader. Params: root hash, filename, tracker ip/port, own ip/port */
 int main (int argn, char** args) {
 
     srand(time(NULL));

diff --git a/exec/seeder.cpp b/exec/seeder.cpp
index 9f78fa6..3155efe 100644 (file)
--- a/exec/seeder.cpp
+++ b/exec/seeder.cpp
@@ -12,7 +12,7 @@
 using namespace swift;
 
 
-/** P2TP seeder. Params: filename, own ip/port, tracker ip/port */
+/** swift seeder. Params: filename, own ip/port, tracker ip/port */
 int main (int argn, char** args) {
 
     if (argn<3) {

diff --git a/exec/trial.cpp b/exec/trial.cpp
index 2850be1..d61d5b7 100644 (file)
--- a/exec/trial.cpp
+++ b/exec/trial.cpp
@@ -18,7 +18,7 @@
 using namespace swift;
 
 
-/** P2TP downloader. Params: root hash, filename, tracker ip/port, own ip/port */
+/** swift downloader. Params: root hash, filename, tracker ip/port, own ip/port */
 int main (int argn, char** args) {
     THIS IS NOT TRIAL BRANCH
     srand(time(NULL));

diff --git a/hashtree.h b/hashtree.h
index e31d8a4..3cbf902 100644 (file)
--- a/hashtree.h
+++ b/hashtree.h
@@ -6,8 +6,8 @@
  *  Copyright 2009 Delft University of Technology. All rights reserved.
  *
  */
-#ifndef P2TP_SHA1_HASH_TREE_H
-#define P2TP_SHA1_HASH_TREE_H
+#ifndef SWIFT_SHA1_HASH_TREE_H
+#define SWIFT_SHA1_HASH_TREE_H
 #include "bin64.h"
 #include "bins.h"
 #include <string.h>

diff --git a/sendrecv.cpp b/sendrecv.cpp
index 1533ce5..5312869 100644 (file)
--- a/sendrecv.cpp
+++ b/sendrecv.cpp
@@ -22,7 +22,7 @@ using namespace std;
 void    Channel::AddPeakHashes (Datagram& dgram) {
     for(int i=0; i<file().peak_count(); i++) {
         bin64_t peak = file().peak(i);
-        dgram.Push8(P2TP_HASH);
+        dgram.Push8(SWIFT_HASH);
         dgram.Push32((uint32_t)peak);
         dgram.PushHash(file().peak_hash(i));
         //DLOG(INFO)<<"#"<<id<<" +pHASH"<<file().peak(i);
@@ -36,7 +36,7 @@ void    Channel::AddUncleHashes (Datagram& dgram, bin64_t pos) {
     while (pos!=peak && ((NOW&3)==3 || !data_out_cap_.within(pos.parent())) &&
             ack_in_.get(pos.parent())==binmap_t::EMPTY  ) {
         bin64_t uncle = pos.sibling();
-        dgram.Push8(P2TP_HASH);
+        dgram.Push8(SWIFT_HASH);
         dgram.Push32((uint32_t)uncle);
         dgram.PushHash( file().hash(uncle) );
         //DLOG(INFO)<<"#"<<id<<" +uHASH"<<uncle;
@@ -88,13 +88,13 @@ bin64_t        Channel::DequeueHint () {
 
 void    Channel::AddHandshake (Datagram& dgram) {
     if (!peer_channel_id_) { // initiating
-        dgram.Push8(P2TP_HASH);
+        dgram.Push8(SWIFT_HASH);
         dgram.Push32(bin64_t::ALL32);
         dgram.PushHash(file().root_hash());
         dprintf("%s #%u +hash ALL %s\n",
                 tintstr(),id_,file().root_hash().hex().c_str());
     }
-    dgram.Push8(P2TP_HANDSHAKE);
+    dgram.Push8(SWIFT_HANDSHAKE);
     int encoded = EncodeID(id_);
     dgram.Push32(encoded);
     dprintf("%s #%u +hs %x\n",tintstr(),id_,encoded);
@@ -165,7 +165,7 @@ void    Channel::AddHint (Datagram& dgram) {
         bin64_t hint = transfer().picker().Pick(ack_in_,diff,NOW+plan_for*2);
         
         if (hint!=bin64_t::NONE) {
-            dgram.Push8(P2TP_HINT);
+            dgram.Push8(SWIFT_HINT);
             dgram.Push32(hint);
             dprintf("%s #%u +hint %s [%lli]\n",tintstr(),id_,hint.str(),hint_out_size_);
             hint_out_.push_back(hint);
@@ -207,7 +207,7 @@ bin64_t        Channel::AddData (Datagram& dgram) {
         dgram.Push32(peer_channel_id_);
     }
     
-    dgram.Push8(P2TP_DATA);
+    dgram.Push8(SWIFT_DATA);
     dgram.Push32(tosend.to32());
     
     uint8_t buf[1024];
@@ -229,7 +229,7 @@ bin64_t        Channel::AddData (Datagram& dgram) {
 
 
 void    Channel::AddTs (Datagram& dgram) {
-    dgram.Push8(P2TP_TS);
+    dgram.Push8(SWIFT_TS);
     dgram.Push64(data_in_.time);
     dprintf("%s #%u +ts %s\n",tintstr(),id_,tintstr(data_in_.time));
 }
@@ -237,14 +237,14 @@ void    Channel::AddTs (Datagram& dgram) {
 
 void    Channel::AddAck (Datagram& dgram) {
     if (data_in_dbl_!=bin64_t::NONE) { // TODO: do redundancy better
-        dgram.Push8(P2TP_ACK);
+        dgram.Push8(SWIFT_ACK);
         dgram.Push32(data_in_dbl_.to32());
         data_in_dbl_=bin64_t::NONE;
     }
     if (data_in_.time!=TINT_NEVER) { // TODO: ACK NONE for corrupted data
         AddTs(dgram);
         bin64_t pos = file().ack_out().cover(data_in_.bin);
-        dgram.Push8(P2TP_ACK);
+        dgram.Push8(SWIFT_ACK);
         dgram.Push32(pos.to32());
         //dgram.Push64(data_in_.time);
         ack_out_.set(pos);
@@ -259,7 +259,7 @@ void    Channel::AddAck (Datagram& dgram) {
             break;
         ack = file().ack_out().cover(ack);
         ack_out_.set(ack);
-        dgram.Push8(P2TP_ACK);
+        dgram.Push8(SWIFT_ACK);
         dgram.Push32(ack.to32());
         dprintf("%s #%u +ack %s\n",tintstr(),id_,ack.str());
     }
@@ -280,13 +280,13 @@ void    Channel::Recv (Datagram& dgram) {
     while (dgram.size()) {
         uint8_t type = dgram.Pull8();
         switch (type) {
-            case P2TP_HANDSHAKE: OnHandshake(dgram); break;
-            case P2TP_DATA:      data=OnData(dgram); break;
-            case P2TP_TS:        OnTs(dgram); break;
-            case P2TP_ACK:       OnAck(dgram); break;
-            case P2TP_HASH:      OnHash(dgram); break;
-            case P2TP_HINT:      OnHint(dgram); break;
-            case P2TP_PEX_ADD:   OnPex(dgram); break;
+            case SWIFT_HANDSHAKE: OnHandshake(dgram); break;
+            case SWIFT_DATA:      data=OnData(dgram); break;
+            case SWIFT_TS:        OnTs(dgram); break;
+            case SWIFT_ACK:       OnAck(dgram); break;
+            case SWIFT_HASH:      OnHash(dgram); break;
+            case SWIFT_HINT:      OnHint(dgram); break;
+            case SWIFT_PEX_ADD:   OnPex(dgram); break;
             default:
                 eprintf("%s #%u ?msg id unknown %i\n",tintstr(),id_,(int)type);
                 return;
@@ -474,7 +474,7 @@ void    Channel::AddPex (Datagram& dgram) {
     if (chid==-1 || chid==id_)
         return;
     Address a = channels[chid]->peer();
-    dgram.Push8(P2TP_PEX_ADD);
+    dgram.Push8(SWIFT_PEX_ADD);
     dgram.Push32(a.ipv4());
     dgram.Push16(a.port());
     dprintf("%s #%u +pex %s\n",tintstr(),id_,a.str());
@@ -495,7 +495,7 @@ Channel*    Channel::RecvDatagram (int socket) {
         if (data.size()<1+4+1+4+Sha1Hash::SIZE) 
             return_log ("incorrect size %i initial handshake packet %s\n",data.size(),addr.str());
         uint8_t hashid = data.Pull8();
-        if (hashid!=P2TP_HASH) 
+        if (hashid!=SWIFT_HASH) 
             return_log ("no hash in the initial handshake %s\n",addr.str());
         bin64_t pos = data.Pull32();
         if (pos!=bin64_t::ALL) 

diff --git a/swift.cpp b/swift.cpp
index 350a1fd..6d432c5 100644 (file)
--- a/swift.cpp
+++ b/swift.cpp
@@ -178,7 +178,7 @@ const Sha1Hash& swift::RootMerkleHash (int file) {
 }
 
 
-/**    <h2> P2TP handshake </h2>
+/**    <h2> swift handshake </h2>
  Basic rules:
  <ul>
  <li>    to send a datagram, a channel must be created

diff --git a/swift.h b/swift.h
index 0dc3240..d6d14ae 100644 (file)
--- a/swift.h
+++ b/swift.h
@@ -8,7 +8,7 @@
  */
 /*
 
-The P2TP protocol
+The swift protocol
 
 Messages
 
@@ -46,8 +46,8 @@ Messages
  in the case with swarm supervisors).
 
 */
-#ifndef P2TP_H
-#define P2TP_H
+#ifndef SWIFT_H
+#define SWIFT_H
 
 #ifdef _MSC_VER
 #include "compat/stdint.h"
@@ -112,16 +112,18 @@ namespace swift {
 
     /** swift protocol message types; these are used on the wire. */
     typedef enum {
-        P2TP_HANDSHAKE = 0,
-        P2TP_DATA = 1,
-        P2TP_ACK = 2,
-        P2TP_TS = 8,
-        P2TP_HINT = 3,
-        P2TP_HASH = 4,
-        P2TP_PEX_ADD = 5,
-        P2TP_PEX_RM = 6,
-        P2TP_SIGNED_HASH = 7,
-        P2TP_MESSAGE_COUNT = 8
+        SWIFT_HANDSHAKE = 0,
+        SWIFT_DATA = 1,
+        SWIFT_ACK = 2,
+        SWIFT_TS = 8,
+        SWIFT_HINT = 3,
+        SWIFT_HASH = 4,
+        SWIFT_PEX_ADD = 5,
+        SWIFT_PEX_RM = 6,
+        SWIFT_SIGNED_HASH = 7,
+        SWIFT_MSGTYPE_SENT = 8,
+        SWIFT_MSGTYPE_RCVD = 9,
+        SWIFT_MESSAGE_COUNT = 10
     } messageid_t;
 
     class PiecePicker;
@@ -235,7 +237,7 @@ namespace swift {
     };
 
 
-    /**    P2TP channel's "control block"; channels loosely correspond to TCP
+    /**    swift channel's "control block"; channels loosely correspond to TCP
         connections or FTP sessions; one channel is created for one file
         being transferred between two peers. As we don't need buffers and
         lots of other TCP stuff, sizeof(Channel+members) must be below 1K.

diff --git a/tests/connecttest.cpp b/tests/connecttest.cpp
index 40a7ae5..e49c6c7 100644 (file)
--- a/tests/connecttest.cpp
+++ b/tests/connecttest.cpp
@@ -16,7 +16,7 @@
 using namespace swift;
 
 
-TEST(P2TP,CwndTest) {
+TEST(SWIFT,CwndTest) {
 
     srand ( time(NULL) );