aboutsummaryrefslogtreecommitdiff
path: root/goxyctl/main.go
diff options
context:
space:
mode:
Diffstat (limited to 'goxyctl/main.go')
-rw-r--r--goxyctl/main.go29
1 files changed, 13 insertions, 16 deletions
diff --git a/goxyctl/main.go b/goxyctl/main.go
index 39f8c6d..64af637 100644
--- a/goxyctl/main.go
+++ b/goxyctl/main.go
@@ -1,10 +1,8 @@
package main
import (
- "crypto/rsa"
- "crypto/tls"
- "encoding/gob"
"flag"
+ "io/ioutil"
"log"
"net/rpc"
)
@@ -18,30 +16,29 @@ var (
remove = flag.Bool("remove", false, "remove entry")
)
-type Entry struct {
+type RPCEntry struct {
ServerName string
Upstream string
- Cert *tls.Certificate
-}
-
-func init() {
- gob.Register(rsa.PrivateKey{})
+ Cert []byte
+ Key []byte
}
func main() {
flag.Parse()
- e := Entry{
+ e := RPCEntry{
ServerName: *servername,
Upstream: *upstream,
}
if *keyfile != "" && *crtfile != "" {
- crt, err := tls.LoadX509KeyPair(*crtfile, *keyfile)
- if err != nil {
+ var err error
+ if e.Cert, err = ioutil.ReadFile(*crtfile); err != nil {
+ log.Fatal(err)
+ }
+ if e.Key, err = ioutil.ReadFile(*keyfile); err != nil {
log.Fatal(err)
}
- e.Cert = &crt
}
client, err := rpc.DialHTTP("tcp", *rpcserver)
@@ -56,10 +53,10 @@ func main() {
case e.ServerName != "" && *remove:
err = client.Call("GoXY.Del", e, nil)
default:
- var r map[string]Entry
+ var r []RPCEntry
err = client.Call("GoXY.List", struct{}{}, &r)
- for k, v := range r {
- log.Println(k, v)
+ for _, v := range r {
+ log.Println(v.ServerName, "->", v.Upstream)
}
}
if err != nil {