From 490b9db50c80dee653404cb3bbe8aaeeb61bd6e8 Mon Sep 17 00:00:00 2001 From: victor Date: Wed, 18 Nov 2009 18:29:25 +0000 Subject: [PATCH] better randomization; still a stub git-svn-id: https://ttuki.vtt.fi/svn/p2p-next/TUD/p2tp/trunk@588 e16421f0-f15b-0410-abcd-98678b794739 --- datagram.cpp | 5 +++-- datagram.h | 2 +- p2tp.cpp | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/datagram.cpp b/datagram.cpp index ece9ea4..f26a78f 100644 --- 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 d3e3f03..bc3c52e 100644 --- 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 264e055..9211e16 100644 --- 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; } -- 2.20.1