remove 'Dialer Addr' from stats.Session

This commit is contained in:
Jason
2019-08-11 18:05:58 +08:00
parent 92a111440e
commit 0725413b80
4 changed files with 2 additions and 6 deletions

View File

@@ -55,18 +55,17 @@ func (s *simpleSessionStater) Start() error {
return sessions[i].SessionStart.Sub(sessions[j].SessionStart) < 0 return sessions[i].SessionStart.Sub(sessions[j].SessionStart) < 0
}) })
_, _ = fmt.Fprintf(w, "<table style=\"border=4px solid\">") _, _ = fmt.Fprintf(w, "<table style=\"border=4px solid\">")
_, _ = fmt.Fprintf(w, "<tr><td>Process Name</td><td>Network</td><td>Date</td><td>Duration</td><td>Dialer Addr</td><td>Client Addr</td><td>Target Addr</td><td>Upload Bytes</td><td>Download Bytes</td></tr>") _, _ = fmt.Fprintf(w, "<tr><td>Process Name</td><td>Network</td><td>Date</td><td>Duration</td><td>Client Addr</td><td>Target Addr</td><td>Upload Bytes</td><td>Download Bytes</td></tr>")
sort.Slice(sessions, func(i, j int) bool { sort.Slice(sessions, func(i, j int) bool {
return sessions[i].SessionStart.After(sessions[j].SessionStart) return sessions[i].SessionStart.After(sessions[j].SessionStart)
}) })
for _, sess := range sessions { for _, sess := range sessions {
_, _ = fmt.Fprintf(w, "<tr><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td></tr>", _, _ = fmt.Fprintf(w, "<tr><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td></tr>",
sess.ProcessName, sess.ProcessName,
sess.Network, sess.Network,
date(sess.SessionStart), date(sess.SessionStart),
duration(sess.SessionStart, sess.SessionClose), duration(sess.SessionStart, sess.SessionClose),
sess.DialerAddr,
sess.ClientAddr, sess.ClientAddr,
sess.TargetAddr, sess.TargetAddr,
p.Sprintf("%d", atomic.LoadInt64(&sess.UploadBytes)), p.Sprintf("%d", atomic.LoadInt64(&sess.UploadBytes)),

View File

@@ -18,7 +18,6 @@ type SessionStater interface {
type Session struct { type Session struct {
ProcessName string ProcessName string
Network string Network string
DialerAddr string
ClientAddr string ClientAddr string
TargetAddr string TargetAddr string
UploadBytes int64 UploadBytes int64

View File

@@ -93,7 +93,6 @@ func (h *tcpHandler) Handle(localConn net.Conn, target *net.TCPAddr) error {
sess = &stats.Session{ sess = &stats.Session{
ProcessName: process, ProcessName: process,
Network: target.Network(), Network: target.Network(),
DialerAddr: remoteConn.LocalAddr().String(),
ClientAddr: localConn.LocalAddr().String(), ClientAddr: localConn.LocalAddr().String(),
TargetAddr: targetAddr, TargetAddr: targetAddr,
UploadBytes: 0, UploadBytes: 0,

View File

@@ -175,7 +175,6 @@ func (h *udpHandler) connectInternal(conn core.UDPConn, targetAddr string) error
sess := &stats.Session{ sess := &stats.Session{
ProcessName: process, ProcessName: process,
Network: conn.LocalAddr().Network(), Network: conn.LocalAddr().Network(),
DialerAddr: remoteConn.LocalAddr().String(),
ClientAddr: conn.LocalAddr().String(), ClientAddr: conn.LocalAddr().String(),
TargetAddr: targetAddr, TargetAddr: targetAddr,
UploadBytes: 0, UploadBytes: 0,