Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UDP/TCP switch for Discovery and Bootstrap builders #132

Open
wants to merge 145 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
d61a63b
[maven-release-plugin] prepare for next development iteration
tbocek May 27, 2015
b6cfacd
fixed #105
tbocek Jun 1, 2015
6ec03d4
better memory managemnt. Clear distinction between direct and heap
tbocek Jun 4, 2015
0cd3e3f
fixed #106
tbocek Jun 4, 2015
2e5a7f4
equals is required for unit tests
tbocek Jun 4, 2015
9cf262d
fixed testcase, need to use copy of data
tbocek Jun 4, 2015
2315dfb
fixed filter copy
tbocek Jun 8, 2015
427ec6c
only clear buffer if we have released all buffers
tbocek Jun 8, 2015
8229496
Merge branch 'master' of ssh://[email protected]/tomp2p/TomP2P.git
tbocek Jun 8, 2015
fe97a3a
fixed equals
tbocek Jun 8, 2015
996c7f6
send to self needs to duplicate the databuffer list, as otherwise, the
tbocek Jun 8, 2015
c3e58ec
data / databuffer fixes
tbocek Jun 8, 2015
df8ac18
only release the data we won't use anymore
tbocek Jun 8, 2015
d230fae
remove cast exception fixed
tbocek Jun 8, 2015
2c5c631
awaitListener now also waits until the operation finishes
tbocek Jun 9, 2015
ca2c24b
improved memory handling
tbocek Jun 9, 2015
03a46f8
memory improvments
tbocek Jun 9, 2015
67b4107
copy data to heapbuffer by default
tbocek Jun 9, 2015
4c7fde5
more memory fixes
tbocek Jun 10, 2015
372332a
properly shutdown dataMap to not see Netty leak exceptions
tbocek Jun 10, 2015
f8a2945
print out which method is being tested
tbocek Jun 10, 2015
ad2d343
release data
tbocek Jun 10, 2015
87de581
more memory fixes
tbocek Jun 10, 2015
29644f1
further memory improvements
tbocek Jun 10, 2015
8bf1ec1
reply removes the data from the message
tbocek Jun 10, 2015
bfdfbf4
message can be null
tbocek Jun 10, 2015
37f2571
further memory improvements
tbocek Jun 11, 2015
57edcc2
fixed bloom filter shortcut
tbocek Jun 11, 2015
ecad549
rsync fixes
tbocek Jun 11, 2015
8bfcb56
fixing memory issues
tbocek Jun 11, 2015
573fbcc
Relay Utils calling wrong signature
tbocek Jun 11, 2015
2819ff1
shutdown connection after checking for future success
tbocek Jun 11, 2015
e991b0c
replication fixes
tbocek Jun 11, 2015
90dbf9f
Concurrency Bug with Rangelocks. Was very difficult to find this one
tbocek Jun 19, 2015
e948b72
removed android dependency
tbocek Jun 19, 2015
3ae47d2
update weupnp
tbocek Jun 19, 2015
b3e552a
moved manual tests to separate package
tbocek Jun 19, 2015
07f5457
intersection needs always to be called, otherwise it will be null
tbocek Jun 19, 2015
88ba476
not requiered to make copy, causes ConcurrentModificationException
tbocek Jun 24, 2015
0a0a039
Merge branch 'master' of ssh://[email protected]/tomp2p/TomP2P.git
tbocek Jun 24, 2015
814f63f
Added IPC via sysout/command line arguments to send code to execute in
tbocek Jun 24, 2015
5051620
Base64 backportet for 1.7
tbocek Jun 24, 2015
b0f951a
add proper tostring to easy debugging
tbocek Jun 25, 2015
e112dc7
added convenince method
tbocek Jun 25, 2015
2c2708b
typo
tbocek Jun 25, 2015
92918f0
improved testcases
tbocek Jun 25, 2015
07e5de3
Removed local announce, as this was way too fragile. Now the internal IP
tbocek Jun 28, 2015
cd3ba25
testcase for relays with real peers behind nat (behind same and
tbocek Jun 29, 2015
9a35147
release buffer after using it, reported by Luiz Angelo Steffenel
tbocek Jul 5, 2015
7218f11
adding testcase for relay, start investigating time issue
tbocek Jul 11, 2015
74ddf0c
work log - 18.7.2015
tbocek Jul 19, 2015
b3142ea
work log: start 11:50 - 13:05
tbocek Jul 25, 2015
7ff3495
work log: 16:00 - 17:40
tbocek Jul 26, 2015
1f21098
work log: 22:00 - 22:30
tbocek Jul 26, 2015
81cb23a
check null value
tbocek Aug 1, 2015
e0d1e4e
error reporting too verbose
tbocek Aug 1, 2015
5961721
string representation for better debugging
tbocek Aug 1, 2015
4641755
work log: 10:45 - 12:15 / 14:45 - 16:55
tbocek Aug 1, 2015
4913937
work log: 10:40 - 12:00 / 16:20 - 17:25
tbocek Aug 2, 2015
751980b
removed 1.8 method
tbocek Aug 2, 2015
052eaea
remove 1.8 feature
tbocek Aug 2, 2015
0cad9d1
work log: 13:45 - 15:30 / 16:45 - 17:00 / 21:30 - 23:00
tbocek Aug 9, 2015
6af3097
fixed null pointer in reservation
tbocek Aug 9, 2015
a8c5a95
fix notification of peerinserted
tbocek Aug 10, 2015
90769de
fix null pointer for testcases
tbocek Aug 10, 2015
4f461a3
again, null pointer
tbocek Aug 10, 2015
fc838ca
work log: 13:15 - 14:55, 15:55 - 16:30, 22:15 - 23:55 - added UPNP
tbocek Aug 16, 2015
f1c6e36
local NAT fixes
tbocek Aug 17, 2015
ec42993
work log 11:30 - 14:45 - synced command execution for NAT test classes,
tbocek Aug 29, 2015
5af1fad
work log: 21:15 - 23:15 relay fixes and stress test setup
tbocek Aug 30, 2015
2dfd011
added french message
tbocek Aug 30, 2015
2a83908
better debug output
tbocek Sep 16, 2015
8eb47c7
better debug output
tbocek Sep 16, 2015
59e182e
don't change slow flag
tbocek Sep 16, 2015
945850c
change to cachemap for better resource control
tbocek Sep 16, 2015
66498ac
fixes for IPv4 and better toString for debugging
tbocek Sep 16, 2015
f189333
reflection does not need to work with portforwarding only
tbocek Sep 16, 2015
9569fc6
new tests for IP mask calculation
tbocek Sep 16, 2015
3830fdd
NAT fixes
tbocek Sep 16, 2015
e21d402
fixing NAT/stresstest, almost there, few runs work, longer runs result
tbocek Sep 17, 2015
3644e72
removed unneeded code
tbocek Sep 17, 2015
62c5ef1
fixing testcases, increase receive buffer size for UDP
tbocek Oct 4, 2015
5e0a71e
added send self when a peer is responsible for an ID
tbocek Oct 4, 2015
a37cf37
avoid memory copy
tbocek Oct 6, 2015
90f4fb4
fixed ConcurrentModificationException
tbocek Oct 7, 2015
bf2b0e9
when sendtoself, always add to map, as we have full trust
tbocek Oct 7, 2015
931b607
test fixed
tbocek Oct 7, 2015
8a94d4e
fixing discover issues with releasing the channels too early
tbocek Oct 7, 2015
85a2f1e
fixing testcase
tbocek Oct 7, 2015
152f204
don't put too much pressure on the GC, reduce object size
tbocek Oct 7, 2015
3f6065d
Minor Cleanup
esfomeado Oct 8, 2015
2ec3e57
Merge pull request #109 from esfomeado/master
tbocek Oct 8, 2015
3e54de5
Merge remote-tracking branch 'tomp2p/master'
esfomeado Oct 8, 2015
772ce40
Typo Fixes
esfomeado Oct 8, 2015
1957cc4
Merge pull request #110 from esfomeado/master
tbocek Oct 8, 2015
e3a6ef6
fixed typos
tbocek Oct 8, 2015
f75a7c6
Ups forgot this!
esfomeado Oct 8, 2015
9176472
Merge pull request #111 from esfomeado/master
tbocek Oct 8, 2015
94dbf4e
fixing RCON
tbocek Oct 14, 2015
176084e
update travis
tbocek Oct 14, 2015
6848515
travis -> sudoers
tbocek Oct 14, 2015
0964a28
travis -> sudoer
tbocek Oct 14, 2015
6f19ef1
travis -> sudoers
tbocek Oct 14, 2015
16a9d74
travit -> sudoers
tbocek Oct 14, 2015
7dd48f5
travis -> sudoers
tbocek Oct 14, 2015
c835c15
disabling NAT tests
tbocek Oct 14, 2015
4453f4f
fixing buffer requests
tbocek Oct 14, 2015
254e7dc
fixing issue #122
tbocek Oct 15, 2015
4f0f384
Added Slow Peer example
tbocek Oct 15, 2015
3ed21de
fixed slow peer example
tbocek Oct 15, 2015
1897217
fixed serialization
tbocek Oct 15, 2015
352db81
remove printout
tbocek Oct 15, 2015
dce7711
fix tracker
tbocek Oct 15, 2015
ea60bf1
Override fromAddress
tbocek Oct 15, 2015
f4e3fee
fixed 115
tbocek Oct 22, 2015
19d32b2
UDT and IPv6 improvments
tbocek Oct 29, 2015
f367156
further fixes and improvements for NAT and IPv6
tbocek Nov 2, 2015
d28bd15
further ipv6 + udt fixes
tbocek Nov 3, 2015
c4eca87
more ipv6 and nat fixes and refactoring
tbocek Nov 4, 2015
d294f2d
fix composite buffer, added recursion
tbocek Nov 17, 2015
6056e80
fixed errors and testcases, lombok requires an encoding parameter
tbocek Nov 17, 2015
049902f
reduce verbosity in logger
tbocek Nov 18, 2015
e5f13f6
Update class comment text
sandymac Dec 9, 2015
44bce75
Avoids the slow reflection needed to resize an undersized array to ho…
sandymac Dec 11, 2015
a208822
Update logic in NATTypeDetection.twoOutOfThreeSame
sandymac Dec 11, 2015
af137fe
updated project name and fixed testcase
tbocek Jan 5, 2016
43a0e2c
Merge pull request #122 from sandymac/patch-2
tbocek Jan 5, 2016
706de1b
Merge pull request #120 from sandymac/avoidReflection
tbocek Jan 5, 2016
de226f5
Merge pull request #119 from sandymac/patch-1
tbocek Jan 5, 2016
7fb6654
travis-ci shows buffer overflow, trying to change the jdk to 8
tbocek Jan 5, 2016
3fb397c
Merge origin/master
tbocek Jan 5, 2016
e0c4a5e
there is no openjdk8, just the oraclejdk8
tbocek Jan 5, 2016
b96eb84
trying openjdk7 again
tbocek Jan 5, 2016
62ce904
shorten hostname due to jdk7 bug
tbocek Jan 5, 2016
a43d0e8
set sudo to required
tbocek Jan 5, 2016
afcc0d8
set buffer for sender and receiver for input and output. If this is n…
tbocek Jan 5, 2016
5f78b34
try upd without support for broadcasting
tbocek Jan 5, 2016
ac7ef77
travis issue with UDP
tbocek Jan 6, 2016
1ab3441
travis issue with UDP
tbocek Jan 6, 2016
53f6452
If bcast and inet are the same, udp shows warning
tbocek Jan 6, 2016
b11a8ce
removed test code
tbocek Jan 6, 2016
5a36b1a
fix imports
tbocek Jan 6, 2016
ac442ae
adding testcase to test closing of permament TCP connection
tbocek Jan 25, 2016
4499ff6
Added TCP/UDP switch to BootstrapBuilder
nmcodeeu Mar 9, 2016
d4fbf47
Added TCP/UDP switch to DiscoverBuilder.
nmcodeeu Mar 9, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,22 @@ language: java

jdk:
- openjdk7

sudo: required

before_install:
- cat /etc/hosts # optionally check the content *before*
- sudo hostname "$(hostname | cut -c1-63)"
- sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts
- cat /etc/hosts # optionally check the content *after*

#solved in pom.xml
#env: MAVEN_OPTS="-Dio.netty.leakDetectionLevel=paranoid"

#script: mvn -Dtest=net.tomp2p.p2p.TestAnnounce test && exit 1
#does not work as reported here: https://github.com/travis-ci/travis-ci/issues/1341
#before_script:
# - chmod a+x /home/travis/build/tomp2p/TomP2P/nat/src/test/resources/nat-net.sh
# - sudo sh -c 'echo "travis ALL=(ALL) NOPASSWD":" /home/travis/build/tomp2p/TomP2P/nat/src/test/resources/nat-net.sh" >> /etc/sudoers'
# - sudo sh -c 'echo "travis ALL=(ALL) NOPASSWD":" /usr/bin/ip" >> /etc/sudoers'


2 changes: 1 addition & 1 deletion all/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<!-- adds jar package to the root directory of zip package -->
<fileSet>
<directory>${project.build.directory}</directory>
<outputDirectory></outputDirectory>
<outputDirectory/>
<includes>
<include>*.jar</include>
</includes>
Expand Down
9 changes: 2 additions & 7 deletions all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
<parent>
<groupId>net.tomp2p</groupId>
<artifactId>tomp2p-parent</artifactId>
<version>5.0-Beta8</version>
<version>5.0-Beta9-SNAPSHOT</version>
</parent>

<artifactId>tomp2p-all</artifactId>
<packaging>jar</packaging>

<name>TomP2P all-in-one</name>
<name>TomP2P All-in-One</name>

<dependencies>
<dependency>
Expand All @@ -32,11 +32,6 @@
<artifactId>tomp2p-nat</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tomp2p-android</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tomp2p-replication</artifactId>
Expand Down
11 changes: 0 additions & 11 deletions android/.gitignore

This file was deleted.

86 changes: 0 additions & 86 deletions android/pom.xml

This file was deleted.

119 changes: 0 additions & 119 deletions android/src/main/java/net/tomp2p/relay/android/AndroidRelayClient.java

This file was deleted.

This file was deleted.

Loading