JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/uplinkc: add additional fields to UplinkConfig (#3526)

Browse Source
This commit is contained in:
TopperDEL 2019-11-12 17:45:40 +01:00 committed by Michal Niewrzal
parent 013e0d94bc
commit 39021b9641
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/uplinkc/uplink.go
View File

@ -9,7 +9,9 @@ import "C"
import (
"fmt"
"storj.io/storj/internal/memory"
"storj.io/storj/lib/uplink"
"time"
)
var universe = newHandles()
@ -37,6 +39,11 @@ func new_uplink(cfg C.UplinkConfig, tempDir *C.char, cerr **C.char) C.UplinkRef
libcfg := &uplink.Config{} // TODO: figure out a better name
// TODO: V3-2302, add a way to support logging
libcfg.Volatile.TLS.SkipPeerCAWhitelist = cfg.Volatile.tls.skip_peer_ca_whitelist == C.bool(true)
libcfg.Volatile.TLS.PeerCAWhitelistPath = C.GoString(cfg.Volatile.tls.peer_ca_whitelist_path)
libcfg.Volatile.PeerIDVersion = C.GoString(cfg.Volatile.peer_id_version)
libcfg.Volatile.MaxInlineSize = memory.Size(cfg.Volatile.max_inline_size)
libcfg.Volatile.MaxMemory = memory.Size(cfg.Volatile.max_memory)
libcfg.Volatile.DialTimeout = time.Duration(cfg.Volatile.dial_timeout)
lib, err := uplink.NewUplink(scope.ctx, libcfg)
if err != nil {

6
lib/uplinkc/uplink_definitions.h
View File

@ -36,8 +36,12 @@ typedef struct UplinkConfig {
struct {
struct {
bool skip_peer_ca_whitelist;
char *peer_ca_whitelist_path;
} tls;
// TODO: add support for MaxMemory
char *peer_id_version;
int32_t max_inline_size;
int32_t max_memory;
int32_t dial_timeout;
} Volatile;
} UplinkConfig;