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
347 commits 6 branches 47 tags 138 MiB
Commit graph

86 commits

Author SHA1 Message Date
Russ Magee
3b73c6d731 Merge branch 'master' into kcp-udp 2019-09-14 22:56:19 -07:00
Russ Magee
ba52356e6c Made default deeper in init funcs HERRADURAKEX512 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2019-09-14 22:56:03 -07:00
Russ Magee
ce1adf7a07 Merge branch 'master' into kcp-udp 2019-08-22 23:31:36 -07:00
Russ Magee
c354036952 Fixed incomplete -x cmd output due to premature ptmx.Close for non-interactive sessions 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2019-08-22 23:18:20 -07:00
Russ Magee
c95794da1f Uncoupled kcp-go UDP support by moving into hkexnet/kcp.go 
TODO: cmdline param to set KCP symmetric key & salt at launch (consider
also from a file to avoid putting inline in invocations, eg., init scripts)

Signed-off-by: Russ Magee <rmagee@gmail.com>
 2019-08-16 23:16:40 -07:00
Russ Magee
d7dbcd8fdf Added experimental support (-K) for kcp-go reliable-UDP instead of TCP 
github.com/xtaci/kcp-go

** Note: hkexcp appears to hang (client-side) on completion w/complete file copy
   (Note server-side logs on final missed ctrlStatOp msg)

Signed-off-by: Russ Magee <rmagee@gmail.com>
 2019-08-13 20:56:01 -07:00
Russ Magee
1aa8a1549b Used fixed goutmp pty logging 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2019-07-04 20:27:49 -07:00
Russ Magee
3a720cfb8e More race cleanup, (hc.tuns).Data/ShutdownTun() races A,B,C still remain. 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2019-06-28 22:50:58 -07:00
Russ Magee
78b2006af6 gofmt 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2019-06-27 22:28:53 -07:00
Russ Magee
8f5366fff4 Added locking APIs for most Conn/Tun fields, save <- Data/ShutdownTun() race 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2019-06-27 22:10:59 -07:00
Russ Magee
c327b2ec72 Fixed tun reuse hang/error after closure 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2019-06-27 01:19:52 -07:00
Russ Magee
1d4c16dd76 Moved server keepalive ageing for tunnels to goroutine -- fix for premature tunnel collapses 2019-06-22 23:27:53 -07:00
Russ Magee
54396a4e4b BUILDOPTS passed to client/server makes 2019-06-20 22:44:19 -07:00
Russ Magee
c24529a1d4 log of cipher/plaintext disabled (flags unexposed to re-enable); pprof tooling 2019-06-19 21:42:34 -07:00
Russ Magee
cbf3c77342 Cleaned up/added commenting (hkexsh/, hkexnet/) 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2019-05-09 22:46:08 -07:00
Russ Magee
f09d6bbfef Added NEWHOPE and NEWHOPE_SIMPLE KEM algs 
Fixed some -h typos, missing H_SHA512 option
randReader seed time.Now().UnixNano()

Signed-off-by: Russ Magee <rmagee@gmail.com>
 2019-04-08 21:58:33 -07:00
Russ Magee
ea01123b87 GoReporter recommended cleanup 2018-12-12 00:34:23 -08:00
Russ Magee
a0e90c14ba Praise Bob! 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2018-12-08 21:44:06 -08:00
Russ Magee
9641fd3fff Console esc seqs no longer affect in-band input 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2018-12-08 21:37:26 -08:00
Russ Magee
f83cdd23b1 Merge branch 'master' into console-tricks 2018-12-06 18:55:17 -08:00
Russ Magee
55fdffbd9e Moved herradurakex to its own package 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2018-12-06 17:20:43 -08:00
Russ Magee
1a294c3ce4 Updated console tricks 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2018-12-01 00:22:56 -08:00
Russ Magee
df64eda796 Single-char ~N sequence logic 2018-11-30 22:52:57 -08:00
Russ Magee
291bacf2df Fix for issue #11 2018-11-29 18:06:03 -08:00
Russ Magee
b6a22ce64a gofmt cleanup 2018-11-28 21:03:20 -08:00
Russ Magee
5fb227b9f8 -Removed WriteDeadline in hkexnet.Close() 
-hkexsh: fixed (non-)error handling for file copies

Signed-off-by: Russ Magee <rmagee@gmail.com>
 2018-11-20 18:50:09 -08:00
Russ Magee
1452af3fc8 -hkexnet.immClose flag to allow client to close first (-x incomplete output bug) 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2018-11-19 19:55:35 -08:00
Russ Magee
8e02810f0e Restored call to c.Close in hkexnet.Close (was causing hangs on client side) 2018-11-19 14:41:42 -08:00
Russ Magee
1909786a4b -Removed Close on null failed Listener (hkexshd) 
-Removed premature net.Conn.Close() in hkexnet.Close() (hkexnet)

Signed-off-by: Russ Magee <rmagee@gmail.com>
 2018-11-19 14:16:48 -08:00
Russ Magee
4345c7bf2d Removed unused consts 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2018-11-18 20:28:03 -08:00
Russ Magee
d9453835bf Shorter servertun hangup msg 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2018-11-11 23:03:32 -08:00
Russ Magee
b0f614f82e Tunnel keepalives from client implemented. If client dies/exits unexpectedly the server 
tunnel will disconnect from rport in a timely manner.

Signed-off-by: Russ Magee <rmagee@gmail.com>
 2018-11-11 22:46:39 -08:00
Russ Magee
709f2ae3dd Got rid of superfluous weAreDialled var 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2018-11-11 21:55:21 -08:00
Russ Magee
0943797300 Minor cleanup prior to tackling os.Exit() in doShellMode() and server-side tun hangs 2018-11-11 21:05:25 -08:00
Russ Magee
6f1fcbbf7a Corrected tun chan Ctl cmd comments 2018-11-11 20:25:34 -08:00
Russ Magee
2a9e6af2ae Tunnels w/reconnect refinements: 
-200ms deadlink timeouts
-Fixed TunConnRefused client hangup handling

Signed-off-by: Russ Magee <rmagee@gmail.com>
 2018-11-11 20:12:29 -08:00
Russ Magee
ba3cda95e8 Tunnels with reconnect working. 
TODO: interactive client exit must collapse all open tunnels prior to exit.

Signed-off-by: Russ Magee <rmagee@gmail.com>
 2018-11-11 18:56:08 -08:00
Russ Magee
fbef175012 Tunnels basically working. TODO: add TunKeepAlive packet & handshake w/server tun side 2018-11-11 12:34:54 -08:00
Russ Magee
b94f25e5ae Client lport disconn/reconn works, somewhat.. 2018-11-11 11:45:37 -08:00
Russ Magee
3b35751e2e WIP tunnel states, re-dial when not required needs debugging. 2018-11-07 19:35:32 -08:00
Russ Magee
dd37922fb2 Server tun worker now in redial goroutine. TODO: Finish full two-way state change msging 2018-11-01 22:47:25 -07:00
Russ Magee
492c7290b0 Much improved tunnel state management: server-side mostly working, client-side re-Accept() -> svr re-Dial() still required 2018-11-01 22:14:44 -07:00
Russ Magee
a425afe9b6 Tunnels working again to basic level w/o re-connect or re-dial 2018-11-01 18:52:01 -07:00
Russ Magee
081d88b9ad tunnel setup stubs moved into Conn Read()/Write() handling 2018-10-31 20:11:00 -07:00
Russ Magee
8ee0aea0b4 (non-working) begin of total tunnel redesign 2018-10-31 09:15:28 -07:00
Russ Magee
fcbdb77c79 Cleaned up error handling in hkexnet.Conn.Read() a bit 2018-10-30 21:07:42 -07:00
Russ Magee
e75ed159f6 two-way tunnel traffic working. Hangup/re-dial on server side needs work 2018-10-28 21:46:29 -07:00
Russ Magee
632f24354b Tunnel rough work-in-progress; data sent (wrong length) and CSOTunClose handling needs work, but it's a start... 2018-10-28 19:17:47 -07:00
Russ Magee
1e6da733a2 Work on setup for tunnels 
Signed-off-by: Russ Magee <rmagee@gmail.com>
 2018-10-27 01:51:40 -07:00
Russ Magee
48b0c41f62 Prototyped TunEndpoint struct, data flow commentary 2018-10-26 20:31:57 -07:00