Great renaming: p2tp->swift.

Now the scons part.

diff --git a/SConstruct b/SConstruct
index 079e965..f4d2cd7 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -15,9 +15,9 @@ DEBUG = True
 
 TestDir='tests'
 
-target = 'p2tp'
+target = 'swift'
 source = [ 'bin64.cpp','sha1.cpp','hashtree.cpp','datagram.cpp','bins.cpp',
-    'transfer.cpp', 'p2tp.cpp', 'sendrecv.cpp', 'send_control.cpp',
+    'transfer.cpp', 'swift.cpp', 'sendrecv.cpp', 'send_control.cpp',
     'compat/hirestimeofday.cpp', 'compat.cpp', 'compat/util.cpp']
 
 env = Environment()
@@ -28,7 +28,7 @@ if sys.platform == "win32":
 
        # Make sure scons finds std MSVC include files
        if not 'INCLUDE' in os.environ:
-               print "p2tp: Please run scons in a Visual Studio Command Prompt"
+               print "swift: Please run scons in a Visual Studio Command Prompt"
                sys.exit(-1)
                
        include = os.environ['INCLUDE']

diff --git a/exec/SConscript b/exec/SConscript
index f195cef..8c1fa5d 100644 (file)
--- a/exec/SConscript
+++ b/exec/SConscript
@@ -6,7 +6,7 @@ Import("libs")
 Import("libpath")
 
 cpppath = env["CPPPATH"]
-libs = ['p2tp'] + libs  # order is important, crypto needs to be last
+libs = ['swift'] + libs  # order is important, crypto needs to be last
 
 if sys.platform == "win32":
     cpppath = ".."

diff --git a/exec/hasher.cpp b/exec/hasher.cpp
index c95f119..13c62e9 100644 (file)
--- a/exec/hasher.cpp
+++ b/exec/hasher.cpp
@@ -8,6 +8,7 @@
  */
 #include <stdio.h>
 #include "hashtree.h"
+#include "swift.h"
 
 
 int main (int argn, char** args) {

diff --git a/tests/SConscript b/tests/SConscript
index 09ea949..2affccc 100644 (file)
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -7,9 +7,9 @@ Import("libpath")
 
 cpppath = env["CPPPATH"]
 if DEBUG and sys.platform == "win32":
-       libs = ['p2tp','gtestd'] + libs  # order is important, crypto needs to be last
+       libs = ['swift','gtestd'] + libs  # order is important, crypto needs to be last
 else:
-       libs = ['p2tp','gtest'] + libs  # order is important, crypto needs to be last
+       libs = ['swift','gtest'] + libs  # order is important, crypto needs to be last
 
 if sys.platform == "win32":
     cpppath = ".."

diff --git a/tests/ledbattest2.cpp b/tests/ledbattest2.cpp
index 3b97d22..9b533e2 100644 (file)
--- a/tests/ledbattest2.cpp
+++ b/tests/ledbattest2.cpp
@@ -11,10 +11,10 @@
 #include <vector>
 #include <deque>
 #include "datagram.h"
-#include "p2tp.h"
+#include "swift.h"
 #include <gtest/gtest.h>
 
-using namespace p2tp;
+using namespace swift;
 using namespace std;
 
 /**
@@ -184,7 +184,7 @@ TEST(Datagram,LedbatTest) {
 int main (int argc, char** argv) {
 
     int opt;
-    p2tp::LibraryInit();
+    swift::LibraryInit();
     printf("Warning: use the script to set up dummynet!\n");
     testing::InitGoogleTest(&argc, argv);
     dest_addr = htonl(INADDR_LOOPBACK);