New protocol

.gitignore

@@ -4,7 +4,7 @@ CMakeFiles/
 cmake_install.cmake
 benchmark
 benchmark_hashtable
-doc/
+man/
 edge
 gnutls/
 libn2n.a
@@ -15,3 +15,8 @@ test
 *.vcxproj.filters
 *.vcxproj.user
 ~$
+*.swp
+*.swo
+cscope.out
+gmon.out
+tags

n2n_v2/CMakeLists.txt → CMakeLists.txt

@@ -1,6 +1,8 @@
 project(n2n)
 cmake_minimum_required(VERSION 2.6)
 
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindLibGcrypt.cmake)
+
 # N2n information
 set(N2N_VERSION 2.1.0)
 set(N2N_OSNAME ${CMAKE_SYSTEM})
@@ -40,7 +42,7 @@ if(NOT WIN32)
 set(CMAKE_C_FLAGS "-Wall -Wshadow -Wpointer-arith -Wmissing-declarations -Wnested-externs -fPIC")
 set(CMAKE_CXX_FLAGS "-Wall -Wshadow -Wpointer-arith -Wmissing-declarations -Wnested-externs")
 # Debug 
-set(CMAKE_C_FLAGS_DEBUG "-g")
+set(CMAKE_C_FLAGS_DEBUG "-g -Wno-deprecated-declarations")
 set(CMAKE_CXX_FLAGS_DEBUG "-g")
 # Release
 set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
@@ -54,9 +56,22 @@ endif(NOT WIN32)
 #message(${N2N_OPTION_AES})
 ## DEBUG FOR CMAKE
 
+# install gnutls >= 2.99.0 in your system path or here
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/gnutls/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libgcrypt/include)
+link_directories(${CMAKE_CURRENT_SOURCE_DIR}/gnutls/lib)
+link_directories(${CMAKE_CURRENT_SOURCE_DIR}/libgcrypt/lib)
+
+# libgcrypt
+gcr_check(GCRYPT REQUIRED gcrypt)
+
 add_library(n2n n2n.c
                 n2n_keyfile.c
                 wire.c
+                crypto/crypto.c
+                crypto/aes.c
+                crypto/ecdh.c
+                crypto/hmac.c
                 minilzo.c
                 twofish.c
                 transform_null.c
@@ -74,6 +89,8 @@ add_subdirectory(win32)
 target_link_libraries(n2n n2n_win32)
 endif(DEFINED WIN32)
 
+target_link_libraries(n2n gnutls gcrypt)
+
 if(N2N_OPTION_AES)
 target_link_libraries(n2n crypto)
 endif(N2N_OPTION_AES)
@@ -82,7 +99,7 @@ endif(N2N_OPTION_AES)
 #target_link_libraries(n2n socket nsl)
 
 add_executable(edge edge.c)
-target_link_libraries(edge n2n)
+target_link_libraries(edge n2n gcrypt gnutls)
 
 add_executable(supernode sn.c)
 target_link_libraries(supernode n2n)
@@ -104,37 +121,37 @@ install(TARGETS edge supernode
 
 # Documentation
 if(DEFINED UNIX)
-add_dependencies(n2n doc)
-file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/doc)
-add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/doc/edge.8.gz
-                   COMMAND gzip -c ${PROJECT_SOURCE_DIR}/edge.8 > ${PROJECT_BINARY_DIR}/doc/edge.8.gz
+add_dependencies(n2n man)
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/man)
+add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/man/edge.8.gz
+                   COMMAND gzip -c ${PROJECT_SOURCE_DIR}/edge.8 > ${PROJECT_BINARY_DIR}/man/edge.8.gz
                    DEPENDS ${PROJECT_SOURCE_DIR}/edge.8
                   )
 
-add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/doc/supernode.1.gz
-                   COMMAND gzip -c ${PROJECT_SOURCE_DIR}/supernode.1 > ${PROJECT_BINARY_DIR}/doc/supernode.1.gz
+add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/man/supernode.1.gz
+                   COMMAND gzip -c ${PROJECT_SOURCE_DIR}/supernode.1 > ${PROJECT_BINARY_DIR}/man/supernode.1.gz
                    DEPENDS ${PROJECT_SOURCE_DIR}/supernode.1
                   )
 
-add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/doc/n2n_v2.7.gz
-                   COMMAND gzip -c ${PROJECT_SOURCE_DIR}/n2n_v2.7 > ${PROJECT_BINARY_DIR}/doc/n2n_v2.7.gz
+add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/man/n2n_v2.7.gz
+                   COMMAND gzip -c ${PROJECT_SOURCE_DIR}/n2n_v2.7 > ${PROJECT_BINARY_DIR}/man/n2n_v2.7.gz
                    DEPENDS ${PROJECT_SOURCE_DIR}/n2n_v2.7
                   )
 
-add_custom_target(doc DEPENDS ${PROJECT_BINARY_DIR}/doc/edge.8.gz
-                              ${PROJECT_BINARY_DIR}/doc/supernode.1.gz
-                              ${PROJECT_BINARY_DIR}/doc/n2n_v2.7.gz
+add_custom_target(man DEPENDS ${PROJECT_BINARY_DIR}/man/edge.8.gz
+                              ${PROJECT_BINARY_DIR}/man/supernode.1.gz
+                              ${PROJECT_BINARY_DIR}/man/n2n_v2.7.gz
                  )
 
-set_source_files_properties(${PROJECT_BINARY_DIR}/doc/edge.8.gz
-                            ${PROJECT_BINARY_DIR}/doc/supernode.1.gz
-                            ${PROJECT_BINARY_DIR}/doc/n2n_v2.7.gz
+set_source_files_properties(${PROJECT_BINARY_DIR}/man/edge.8.gz
+                            ${PROJECT_BINARY_DIR}/man/supernode.1.gz
+                            ${PROJECT_BINARY_DIR}/man/n2n_v2.7.gz
                             PROPERTIES GENERATED 1)
 
-install(FILES ${PROJECT_BINARY_DIR}/doc/edge.8.gz
+install(FILES ${PROJECT_BINARY_DIR}/man/edge.8.gz
         DESTINATION /usr/share/man8)
-install(FILES ${PROJECT_BINARY_DIR}/doc/supernode.1.gz
+install(FILES ${PROJECT_BINARY_DIR}/man/supernode.1.gz
         DESTINATION /usr/share/man1)
-install(FILES ${PROJECT_BINARY_DIR}/doc/n2n_v2.7.gz
+install(FILES ${PROJECT_BINARY_DIR}/man/n2n_v2.7.gz
         DESTINATION /usr/share/man7)
 endif(DEFINED UNIX)

n2n_v2/INSTALL → INSTALL

@@ -1,3 +1,7 @@
+Dependencies:
+- libgcrypt >= 1.5
+- GnuTLS >= 3.0.1 (depends itself on nettle 2.2 at the time of writing)
+
 New install procedure, using cmake.
 
 Customize CMakeLists.txt

README

@@ -1,4 +1,12 @@
-This is a fork of the n2n p2p vpn software. http://www.ntop.org/n2n.
+This is the current development branch of the n2n p2p vpn software.
+
+http://www.ntop.org/products/n2n/
+
+It contains some modifications of the v2 version of n2n, which is the latest stable version
+and should be used for productive environments.
+All the current development happens in this repository in the new_protocol branch, which is 
+intended to be come version v3 of n2n and then merged back into the original svn repository
+on ntop.org.
 
 Uses sglib http://sglib.sourceforge.net.
 

n2n_v1/README → README.n2n.orig

@@ -3,7 +3,7 @@
 Edge node
 ---------
 
-You need to start an egde node on each host you want to connect with the *same*
+You need to start an edge node on each host you want to connect with the *same*
 community.
 
 0. become root
@@ -53,7 +53,7 @@ safe if your host has only one login user.
 Running As a Daemon (UNIX)
 -------------------
 
-When given "-f" as a command line option, edge will call daemon(3) after
+Unless given "-f" as a command line option, edge will call daemon(3) after
 successful setup. This causes the process to fork a child which closes stdin,
 stdout and stderr then sets itself as process group leader. When this is done,
 the edge command returns immediately and you will only see the edge process in
@@ -64,7 +64,7 @@ returns non-zero then edge failed to start up for some reason. When edge starts
 running as a daemon, all logging goes to syslog daemon.info facility.
 
 
-IPv6 Support (added r3650)
+IPv6 Support
 ------------
 
 n2n supports the carriage of IPv6 packets within the n2n tunnel. N2n does not
@@ -91,5 +91,4 @@ Once the IPv6 addresses are configured and edge started, IPv6 neighbor discovery
 packets flow (get broadcast) and IPv6 entities self arrange. Test your IPv6
 setup with ping6 - the IPv6 ping command.
 
-
-(C) 2007,2008 - Luca Deri <deri@ntop.org>, Richard Andrews <andrews@ntop.org>
+(C) 2007-2010 - Luca Deri <deri@ntop.org>, Richard Andrews <andrews@ntop.org>

benchmark.c

@@ -0,0 +1,117 @@
+#include "n2n_wire.h"
+#include "n2n_transforms.h"
+#include "n2n.h"
+
+#ifndef WIN32
+#include <sys/time.h>
+#endif
+#include <time.h>
+#include <string.h>
+#include <stdio.h>
+
+uint8_t PKT_CONTENT[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5,
+        6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+        11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+        15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4,
+        5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+        11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+        15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4,
+        5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+        11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+        15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4,
+        5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+        11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+        15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4,
+        5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+        11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+        15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4,
+        5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+        11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+        15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4,
+        5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+        11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+        15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4,
+        5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+        11, 12, 13, 14, 15 };
+
+/* Prototypes */
+static ssize_t do_encode_packet(uint8_t * pktbuf, size_t bufsize,
+        const n2n_community_t c);
+
+int main(int argc, char * argv[])
+{
+    uint8_t pktbuf[N2N_PKT_BUF_SIZE];
+    n2n_trans_op_t transop_null;
+
+    /* n2n_common_t cmn; */
+    /* n2n_PACKET_t pkt; */
+    n2n_community_t c;
+
+    struct timeval t1;
+    struct timeval t2;
+
+    unsigned long int i;
+    size_t n;
+    /* size_t idx; */
+    /* size_t rem; */
+    ssize_t nw;
+    unsigned long int tdiff;
+
+    transop_null_init(&transop_null);
+    memset(c, 0, sizeof(N2N_COMMUNITY_SIZE));
+
+    n = 10000;
+    memcpy(c, "abc123def456", 12);
+
+    gettimeofday(&t1, NULL);
+    for (i = 0; i < n; ++i) {
+        nw = do_encode_packet(pktbuf, N2N_PKT_BUF_SIZE, c);
+
+        nw += transop_null.fwd(&transop_null, pktbuf + nw,
+                N2N_PKT_BUF_SIZE - nw, PKT_CONTENT, sizeof(PKT_CONTENT));
+
+        /* idx = 0; */
+        /* rem = nw; */
+
+        /* decode_common(&cmn, pktbuf, &rem, &idx); */
+        /* decode_PACKET(&pkt, &cmn, pktbuf, &rem, &idx); */
+
+        if (0 == (i % 1000)) {
+            fprintf(stderr, ".");
+        }
+    }
+    gettimeofday(&t2, NULL);
+
+    tdiff = ((t2.tv_sec - t1.tv_sec) * 1000000) + (t2.tv_usec - t1.tv_usec);
+
+    fprintf(stderr,
+            "\nrun %lu times. (%lu -> %lu nsec each) %u.%06u -> %u.%06u.\n", i,
+            tdiff, (tdiff * 1000) / i, (uint32_t) t1.tv_sec,
+            (uint32_t) t1.tv_usec, (uint32_t) t2.tv_sec, (uint32_t) t2.tv_usec);
+
+    return 0;
+}
+
+static ssize_t do_encode_packet(uint8_t * pktbuf, size_t bufsize,
+        const n2n_community_t c)
+{
+    /* n2n_mac_t destMac={0,1,2,3,4,5}; */
+    /* n2n_common_t cmn; */
+    n2n_PACKET_t pkt;
+    size_t idx;
+
+    /* memset(&cmn, 0, sizeof(cmn)); */
+    /*cmn.ttl = N2N_DEFAULT_TTL;
+    cmn.pc = n2n_packet;
+    cmn.flags = 0; // no options, not from supernode, no socket
+    memcpy(cmn.community, c, N2N_COMMUNITY_SIZE); */
+
+    memset(&pkt, 0, sizeof(pkt));
+
+    idx = 0;
+    /* encode_PACKET(pktbuf, &idx, &cmn, &pkt); */
+    traceEvent(TRACE_DEBUG, "encoded PACKET header of size=%u", (unsigned int)idx);
+
+    return idx;
+}

benchmark_hashtable.c

@@ -0,0 +1,25 @@
+#include "n2n_wire.h"
+#include "n2n_transforms.h"
+#include "n2n.h"
+
+#ifndef WIN32
+#include <sys/time.h>
+#endif
+#include <time.h>
+#include <string.h>
+#include <stdio.h>
+
+int main(int argc, char** argv) {
+    peer_info_t* testpeers[PEER_HASH_TAB_SIZE];
+    struct sglib_hashed_peer_info_t_iterator it;
+    peer_info_t *ll;
+
+    sglib_hashed_peer_info_t_init(testpeers);
+
+    for (ll = sglib_hashed_peer_info_t_it_init(&it, testpeers); ll != NULL; ll =
+            sglib_hashed_peer_info_t_it_next(&it)) {
+        sglib_hashed_peer_info_t_delete(testpeers, ll);
+        free(ll);
+    }
+    return 0;
+}