From 5c2695e46bd296e83316156c134ab0a67c9e43ac Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sun, 23 Feb 2025 20:06:37 +0900 Subject: [PATCH] ongoing code refactoring to use common functions --- client-ctl.go | 43 +++++++++++++++++-------------------------- client.go | 22 +++++++++++++++++++--- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/client-ctl.go b/client-ctl.go index 395f144..f1a7159 100644 --- a/client-ctl.go +++ b/client-ctl.go @@ -3,10 +3,8 @@ package hodu import "encoding/json" import "fmt" import "net/http" -import "strconv" import "strings" import "time" -import "unsafe" /* * POST GET PUT DELETE @@ -234,11 +232,13 @@ func (ctl *client_ctl_client_conns) ServeHTTP(w http.ResponseWriter, req *http.R jsp = make([]json_out_client_route, 0) cts.route_mtx.Lock() for _, r = range cts.route_map { + var spla string = "" + if r.server_peer_listen_addr != nil { spla = r.server_peer_listen_addr.String() } jsp = append(jsp, json_out_client_route{ Id: r.Id, ClientPeerAddr: r.PeerAddr, ClientPeerName: r.PeerName, - ServerPeerListenAddr: r.server_peer_listen_addr.String(), + ServerPeerListenAddr: spla, ServerPeerNet: r.ServerPeerNet, ServerPeerOption: r.ServerPeerOption.String(), Lifetime: DurationToSecString(r.Lifetime), @@ -339,11 +339,13 @@ func (ctl *client_ctl_client_conns_id) ServeHTTP(w http.ResponseWriter, req *htt jsp = make([]json_out_client_route, 0) cts.route_mtx.Lock() for _, r = range cts.route_map { + var spla string = "" + if r.server_peer_listen_addr != nil { spla = r.server_peer_listen_addr.String() } jsp = append(jsp, json_out_client_route{ Id: r.Id, ClientPeerAddr: r.PeerAddr, ClientPeerName: r.PeerName, - ServerPeerListenAddr: r.server_peer_listen_addr.String(), + ServerPeerListenAddr: spla, ServerPeerNet: r.ServerPeerNet, ServerPeerOption: r.ServerPeerOption.String(), Lifetime: DurationToSecString(r.Lifetime), @@ -408,11 +410,13 @@ func (ctl *client_ctl_client_conns_id_routes) ServeHTTP(w http.ResponseWriter, r jsp = make([]json_out_client_route, 0) cts.route_mtx.Lock() for _, r = range cts.route_map { + var spla string = "" + if r.server_peer_listen_addr != nil { spla = r.server_peer_listen_addr.String() } jsp = append(jsp, json_out_client_route{ Id: r.Id, ClientPeerAddr: r.PeerAddr, ClientPeerName: r.PeerName, - ServerPeerListenAddr: r.server_peer_listen_addr.String(), + ServerPeerListenAddr: spla, ServerPeerNet: r.ServerPeerNet, ServerPeerOption: r.ServerPeerOption.String(), Lifetime: DurationToSecString(r.Lifetime), @@ -519,12 +523,14 @@ func (ctl *client_ctl_client_conns_id_routes_id) ServeHTTP(w http.ResponseWriter switch req.Method { case http.MethodGet: + var spla string = "" + if r.server_peer_listen_addr != nil { spla = r.server_peer_listen_addr.String() } status_code = WriteJsonRespHeader(w, http.StatusOK) err = je.Encode(json_out_client_route{ Id: r.Id, ClientPeerAddr: r.PeerAddr, ClientPeerName: r.PeerName, - ServerPeerListenAddr: r.server_peer_listen_addr.String(), + ServerPeerListenAddr: spla, ServerPeerNet: r.ServerPeerNet, ServerPeerOption: r.ServerPeerOption.String(), Lifetime: DurationToSecString(r.Lifetime), @@ -582,49 +588,34 @@ oops: func (ctl *client_ctl_client_conns_id_routes_spsp) ServeHTTP(w http.ResponseWriter, req *http.Request) (int, error) { var c *Client var status_code int - var err error var conn_id string var port_id string - var port_nid uint64 var je *json.Encoder - var cts *ClientConn var r *ClientRoute + var err error c = ctl.c je = json.NewEncoder(w) conn_id = req.PathValue("conn_id") port_id = req.PathValue("port_id") - - port_nid, err = strconv.ParseUint(port_id, 10, int(unsafe.Sizeof(PortId(0)) * 8)) - if err != nil { - status_code = WriteJsonRespHeader(w, http.StatusBadRequest) - je.Encode(JsonErrmsg{Text: "wrong route id - " + port_id}) - goto oops - } - - cts, err = c.FindClientConnByIdStr(conn_id) + r, err = c.FindClientRouteByServerPeerSvcPortIdStr(conn_id, port_id) if err != nil { status_code = WriteJsonRespHeader(w, http.StatusNotFound) je.Encode(JsonErrmsg{Text: err.Error()}) goto oops } - r = cts.FindClientRouteByServerPeerSvcPortId(PortId(port_nid)) - if r == nil { - status_code = WriteJsonRespHeader(w, http.StatusNotFound) - je.Encode(JsonErrmsg{Text: "non-existent server peer port id - " + port_id}) - goto oops - } - switch req.Method { case http.MethodGet: + var spla string = "" + if r.server_peer_listen_addr != nil { spla = r.server_peer_listen_addr.String() } status_code = WriteJsonRespHeader(w, http.StatusOK) err = je.Encode(json_out_client_route{ Id: r.Id, ClientPeerAddr: r.PeerAddr, ClientPeerName: r.PeerName, - ServerPeerListenAddr: r.server_peer_listen_addr.String(), + ServerPeerListenAddr: spla, ServerPeerNet: r.ServerPeerNet, ServerPeerOption: r.ServerPeerOption.String(), Lifetime: DurationToSecString(r.Lifetime), diff --git a/client.go b/client.go index f4af164..033bc62 100644 --- a/client.go +++ b/client.go @@ -1582,9 +1582,7 @@ func (c *Client) FindClientRouteByServerPeerSvcPortId(conn_id ConnId, port_id Po defer c.cts_mtx.Unlock() cts, ok = c.cts_map[conn_id] - if !ok { - return nil - } + if !ok { return nil } return cts.FindClientRouteByServerPeerSvcPortId(port_id) } @@ -1649,6 +1647,24 @@ func (c *Client) FindClientRouteByIdStr(conn_id string, route_id string) (*Clien return r, nil } +func (c *Client) FindClientRouteByServerPeerSvcPortIdStr(conn_id string, port_id string) (*ClientRoute, error) { + var conn_nid uint64 + var port_nid uint64 + var r *ClientRoute + var err error + + conn_nid, err = strconv.ParseUint(conn_id, 10, int(unsafe.Sizeof(ConnId(0)) * 8)) + if err != nil { return nil, fmt.Errorf("invalid connection id %s - %s", conn_id, err.Error()) } + + port_nid, err = strconv.ParseUint(port_id, 10, int(unsafe.Sizeof(PortId(0)) * 8)) + if err != nil { return nil, fmt.Errorf("invalid port id %s - %s", port_id, err.Error()) } + + r = c.FindClientRouteByServerPeerSvcPortId(ConnId(conn_nid), PortId(port_nid)) + if r == nil { return nil, fmt.Errorf("non-existent route(%d,%d)", conn_nid, port_nid) } + + return r, nil +} + func (c *Client) FindClientPeerConnByIdStr(conn_id string, route_id string, peer_id string) (*ClientPeerConn, error) { var p *ClientPeerConn var conn_nid uint64