X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsserver%2Fapiv1-targets.go;h=6520852d3abc811d9f233c573d557a0c60e462b4;hb=5dc2ff003106f0ced38caadb06033f24c792f9b9;hp=978dc75a4711ba3ad4593a51ac09b5b904bb45d1;hpb=65e09e831cf13343ac713fbf15281174d1f13a94;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/xdsserver/apiv1-targets.go b/lib/xdsserver/apiv1-targets.go
index 978dc75..6520852 100644
--- a/lib/xdsserver/apiv1-targets.go
+++ b/lib/xdsserver/apiv1-targets.go
@@ -20,8 +20,8 @@ package xdsserver
 import (
 	"net/http"
 
-	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
-	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 	"github.com/gin-gonic/gin"
 )
 
@@ -58,9 +58,16 @@ func (s *APIService) addTarget(c *gin.Context) {
 		return
 	}
 
+	// Retrieve session info
+	sess := s.sessions.Get(c)
+	if sess == nil {
+		common.APIError(c, "Unknown sessions")
+		return
+	}
+
 	s.Log.Debugln("Add target config: ", cfgArg)
 
-	newTgt, err := s.targets.Add(cfgArg)
+	newTgt, err := s.targets.Add(cfgArg, sess)
 	if err != nil {
 		common.APIError(c, err.Error())
 		return
@@ -77,9 +84,16 @@ func (s *APIService) delTarget(c *gin.Context) {
 		return
 	}
 
+	// Retrieve session info
+	sess := s.sessions.Get(c)
+	if sess == nil {
+		common.APIError(c, "Unknown sessions")
+		return
+	}
+
 	s.Log.Debugln("Delete target id ", id)
 
-	delEntry, err := s.targets.Delete(id)
+	delEntry, err := s.targets.Delete(id, sess)
 	if err != nil {
 		common.APIError(c, err.Error())
 		return
@@ -190,13 +204,8 @@ func (s *APIService) openTgtTerm(c *gin.Context) {
 		common.APIError(c, "Unknown sessions")
 		return
 	}
-	sock := sess.IOSocket
-	if sock == nil {
-		common.APIError(c, "Websocket not established")
-		return
-	}
 
-	term, err := s.targets.OpenTerminal(id, tid, sock, sess.ID)
+	term, err := s.targets.OpenTerminal(id, tid, sess)
 	if err != nil {
 		common.APIError(c, err.Error())
 		return
@@ -211,7 +220,15 @@ func (s *APIService) closeTgtTerm(c *gin.Context) {
 		common.APIError(c, err.Error())
 		return
 	}
-	term, err := s.targets.CloseTerminal(id, tid)
+
+	// Retrieve session info
+	sess := s.sessions.Get(c)
+	if sess == nil {
+		common.APIError(c, "Unknown sessions")
+		return
+	}
+
+	term, err := s.targets.CloseTerminal(id, tid, sess)
 	if err != nil {
 		common.APIError(c, err.Error())
 		return
@@ -233,7 +250,14 @@ func (s *APIService) resizeTgtTerm(c *gin.Context) {
 		return
 	}
 
-	term, err := s.targets.ResizeTerminal(id, tid, sizeArg.Cols, sizeArg.Rows)
+	// Retrieve session info
+	sess := s.sessions.Get(c)
+	if sess == nil {
+		common.APIError(c, "Unknown sessions")
+		return
+	}
+
+	term, err := s.targets.ResizeTerminal(id, tid, sizeArg.Cols, sizeArg.Rows, sess)
 	if err != nil {
 		common.APIError(c, err.Error())
 		return