Russtopia/xs
2
1
Fork 0
mirror of https://gogs.blitter.com/RLabs/xs synced 2024-08-14 10:26:42 +00:00
Code Issues Projects Releases Wiki Activity

BUILDOPTS passed to client/server makes

Browse source
This commit is contained in:
Russ Magee 2019-06-20 22:44:19 -07:00
parent ce4594941b
commit 1a1e15d65b
5 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -1,5 +1,13 @@
.PHONY: lint vis clean common client server passwd subpkgs install uninstall reinstall .PHONY: lint vis clean common client server passwd subpkgs install uninstall reinstall
#ifeq ($(MAKEOPTS),)
MAKEOPTS = $(MAKEOPTS)
#endif
#ifeq ($(BUILDOPTS),)
BUILDOPTS = $(BUILDOPTS)
#endif
SUBPKGS = logger spinsult hkexnet SUBPKGS = logger spinsult hkexnet
TOOLS = hkexpasswd hkexsh hkexshd TOOLS = hkexpasswd hkexsh hkexshd
SUBDIRS = $(LIBS) $(TOOLS) SUBDIRS = $(LIBS) $(TOOLS)

2
hkexnet/hkexnet.go
View file

@ -70,7 +70,7 @@ type (
// Conn is a connection wrapping net.Conn with KEX & session state // Conn is a connection wrapping net.Conn with KEX & session state
Conn struct { Conn struct {
kex KEXAlg // KEX/KEM propsal (client -> server) kex KEXAlg // KEX/KEM proposal (client -> server)
m *sync.Mutex // (internal) m *sync.Mutex // (internal)
c *net.Conn // which also implements io.Reader, io.Writer, ... c *net.Conn // which also implements io.Reader, io.Writer, ...
immClose bool immClose bool

4
hkexnet/hkextun.go
View file

@ -331,8 +331,8 @@ func (hc *Conn) StartServerTunnel(lport, rport uint16) {
} }
if (*hc.tuns)[rport].KeepAlive > 50 { if (*hc.tuns)[rport].KeepAlive > 50 {
(*hc.tuns)[rport].Died = true (*hc.tuns)[rport].Died = true
logger.LogDebug("[ServerTun] worker A: Client died, hanging up.") logger.LogDebug("[ServerTun] worker A: Client died, hanging up.")
} else { } else {
(*hc.tuns)[rport].KeepAlive += 1 (*hc.tuns)[rport].KeepAlive += 1
} }

2
hkexsh/Makefile
View file

@ -4,7 +4,7 @@ EXTPKGS = bytes,errors,flag,fmt,internal,io,log,net,os,path,runtime,time,strings
EXE = $(notdir $(shell pwd)) EXE = $(notdir $(shell pwd))
all: all:
go build . go build $(BUILDOPTS) .
clean: clean:
$(RM) $(EXE) $(EXE).exe $(RM) $(EXE) $(EXE).exe

2
hkexshd/Makefile
View file

@ -4,7 +4,7 @@ EXTPKGS = binary,bytes,crypto,encoding,errors,flag,fmt,internal,io,log,net,os,pa
EXE = $(notdir $(shell pwd)) EXE = $(notdir $(shell pwd))
all: all:
go build . go build $(BUILDOPTS) .
clean: clean:
$(RM) $(EXE) $(EXE).exe $(RM) $(EXE) $(EXE).exe