X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/67d1f7231b807771b57c8f0e63dd796a03130eaf..dd81e2cf8030aaea778677270d2a1b6ed218d6b8:/hotline/server.go?ds=sidebyside

diff --git a/hotline/server.go b/hotline/server.go
index f4a2ad4..e4232b6 100644
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -11,7 +11,6 @@ import (
 	"gopkg.in/yaml.v3"
 	"io"
 	"io/fs"
-	"io/ioutil"
 	"math/big"
 	"math/rand"
 	"net"
@@ -28,11 +27,10 @@ var contextKeyReq = contextKey("req")
 
 type requestCtx struct {
 	remoteAddr string
-	login      string
-	name       string
 }
 
 type Server struct {
+	NetInterface  string
 	Port          int
 	Accounts      map[string]*Account
 	Agreement     []byte
@@ -85,15 +83,15 @@ type PrivateChat struct {
 func (s *Server) ListenAndServe(ctx context.Context, cancelRoot context.CancelFunc) error {
 	s.Logger.Infow("Hotline server started",
 		"version", VERSION,
-		"API port", fmt.Sprintf(":%v", s.Port),
-		"Transfer port", fmt.Sprintf(":%v", s.Port+1),
+		"API port", fmt.Sprintf("%s:%v", s.NetInterface, s.Port),
+		"Transfer port", fmt.Sprintf("%s:%v", s.NetInterface, s.Port+1),
 	)
 
 	var wg sync.WaitGroup
 
 	wg.Add(1)
 	go func() {
-		ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", "", s.Port))
+		ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", s.NetInterface, s.Port))
 		if err != nil {
 			s.Logger.Fatal(err)
 		}
@@ -103,10 +101,9 @@ func (s *Server) ListenAndServe(ctx context.Context, cancelRoot context.CancelFu
 
 	wg.Add(1)
 	go func() {
-		ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", "", s.Port+1))
+		ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", s.NetInterface, s.Port+1))
 		if err != nil {
 			s.Logger.Fatal(err)
-
 		}
 
 		s.Logger.Fatal(s.ServeFileTransfers(ctx, ln))
@@ -210,8 +207,9 @@ const (
 )
 
 // NewServer constructs a new Server from a config dir
-func NewServer(configDir string, netPort int, logger *zap.SugaredLogger, FS FileStore) (*Server, error) {
+func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredLogger, fs FileStore) (*Server, error) {
 	server := Server{
+		NetInterface:  netInterface,
 		Port:          netPort,
 		Accounts:      make(map[string]*Account),
 		Config:        new(Config),
@@ -224,7 +222,7 @@ func NewServer(configDir string, netPort int, logger *zap.SugaredLogger, FS File
 		outbox:        make(chan Transaction),
 		Stats:         &Stats{Since: time.Now()},
 		ThreadedNews:  &ThreadedNews{},
-		FS:            FS,
+		FS:            fs,
 		banList:       make(map[string]*time.Time),
 	}
 
@@ -259,7 +257,10 @@ func NewServer(configDir string, netPort int, logger *zap.SugaredLogger, FS File
 		return nil, err
 	}
 
-	server.Config.FileRoot = filepath.Join(configDir, "Files")
+	// If the FileRoot is an absolute path, use it, otherwise treat as a relative path to the config dir.
+	if !filepath.IsAbs(server.Config.FileRoot) {
+		server.Config.FileRoot = filepath.Join(configDir, server.Config.FileRoot)
+	}
 
 	*server.NextGuestID = 1
 
@@ -315,7 +316,7 @@ func (s *Server) keepaliveHandler() {
 				c.Idle = true
 
 				flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(c.Flags)))
-				flagBitmap.SetBit(flagBitmap, userFlagAway, 1)
+				flagBitmap.SetBit(flagBitmap, UserFlagAway, 1)
 				binary.BigEndian.PutUint16(c.Flags, uint16(flagBitmap.Int64()))
 
 				c.sendAll(
@@ -339,7 +340,7 @@ func (s *Server) writeBanList() error {
 	if err != nil {
 		return err
 	}
-	err = ioutil.WriteFile(
+	err = os.WriteFile(
 		filepath.Join(s.ConfigDir, "Banlist.yaml"),
 		out,
 		0666,
@@ -741,7 +742,7 @@ func (s *Server) NewPrivateChat(cc *ClientConn) []byte {
 
 	randID := make([]byte, 4)
 	rand.Read(randID)
-	data := binary.BigEndian.Uint32(randID[:])
+	data := binary.BigEndian.Uint32(randID)
 
 	s.PrivateChats[data] = &PrivateChat{
 		ClientConn: make(map[uint16]*ClientConn),
@@ -1210,7 +1211,7 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 						return err
 					}
 
-					if err := receiveFile(rwc, file, ioutil.Discard, ioutil.Discard, fileTransfer.bytesSentCounter); err != nil {
+					if err := receiveFile(rwc, file, io.Discard, io.Discard, fileTransfer.bytesSentCounter); err != nil {
 						s.Logger.Error(err)
 					}