better randomization; still a stub

git-svn-id: https://ttuki.vtt.fi/svn/p2p-next/TUD/p2tp/trunk@588 e16421f0-f15b-0410-abcd-98678b794739

diff --git a/datagram.cpp b/datagram.cpp
index ece9ea45079db5fc10f1d81d4f16505f4c2d1fae..f26a78f10a36cc3f166502df89ce48e94e1ba613 100644 (file)
--- a/datagram.cpp
+++ b/datagram.cpp
@@ -21,8 +21,9 @@
 
 namespace p2tp {
 
-tint Datagram::now = Datagram::Time()/360000000LL*360000000LL;
-tint Datagram::epoch = now;
+tint Datagram::now = Datagram::Time();
+tint Datagram::start = now;
+tint Datagram::epoch = now/360000000LL*360000000LL;
 uint32_t Address::LOCALHOST = INADDR_LOOPBACK;
 uint64_t Datagram::dgrams_up=0, Datagram::dgrams_down=0,
          Datagram::bytes_up=0, Datagram::bytes_down=0;

diff --git a/datagram.h b/datagram.h
index d3e3f03b2ecf8c1d056bbd7fcd173fb3f0aa6ae3..bc3c52e86c32cef15097d8111fe6afa738411c8c 100644 (file)
--- a/datagram.h
+++ b/datagram.h
@@ -114,7 +114,7 @@ struct Datagram {
        static void Close(int port);
        static tint Time();
        static SOCKET Wait (int sockcnt, SOCKET* sockets, tint usec=0);
-       static tint now, epoch;
+       static tint now, epoch, start;
     static uint64_t dgrams_up, dgrams_down, bytes_up, bytes_down;
 
        Datagram (SOCKET socket, const Address addr_) : addr(addr_), offset(0),

diff --git a/p2tp.cpp b/p2tp.cpp
index 264e05535141fa375ab83d64506f9f8f498f7737..9211e1666f1c66415b808e3450d47c32fbdcdea4 100644 (file)
--- a/p2tp.cpp
+++ b/p2tp.cpp
@@ -67,10 +67,10 @@ void     p2tp::SetTracker(const Address& tracker) {
 
 
 int Channel::DecodeID(int scrambled) {
-       return scrambled ^ (int)Datagram::epoch;
+       return scrambled ^ (int)Datagram::start;
 }
 int Channel::EncodeID(int unscrambled) {
-       return unscrambled ^ (int)Datagram::epoch;
+       return unscrambled ^ (int)Datagram::start;
 }