yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-11-04 03:05:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consistent function naming for metadata

Browse source
This commit is contained in:
Neil Alexander 2018-12-12 22:48:04 +00:00
parent 042a3400fe
commit 74de8c9416
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/yggdrasil/router.go
View file

@ -433,7 +433,7 @@ func (r *router) handleProto(packet []byte) {
case wire_SessionMetaRequest: case wire_SessionMetaRequest:
fallthrough fallthrough
case wire_SessionMetaResponse: case wire_SessionMetaResponse:
r.handleMeta(bs, &p.FromKey) r.handleMetadata(bs, &p.FromKey)
case wire_DHTLookupRequest: case wire_DHTLookupRequest:
r.handleDHTReq(bs, &p.FromKey) r.handleDHTReq(bs, &p.FromKey)
case wire_DHTLookupResponse: case wire_DHTLookupResponse:
@ -479,13 +479,13 @@ func (r *router) handleDHTRes(bs []byte, fromKey *boxPubKey) {
} }
// Decodes meta request // Decodes meta request
func (r *router) handleMeta(bs []byte, fromKey *boxPubKey) { func (r *router) handleMetadata(bs []byte, fromKey *boxPubKey) {
req := sessionMeta{} req := sessionMeta{}
if !req.decode(bs) { if !req.decode(bs) {
return return
} }
req.SendPermPub = *fromKey req.SendPermPub = *fromKey
r.core.sessions.handleMeta(&req) r.core.sessions.handleMetadata(&req)
} }
// Passed a function to call. // Passed a function to call.

8
src/yggdrasil/session.go
View file

@ -501,12 +501,12 @@ func (ss *sessions) handlePing(ping *sessionPing) {
// often than 15 minutes since receiving the last metadata) // often than 15 minutes since receiving the last metadata)
//if time.Since(sinfo.metaResTime).Minutes() > 15 { //if time.Since(sinfo.metaResTime).Minutes() > 15 {
// if time.Since(sinfo.metaReqTime).Minutes() > 1 { // if time.Since(sinfo.metaReqTime).Minutes() > 1 {
// ss.sendMeta(sinfo, false) // ss.sendMetadata(sinfo, false)
// } // }
//} //}
} }
func (ss *sessions) sendMeta(sinfo *sessionInfo, isResponse bool) { func (ss *sessions) sendMetadata(sinfo *sessionInfo, isResponse bool) {
ss.myMetadataMutex.RLock() ss.myMetadataMutex.RLock()
meta := sessionMeta{ meta := sessionMeta{
IsResponse: isResponse, IsResponse: isResponse,
@ -531,7 +531,7 @@ func (ss *sessions) sendMeta(sinfo *sessionInfo, isResponse bool) {
} }
// Handles a meta request/response. // Handles a meta request/response.
func (ss *sessions) handleMeta(meta *sessionMeta) { func (ss *sessions) handleMetadata(meta *sessionMeta) {
// Get the corresponding session (or create a new session) // Get the corresponding session (or create a new session)
sinfo, isIn := ss.getByTheirPerm(&meta.SendPermPub) sinfo, isIn := ss.getByTheirPerm(&meta.SendPermPub)
// Check the session firewall // Check the session firewall
@ -547,7 +547,7 @@ func (ss *sessions) handleMeta(meta *sessionMeta) {
sinfo.theirMetadata = meta.Metadata sinfo.theirMetadata = meta.Metadata
sinfo.metaResTime = time.Now() sinfo.metaResTime = time.Now()
} else { } else {
ss.sendMeta(sinfo, true) ss.sendMetadata(sinfo, true)
} }
} }