RusstopiaLabs
/
xs
mirror of https://gogs.blitter.com/RLabs/xs
1
0
Fork 0
Code Issues Releases Wiki Activity

Some comment/dead test code cleanup

This commit is contained in:
Russ Magee 2018-09-05 20:36:32 -07:00
parent b419b2e002
commit 963d1c8eb2
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hkexnet/hkexnet.go
View File

@ -92,8 +92,8 @@ func (hc Conn) GetStatus() uint8 {
func (hc *Conn) SetStatus(stat uint8) { func (hc *Conn) SetStatus(stat uint8) {
*hc.closeStat = stat *hc.closeStat = stat
fmt.Println("closeStat:", *hc.closeStat) //fmt.Println("closeStat:", *hc.closeStat)
//log.Println("closeStat:", *hc.closeStat) log.Println("closeStat:", *hc.closeStat)
} }
// ConnOpts returns the cipher/hmac options value, which is sent to the // ConnOpts returns the cipher/hmac options value, which is sent to the
@ -390,10 +390,6 @@ func (hc Conn) Read(b []byte) (n int, err error) {
if err != nil { if err != nil {
if err.Error() != "EOF" { if err.Error() != "EOF" {
log.Println("[2]unexpected Read() err:", err) log.Println("[2]unexpected Read() err:", err)
//panic(err)
// Cannot just return 0, err here - client won't hang up properly
// when 'exit' from shell. TODO: try server sending ctrlStatOp to
// indicate to Reader? -rlm 20180428
} }
} }
@ -402,14 +398,9 @@ func (hc Conn) Read(b []byte) (n int, err error) {
hc.Close() hc.Close()
return 1, errors.New("Insane payloadLen") return 1, errors.New("Insane payloadLen")
} }
//log.Println("payloadLen:", payloadLen)
var payloadBytes = make([]byte, payloadLen) var payloadBytes = make([]byte, payloadLen)
n, err = io.ReadFull(hc.c, payloadBytes) n, err = io.ReadFull(hc.c, payloadBytes)
//!fmt.Println(" << Read ", n, " payloadBytes")
//time.Sleep(100 * time.Millisecond)
//log.Println(" << Read ", n, " payloadBytes")
// Normal client 'exit' from interactive session will cause // Normal client 'exit' from interactive session will cause
// (on server side) err.Error() == "<iface/addr info ...>: use of closed network connection" // (on server side) err.Error() == "<iface/addr info ...>: use of closed network connection"
@ -483,7 +474,6 @@ func (hc Conn) Read(b []byte) (n int, err error) {
log.Printf("Read() got %d bytes\n", retN) log.Printf("Read() got %d bytes\n", retN)
copy(b, hc.dBuf.Next(retN)) copy(b, hc.dBuf.Next(retN))
//log.Printf("As Read() returns, hc.dBuf is %d long: %s\n", hc.dBuf.Len(), hex.Dump(hc.dBuf.Bytes()))
return retN, nil return retN, nil
} }
@ -552,8 +542,6 @@ func (hc *Conn) WritePacket(b []byte, op byte) (n int, err error) {
hc.m.Unlock() hc.m.Unlock()
if err != nil { if err != nil {
//panic(err)
fmt.Println(err)
log.Println(err) log.Println(err)
} }
return return

6
hkexshd/hkexshd.go
View File

@ -101,7 +101,7 @@ func runClientToServerCopyAs(who string, conn hkexnet.Conn, fpath string, chaffi
return err, 253 // !? return err, 253 // !?
} else { } else {
if err := c.Wait(); err != nil { if err := c.Wait(); err != nil {
fmt.Println("*** c.Wait() done ***") //fmt.Println("*** c.Wait() done ***")
if exiterr, ok := err.(*exec.ExitError); ok { if exiterr, ok := err.(*exec.ExitError); ok {
// The program has exited with an exit code != 0 // The program has exited with an exit code != 0
@ -178,7 +178,7 @@ func runServerToClientCopyAs(who string, conn hkexnet.Conn, srcPath string, chaf
return err, 253 // !? return err, 253 // !?
} else { } else {
if err := c.Wait(); err != nil { if err := c.Wait(); err != nil {
fmt.Println("*** c.Wait() done ***") //fmt.Println("*** c.Wait() done ***")
if exiterr, ok := err.(*exec.ExitError); ok { if exiterr, ok := err.(*exec.ExitError); ok {
// The program has exited with an exit code != 0 // The program has exited with an exit code != 0
@ -291,7 +291,7 @@ func runShellAs(who string, cmd string, interactive bool, conn hkexnet.Conn, cha
}() }()
if err := c.Wait(); err != nil { if err := c.Wait(); err != nil {
fmt.Println("*** c.Wait() done ***") //fmt.Println("*** c.Wait() done ***")
if exiterr, ok := err.(*exec.ExitError); ok { if exiterr, ok := err.(*exec.ExitError); ok {
// The program has exited with an exit code != 0 // The program has exited with an exit code != 0