Skip to content
Snippets Groups Projects
Commit bcd7c4bb authored by Jake Taylor's avatar Jake Taylor
Browse files

Merge branch 'release' into hotfix/Ping

parents c17ac9c6 e6175bd4
No related branches found
No related tags found
2 merge requests!53Release,!33Hotfix/ping
...@@ -51,6 +51,7 @@ build: ...@@ -51,6 +51,7 @@ build:
except: except:
- tags - tags
script: script:
- make version
- mkdir -p release - mkdir -p release
# - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' ./... # - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' ./...
- GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.linux64 main.go - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.linux64 main.go
......
package bindings
import "gitlab.com/elixxir/client/api"
// GetVersion returns the api SEMVER
func GetVersion() string {
return api.SEMVER
}
// GetGitVersion rturns the api GITVERSION
func GetGitVersion() string {
return api.GITVERSION
}
// GetDependencies returns the api DEPENDENCIES
func GetDependencies() string {
return api.DEPENDENCIES
}
...@@ -49,7 +49,7 @@ func GetDefaultNetwork() Network { ...@@ -49,7 +49,7 @@ func GetDefaultNetwork() Network {
RegNodesBufferLen: 500, RegNodesBufferLen: 500,
NetworkHealthTimeout: 30 * time.Second, NetworkHealthTimeout: 30 * time.Second,
E2EParams: GetDefaultE2ESessionParams(), E2EParams: GetDefaultE2ESessionParams(),
ParallelNodeRegistrations: 8, ParallelNodeRegistrations: 20,
KnownRoundsThreshold: 1500, //5 rounds/sec * 60 sec/min * 5 min KnownRoundsThreshold: 1500, //5 rounds/sec * 60 sec/min * 5 min
FastPolling: true, FastPolling: true,
BlacklistedNodes: make([]string, 0), BlacklistedNodes: make([]string, 0),
......
...@@ -108,5 +108,11 @@ func (m *Manager) processTransmission(msg format.Message, ...@@ -108,5 +108,11 @@ func (m *Manager) processTransmission(msg format.Message,
c := NewContact(payload.GetRID(transmitMsg.GetPubKey(grp)), c := NewContact(payload.GetRID(transmitMsg.GetPubKey(grp)),
transmitMsg.GetPubKey(grp), dhKey, payload.GetTagFP(), payload.GetMaxParts()) transmitMsg.GetPubKey(grp), dhKey, payload.GetTagFP(), payload.GetMaxParts())
jww.INFO.Printf("generated by singe use receiver reception id for single use: %s, "+
"ephId: %v, pubkey: %x, msg: %s",
c.partner, "unknown:",
transmitMsg.GetPubKey(grp).Bytes(),
msg)
return payload.GetContents(), c, nil return payload.GetContents(), c, nil
} }
...@@ -289,5 +289,8 @@ func makeIDs(msg *transmitMessagePayload, publicKey *cyclic.Int, ...@@ -289,5 +289,8 @@ func makeIDs(msg *transmitMessagePayload, publicKey *cyclic.Int,
jww.DEBUG.Printf("ephemeral.GetId(%s, %d, %d) = %d", rid, addressSize, timeNow.UnixNano(), ephID.Int64()) jww.DEBUG.Printf("ephemeral.GetId(%s, %d, %d) = %d", rid, addressSize, timeNow.UnixNano(), ephID.Int64())
} }
jww.INFO.Printf("generated by singe use sender reception id for single use: %s, " +
"ephId: %d, pubkey: %x, msg: %s", rid, ephID.Int64(), publicKey.Bytes(), msg)
return rid, ephID, nil return rid, ephID, nil
} }
...@@ -9,6 +9,7 @@ package single ...@@ -9,6 +9,7 @@ package single
import ( import (
"encoding/binary" "encoding/binary"
"fmt"
"github.com/pkg/errors" "github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/crypto/cyclic" "gitlab.com/elixxir/crypto/cyclic"
...@@ -246,3 +247,12 @@ func (mp transmitMessagePayload) SetContents(contents []byte) { ...@@ -246,3 +247,12 @@ func (mp transmitMessagePayload) SetContents(contents []byte) {
copy(mp.contents, contents) copy(mp.contents, contents)
} }
// String returns the contents for printing adhering to the stringer interface.
func (mp transmitMessagePayload) String()string {
return fmt.Sprintf("Data: %x [tagFP: %x, nonce: %x, " +
"maxParts: %x, size: %x, content: %x]", mp.data, mp.tagFP,
mp.nonce, mp.maxParts, mp.size, mp.contents)
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment