Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

opendht
- Activity
- Members
- Labels
- Model registry
- Model experiments

Snippets Groups Projects

f65e8c1a

Unverified Commit f65e8c1a authored 6 years ago by MingruiZhangW Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge branch 'master' into peer_discovery_version_2

parents 0f3396cd c2fdf6ae

Branches

Tags

No related merge requests found

Changes 17

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 3 additions, 3 deletions

CMakeLists.txt
MSVC/dhtchat.vcxproj 22 additions, 22 deletions

MSVC/dhtchat.vcxproj
MSVC/dhtnode.vcxproj 22 additions, 22 deletions

MSVC/dhtnode.vcxproj
MSVC/dhtscanner.vcxproj 22 additions, 22 deletions

MSVC/dhtscanner.vcxproj
MSVC/opendht.vcxproj 50 additions, 35 deletions

MSVC/opendht.vcxproj
MSVC/opendht.vcxproj.filters 36 additions, 4 deletions

MSVC/opendht.vcxproj.filters
configure.ac 1 addition, 1 deletion

configure.ac
doc/dhtnode.1 17 additions, 1 deletion

doc/dhtnode.1
include/opendht/dht.h 48 additions, 48 deletions

include/opendht/dht.h
include/opendht/thread_pool.h 3 additions, 1 deletion

include/opendht/thread_pool.h
include/opendht/utils.h 12 additions, 0 deletions

include/opendht/utils.h
src/Makefile.am 6 additions, 4 deletions

src/Makefile.am
src/dht_proxy_client.cpp 102 additions, 45 deletions

src/dht_proxy_client.cpp
src/peer_discovery.cpp 13 additions, 7 deletions

src/peer_discovery.cpp
src/search.h 1 addition, 0 deletions

src/search.h
src/utils.cpp 4 additions, 0 deletions

src/utils.cpp
tools/dhtnode.cpp 13 additions, 12 deletions

tools/dhtnode.cpp

with 375 additions and 227 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment