aboutsummaryrefslogtreecommitdiff
path: root/test_msgnet_tls
diff options
context:
space:
mode:
authorDeterminant <ted.sybil@gmail.com>2019-06-28 12:20:37 -0400
committerDeterminant <ted.sybil@gmail.com>2019-06-28 12:20:37 -0400
commit82153433ebdbe775ac3d7b12668dd222192e8dce (patch)
treed143388c1a2227229aa97f05011f858de986718d /test_msgnet_tls
parentaed7b3c83a8b79f4279b6dd5569eb33fb5501a6f (diff)
update salticidae
Diffstat (limited to 'test_msgnet_tls')
-rw-r--r--test_msgnet_tls/main.go20
1 files changed, 10 insertions, 10 deletions
diff --git a/test_msgnet_tls/main.go b/test_msgnet_tls/main.go
index c45cfdf..b14cedd 100644
--- a/test_msgnet_tls/main.go
+++ b/test_msgnet_tls/main.go
@@ -100,18 +100,18 @@ func connHandler(_conn *C.struct_msgnetwork_conn_t, connected C.bool, userdata u
certHash := conn.GetPeerCert().GetDer().GetHash()
res = certHash.IsEq(n.peerCert)
if conn.GetMode() == salticidae.CONN_MODE_ACTIVE {
- fmt.Printf("[%s] Connected, sending hello.\n", myName)
+ fmt.Printf("[%s] connected, sending hello.\n", myName)
hello := msgHelloSerialize(myName, "Hello there!")
n.net.SendMsg(hello, conn)
} else {
status := "fail"
if res { status = "ok" }
- fmt.Printf("[%s] Accepted, waiting for greetings.\n" +
- "The peer certificate footprint is %s (%s)\n",
+ fmt.Printf("[%s] accepted, waiting for greetings.\n" +
+ "The peer certificate fingerprint is %s (%s)\n",
myName, certHash.GetHex(), status)
}
} else {
- fmt.Printf("[%s] Disconnected, retrying.\n", myName)
+ fmt.Printf("[%s] disconnected, retrying.\n", myName)
err := salticidae.NewError()
net.Connect(conn.GetAddr(), false, &err)
}
@@ -136,12 +136,12 @@ func genMyNet(ec salticidae.EventContext,
netconfig.TLSCertFile(name + ".pem")
net := salticidae.NewMsgNetwork(ec, netconfig, &err); checkError(&err)
_peerCert := salticidae.NewUInt256FromByteArray(salticidae.NewByteArrayFromHex(peerCert))
- cname := C.CString(name)
- n := MyNet { net: net, name: name, peerCert: _peerCert, cname: cname }
- n.net.RegHandler(MSG_OPCODE_HELLO, salticidae.MsgNetworkMsgCallback(C.onReceiveHello), unsafe.Pointer(cname))
- n.net.RegHandler(MSG_OPCODE_ACK, salticidae.MsgNetworkMsgCallback(C.onReceiveAck), unsafe.Pointer(cname))
- n.net.RegConnHandler(salticidae.MsgNetworkConnCallback(C.connHandler), unsafe.Pointer(cname))
- n.net.RegErrorHandler(salticidae.MsgNetworkErrorCallback(C.errorHandler), unsafe.Pointer(cname))
+ n := MyNet { net: net, name: name, peerCert: _peerCert, cname: C.CString(name) }
+ cname := unsafe.Pointer(n.cname)
+ n.net.RegHandler(MSG_OPCODE_HELLO, salticidae.MsgNetworkMsgCallback(C.onReceiveHello), cname)
+ n.net.RegHandler(MSG_OPCODE_ACK, salticidae.MsgNetworkMsgCallback(C.onReceiveAck), cname)
+ n.net.RegConnHandler(salticidae.MsgNetworkConnCallback(C.connHandler), cname)
+ n.net.RegErrorHandler(salticidae.MsgNetworkErrorCallback(C.errorHandler), cname)
n.net.Start()
n.net.Listen(myAddr, &err); checkError(&err)