toolsrv: rename internal/fs → internal/server
The package defines the Server type and its namespace — 'fs' was a leftover name from when it only held the filesystem spec. Now it's the server definition. File renamed spec.go → server.go to match.
This commit is contained in:
parent
8ce8390421
commit
62fe1dab83
|
|
@ -1,5 +1,5 @@
|
|||
// parse.go - Key=value payload parsing for toolsrv.
|
||||
package fs
|
||||
package server
|
||||
|
||||
import "strings"
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
// proc.go - Process management and tool operations for toolsrv.
|
||||
package fs
|
||||
package server
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fs
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
// spec.go - virtfs-based namespace specification for toolsrv.
|
||||
package fs
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package fs
|
||||
package server
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
|
@ -24,7 +24,7 @@ import (
|
|||
"syscall"
|
||||
"time"
|
||||
|
||||
"ollie/cmd/toolsrv/internal/fs"
|
||||
"ollie/cmd/toolsrv/internal/server"
|
||||
"ollie/cmd/toolsrv/internal/registry"
|
||||
"ollie/env"
|
||||
|
||||
|
|
@ -81,7 +81,7 @@ func main() {
|
|||
toolReg, _ := registry.New()
|
||||
|
||||
// Create server state
|
||||
srv := fs.NewServer()
|
||||
srv := server.NewServer()
|
||||
srv.SetYolo(*yolo)
|
||||
if toolReg != nil {
|
||||
srv.SetRegistry(toolReg)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import (
|
|||
"net"
|
||||
"sync"
|
||||
|
||||
"ollie/cmd/toolsrv/internal/fs"
|
||||
"ollie/cmd/toolsrv/internal/server"
|
||||
"ollie/virtfs"
|
||||
|
||||
"9fans.net/go/plan9"
|
||||
|
|
@ -42,12 +42,12 @@ type connState struct {
|
|||
authFids map[uint32]*authFid
|
||||
ctx context.Context
|
||||
uname string
|
||||
srv *fs.Server
|
||||
srv *server.Server
|
||||
noAuth bool // skip authentication (for debugging)
|
||||
}
|
||||
|
||||
// serve9P handles a single 9P connection using the virtfs tree.
|
||||
func serve9P(ctx context.Context, conn net.Conn, tree *virtfs.Tree, srv *fs.Server, noAuth bool) {
|
||||
func serve9P(ctx context.Context, conn net.Conn, tree *virtfs.Tree, srv *server.Server, noAuth bool) {
|
||||
defer conn.Close()
|
||||
|
||||
cs := &connState{
|
||||
|
|
|
|||
Loading…
Reference in New Issue